Bug#324371: sam 4.3-18.1 NMU

[Matej Vela]

Hi,

I've done an NMU of sam as part of the Bug Squashing Party to fix the
RC bug and some minor ones; diffs attached.

Thanks,

Matej

diff -u sam-4.3/debian/changelog sam-4.3/debian/changelog
--- sam-4.3/debian/changelog
+++ sam-4.3/debian/changelog
@@ -1,3 +1,12 @@
+sam (4.3-18.1) unstable; urgency=medium
+
+  * NMU during BSP.
+  * Use <errno.h> instead of `extern int errno'.
+    Closes: #228611, #280259, #324371.
+  * Move menu file to /usr/share/menu.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Mon, 31 Oct 2005 08:21:49 +0100
+
 sam (4.3-18) unstable; urgency=low
 
   * The `Minime' release.
diff -u sam-4.3/debian/rules sam-4.3/debian/rules
--- sam-4.3/debian/rules
+++ sam-4.3/debian/rules
@@ -41,7 +41,7 @@
        install -d ${DEB_SAM}/etc/X11/app-defaults ${DEB_SAM}/usr/bin \
                ${DEB_SAM}/usr/lib/sam ${DEB_SAM}/usr/share/doc/sam \
                ${DEB_SAM}/usr/share/man/man1 ${DEB_SAM}/usr/share/man/man5 \
-               ${DEB_SAM}/usr/share/man/man7 ${DEB_SAM}/usr/lib/menu \
+               ${DEB_SAM}/usr/share/man/man7 ${DEB_SAM}/usr/share/menu \
                ${DEB_SAM}/DEBIAN/
        ${MAKE} install DESTDIR=${DEB_SAM} SHARE=/share \
                        SAMTERM=${DEB_SAM}/usr/lib/sam/samterm \
@@ -72,7 +72,7 @@
        gzip -9fc debian/changelog \
                  >${DEB_SAM}/usr/share/doc/sam/changelog.Debian.gz
 ## Install menu-file
-       install -m 0644 debian/local/menu/sam ${DEB_SAM}/usr/lib/menu
+       install -m 0644 debian/local/menu/sam ${DEB_SAM}/usr/share/menu
 ## Strip binaries
 ifeq (,$(findstring nostrip,${DEB_BUILD_OPTIONS}))
        strip --remove-section=.note --remove-section=.comment \
only in patch2:
unchanged:
--- sam-4.3.orig/debian/patches/06-errno.dpatch
+++ sam-4.3/debian/patches/06-errno.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06-errno.dpatch by Matej Vela <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use <errno.h> instead of `extern int errno'.
+
[EMAIL PROTECTED]@
+diff -urNad sam-4.3~/libframe/misc.c sam-4.3/libframe/misc.c
+--- sam-4.3~/libframe/misc.c   1997-11-23 02:40:19.000000000 +0100
++++ sam-4.3/libframe/misc.c    2005-10-31 08:15:24.000000000 +0100
+@@ -7,6 +7,7 @@
+ #else
+ #include      <stdarg.h>
+ #endif
++#include      <errno.h>
+ 
+ void
+ fprint(int fd, char *z, ...)
+@@ -22,8 +23,6 @@
+ 
+ int errstr(char *buf)
+ {
+-      extern int errno;
+-
+       strncpy(buf, strerror(errno), ERRLEN);
+       return 1;
+ }
+diff -urNad sam-4.3~/samterm/unix.c sam-4.3/samterm/unix.c
+--- sam-4.3~/samterm/unix.c    1997-11-23 02:40:18.000000000 +0100
++++ sam-4.3/samterm/unix.c     2005-10-31 08:15:39.000000000 +0100
+@@ -102,7 +102,6 @@
+       /* Make the named pipe.  Multiple sams with the same user/display share 
the same pipe */
+       if (mkfifo(exname, 0600) == -1) {
+               struct stat     statb;
+-              extern int      errno;
+ 
+               if (errno != EEXIST || stat(exname, &statb) == -1)
+                       return;