From 020b6d33bfae4023da2fa310459786c4c5fb93e5 Mon Sep 17 00:00:00 2001 From: ian Date: Sun, 23 Sep 2007 19:09:00 +0000 Subject: [PATCH] import and merge changes from NMU by Amaya Rodrigo Sastre --- debian/changelog | 14 +++++++++++++- debian/control | 2 +- debian/copyright | 2 +- debian/postinst | 9 +++++---- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8a8614..c4ad2b0 100644 --- 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 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 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 78d6889..d429e59 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: authbind Section: utils Priority: extra Maintainer: Ian Jackson -Standards-Version: 3.5.2 +Standards-Version: 3.7.2 Package: authbind Architecture: any diff --git a/debian/copyright b/debian/copyright index c660869..6a9d9cc 100644 --- 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 40eb20e..cb07120 100644 --- 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 + -- 2.30.2