diff -u pam-shield-0.9.2/debian/docs pam-shield-0.9.2/debian/docs --- pam-shield-0.9.2/debian/docs +++ pam-shield-0.9.2/debian/docs @@ -1,0 +2 @@ +INSTALL diff -u pam-shield-0.9.2/debian/postrm pam-shield-0.9.2/debian/postrm --- pam-shield-0.9.2/debian/postrm +++ pam-shield-0.9.2/debian/postrm @@ -7,7 +7,7 @@ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) if [ -d /var/lib/pam_shield ]; then - /bin/rm -fr /var/lib/pam_shield + rm -fr /var/lib/pam_shield fi ;; @@ -23,2 +22,0 @@ - - diff -u pam-shield-0.9.2/debian/postinst pam-shield-0.9.2/debian/postinst --- pam-shield-0.9.2/debian/postinst +++ pam-shield-0.9.2/debian/postinst @@ -5,14 +5,14 @@ case "$1" in configure) if [ ! -d /var/lib/pam_shield ]; then - /bin/mkdir /var/lib/pam_shield + mkdir /var/lib/pam_shield fi - /bin/touch /var/lib/pam_shield/db + touch /var/lib/pam_shield/db ;; abort-upgrade|abort-remove|abort-deconfigure) if [ -d /var/lib/pam_shield ]; then - /bin/rm -fr /var/lib/pam_shield + rm -fr /var/lib/pam_shield fi ;; diff -u pam-shield-0.9.2/debian/changelog pam-shield-0.9.2/debian/changelog --- pam-shield-0.9.2/debian/changelog +++ pam-shield-0.9.2/debian/changelog @@ -1,12 +1,15 @@ -pam-shield (0.9.2-3.1ubuntu1) karmic; urgency=low +pam-shield (0.9.2-3.2) unstable; urgency=low - * debian/control: - - Maintainer changed to MOTU - - Depends on automake1.11 - * debian/patches: - - Added automake1.11.patch (Closes LP: #448706) + * Non-maintainer upload. + * Update build-deps and patch to use automake-1.11. (Closes: #543024). + * Install INSTALL file. (Closes: #517050). + * Add install-sh to clean target in rules. + * Remove paths from commands in maintainer scripts. + * Add README.source for quilt patch system. + * Add Homepage field. + * Bump Standards Version to 3.8.3. (No changes needed). - -- Joao Pinto Sun, 11 Oct 2009 13:59:02 +0100 + -- Barry deFreese Fri, 09 Oct 2009 09:04:02 -0400 pam-shield (0.9.2-3.1) unstable; urgency=low diff -u pam-shield-0.9.2/debian/rules pam-shield-0.9.2/debian/rules --- pam-shield-0.9.2/debian/rules +++ pam-shield-0.9.2/debian/rules @@ -53,7 +53,7 @@ clean: _clean unpatch rm -fr aclocal.m4 build-stamp config* missing \ -Makefile* stamp* .depend .deps/ .pc/ ltmain.sh libtool depcomp + Makefile* stamp* .depend .deps/ .pc/ ltmain.sh libtool depcomp install-sh - rm -fr $(CURDIR)/debian/libpam-shield install: build diff -u pam-shield-0.9.2/debian/control pam-shield-0.9.2/debian/control --- pam-shield-0.9.2/debian/control +++ pam-shield-0.9.2/debian/control @@ -1,10 +1,10 @@ Source: pam-shield Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Mateusz Kaduk +Maintainer: Mateusz Kaduk Build-Depends: debhelper (>= 5), libgdbm-dev, libpam0g-dev, quilt, autoconf, automake (>= 1.11), libtool -Standards-Version: 3.7.3 +Standards-Version: 3.8.3 +Homepage: http://www.ka.sara.nl/home/walter/pam_shield/ Package: libpam-shield Architecture: any diff -u pam-shield-0.9.2/debian/patches/series pam-shield-0.9.2/debian/patches/series --- pam-shield-0.9.2/debian/patches/series +++ pam-shield-0.9.2/debian/patches/series @@ -5 +4,0 @@ -automake1.11.patch reverted: --- pam-shield-0.9.2/debian/patches/automake1.11.patch +++ pam-shield-0.9.2.orig/debian/patches/automake1.11.patch @@ -1,13 +0,0 @@ -Index: pam-shield-0.9.2/autogen.sh -=================================================================== ---- pam-shield-0.9.2.orig/autogen.sh 2009-10-11 14:31:17.564199890 +0100 -+++ pam-shield-0.9.2/autogen.sh 2009-10-11 14:31:15.904929966 +0100 -@@ -1,6 +1,6 @@ - #!/bin/sh - --export AUTOMAKE=/usr/bin/automake-1.10 --export ACLOCAL=/usr/bin/aclocal-1.10 -+export AUTOMAKE=/usr/bin/automake-1.11 -+export ACLOCAL=/usr/bin/aclocal-1.11 - - exec autoreconf -fi; diff -u pam-shield-0.9.2/debian/patches/automake.patch pam-shield-0.9.2/debian/patches/automake.patch --- pam-shield-0.9.2/debian/patches/automake.patch +++ pam-shield-0.9.2/debian/patches/automake.patch @@ -12,7 +12,7 @@ Index: pam-shield-0.9.2/Makefile.am =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ pam-shield-0.9.2/Makefile.am 2007-12-11 15:45:01.000000000 +0100 ++++ pam-shield-0.9.2/Makefile.am 2009-10-09 09:08:30.000000000 -0400 @@ -0,0 +1,21 @@ + +AUTOMAKE_OPTIONS = foreign subdir-objects @@ -38,18 +38,18 @@ Index: pam-shield-0.9.2/autogen.sh =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ pam-shield-0.9.2/autogen.sh 2007-12-11 15:46:32.000000000 +0100 ++++ pam-shield-0.9.2/autogen.sh 2009-10-09 09:09:16.000000000 -0400 @@ -0,0 +1,6 @@ +#!/bin/sh + -+export AUTOMAKE=/usr/bin/automake-1.10 -+export ACLOCAL=/usr/bin/aclocal-1.10 ++export AUTOMAKE=/usr/bin/automake-1.11 ++export ACLOCAL=/usr/bin/aclocal-1.11 + +exec autoreconf -fi; Index: pam-shield-0.9.2/configure.ac =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ pam-shield-0.9.2/configure.ac 2007-12-11 15:45:01.000000000 +0100 ++++ pam-shield-0.9.2/configure.ac 2009-10-09 09:08:30.000000000 -0400 @@ -0,0 +1,38 @@ + +AC_INIT(pam_shield, 0.9.2) only in patch2: unchanged: --- pam-shield-0.9.2.orig/debian/README.source +++ pam-shield-0.9.2/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command.