Updated diff, because I forgot to remove the override for the setuid bit. NMU 
is now uploaded.
diff -u gnupg-1.4.6/debian/changelog gnupg-1.4.6/debian/changelog
--- gnupg-1.4.6/debian/changelog
+++ gnupg-1.4.6/debian/changelog
@@ -1,3 +1,12 @@
+gnupg (1.4.6-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Do not install gpg setuid root, this is not necessary anymore since
+    Linux kernel 2.6.9. (Closes: #356550, #346597, #453122)
+  * Update priority to match override.
+
+ -- Thijs Kinkhorst <[EMAIL PROTECTED]>  Sat, 03 May 2008 16:20:56 +0200
+
 gnupg (1.4.6-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
reverted:
--- gnupg-1.4.6/debian/lintian.override
+++ gnupg-1.4.6.orig/debian/lintian.override
@@ -1 +0,0 @@
-gnupg: setuid-binary usr/bin/gpg 4755 root/root
diff -u gnupg-1.4.6/debian/control gnupg-1.4.6/debian/control
--- gnupg-1.4.6/debian/control
+++ gnupg-1.4.6/debian/control
@@ -1,6 +1,6 @@
 Source: gnupg
 Section: utils
-Priority: standard
+Priority: important
 Maintainer: James Troup <[EMAIL PROTECTED]>
 Standards-Version: 3.7.2.1
 Build-Depends: libz-dev, libldap2-dev, libbz2-dev, libcap-dev, libusb-dev, libreadline5-dev, file, gettext, dpatch, dpkg-dev (>= 1.13.12)
diff -u gnupg-1.4.6/debian/rules gnupg-1.4.6/debian/rules
--- gnupg-1.4.6/debian/rules
+++ gnupg-1.4.6/debian/rules
@@ -72,7 +72,7 @@
 	: # copies of the manpage which can't be grokked by install-info
 	rm debian/tmp/usr/share/info/*
 	find debian/tmp/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs $(STRIP)
-	chmod 4755 debian/tmp/usr/bin/gpg
+	chmod 755 debian/tmp/usr/bin/gpg
 	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
 	sed -e "s#../g10/gpg#gpg#" < tools/convert-from-106 > debian/tmp/usr/bin/gpg-convert-from-106
 	chmod 755 debian/tmp/usr/bin/lspgpot debian/tmp/usr/bin/gpg-convert-from-106
@@ -98,8 +98,6 @@
 	gzip -9v debian/tmp/usr/share/doc/gnupg/*
 	ln -s changelog.g10.gz debian/tmp/usr/share/doc/gnupg/changelog.gz
 	$(install_file) debian/copyright debian/tmp/usr/share/doc/gnupg/
-	$(install_dir) debian/tmp/usr/share/lintian/overrides/
-	$(install_file) debian/lintian.override debian/tmp/usr/share/lintian/overrides/gnupg
 
 	: # in the gpgv package instead
 	rm debian/tmp/usr/bin/gpgv

Attachment: pgpgM9QgizvAj.pgp
Description: PGP signature



Reply via email to