import and merge changes from NMU by Amaya Rodrigo Sastre

diff --git a/debian/changelog b/debian/changelog
index d8a86149b519c10be3ba8487e1813912a910e7b2..c4ad2b0c7065c6ede5092330e15f579ba86872e4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,15 +6,27 @@ authbind (1.1.6) unstable; urgency=low
   * Say in manpage that we may not work properly with multithreaded
     programs.  See also Bug#186439.
   * Make sure we don't try to encode errno's >127 in a status code.
-  * Do not Build-Depends: libc6-dev (it's build-essential).
   * New make variables for improved portability and customisation of
     locations: LIBS, libexec_dir, HELPER, BINTARGETS.
   * make clean removes *.core too.
   * #include <signal.h> in libauthbind.c.
   * Set SHELL=/bin/bash in debian/rules.  Closes #374586.
+  * Revert Amaya's accidental change to CC= line in debian/rules.
 
  --
 
+authbind (1.1.5.2-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Get rid of the /usr/doc link (Closes: #359363).
+  * Revamped packaging a bit:
+    - Get rid of Build-Depends on libc6-dev (build-essential)
+    - spelling-error-in-copyright Debian/GNU Linux Debian GNU/Linux
+    - Not debian-native anymore
+    - Updated ancient-standards-version to 3.7.2, no changes needed.
+
+ -- Amaya Rodrigo Sastre <amaya@debian.org>  Wed, 12 Jul 2006 12:28:12 +0200
+
 authbind (1.1.5.2-0.1) unstable; urgency=low
 
   * Non-maintainer Upload

diff --git a/debian/control b/debian/control
index 78d688921c0fa4ef63aee0049795eba85fe2e944..d429e59036d232c5459a6ea14139f7f0f2470beb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: authbind
 Section: utils
 Priority: extra
 Maintainer: Ian Jackson <ian@chiark.greenend.org.uk>
-Standards-Version: 3.5.2
+Standards-Version: 3.7.2
 
 Package: authbind
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index c660869dc83dc9f89f69dd5a0cf47a7bd82fa294..6a9d9cc355f6d6176b2de783e2cc205d760b68bd 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-This is the Debian/GNU Linux prepackaged version of my `authbind'
+This is the Debian GNU/Linux prepackaged version of my `authbind'
 utility for allowing non-root programs to bind to privileged ports,
 subject to configuration by the sysadmin.
 

diff --git a/debian/postinst b/debian/postinst
index 40eb20eeff068be176fabb47f5aa7731853d59db..cb0712002d4a0b24ef06e591edc150a1d7d77f8d 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,8 +1,9 @@
 #!/bin/sh
+
 if [ "$1" = "configure" ]; then
-  if [ -d /usr/doc -a ! -e /usr/doc/authbind -a -d /usr/share/doc/authbind ];
-  then
-    ln -sf ../share/doc/authbind /usr/doc/authbind
-  fi
+        if [ -d /usr/doc -a -h /usr/doc/authbind -a -d /usr/share/doc/authbind ]; then
+                rm -f /usr/doc/authbind
+        fi
 fi
 
+