[debian-edu-commits] debian-edu/ 15/20: * Add depends to apt as apt-key is being used in postinst. * Set -e in postinst, thanks to lintian for the reminder. * Don't call apt-key with absolute path in postinst, thanks again, lintian. * Cleanup debian/rules. * debian/control: bump standards version to 3.8.3, wrap uploaders field.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-archive-keyring.

commit bab8ec3aadb812d3104be548e61478e9259d2fc2
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jan 5 12:55:56 2010 +0000

    * Add depends to apt as apt-key is being used in postinst.
    * Set -e in postinst, thanks to lintian for the reminder.
    * Don't call apt-key with absolute path in postinst, thanks again, lintian.
    * Cleanup debian/rules.
    * debian/control: bump standards version to 3.8.3, wrap uploaders field.
---
 debian/changelog | 10 ++++++++++
 debian/control   | 10 +++++++---
 debian/postinst  |  7 ++++---
 debian/rules     |  8 ++++----
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f2cb93..0754dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-edu-archive-keyring (2010.01.05) unstable; urgency=low
+
+  * Add depends to apt as apt-key is being used in postinst.
+  * Set -e in postinst, thanks to lintian for the reminder.
+  * Don't call apt-key with absolute path in postinst, thanks again, lintian.
+  * Cleanup debian/rules.
+  * debian/control: bump standards version to 3.8.3, wrap uploaders field.
+
+ -- Holger Levsen <holger at debian.org>  Tue, 05 Jan 2010 13:55:29 +0100
+
 debian-edu-archive-keyring (2008.02.11) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index fe438bd..830593a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,16 @@ Source: debian-edu-archive-keyring
 Section: misc
 Priority: optional
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
-Uploaders: Holger Levsen <holger at debian.org>, Morten Werner Olsen <werner at debian.org>, Steffen Joeris <white at debian.org>, Martin Zobel-Helas <zobel at ftbfs.de>, Petter Reinholdtsen <pere at debian.org>
-Standards-Version: 3.7.3
+Uploaders: Holger Levsen <holger at debian.org>,
+ Morten Werner Olsen <werner at debian.org>,
+ Steffen Joeris <white at debian.org>,
+ Martin Zobel-Helas <zobel at ftbfs.de>,
+ Petter Reinholdtsen <pere at debian.org>
+Standards-Version: 3.8.3
 
 Package: debian-edu-archive-keyring
 Architecture: all
-Depends: gnupg
+Depends: gnupg, apt
 Description: GnuPG archive keys of the Debian Edu archive
  The Debian Edu project digitally signs its Release files. This package
  contains the archive keys used for that.
diff --git a/debian/postinst b/debian/postinst
index e3c3084..1fad8f1 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,7 +1,8 @@
 #!/bin/sh
 
+set -e
+
 if [ -x /usr/bin/apt-key ]; then
-    # update only uses /usr/share/keyrings/debian-archive-*.gpg
-    #/usr/bin/apt-key update
-    /usr/bin/apt-key add /usr/share/keyrings/debian-edu-archive-keyring.gpg
+    # "apt-key update" only uses /usr/share/keyrings/debian-archive-*.gpg, so we use "apt-key add"
+    apt-key add /usr/share/keyrings/debian-edu-archive-keyring.gpg
 fi
diff --git a/debian/rules b/debian/rules
index 58b452a..bb58ece 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,14 +20,14 @@ build:
 
 clean:
 	$(checkdir)
-	-rm -f *.bak *~ */*~ debian/files* debian/*substvars
-	-rm -rf debian/tmp debian/debian-edu-archive-keyring-udeb
+	rm -f *.bak *~ */*~ debian/files* debian/*substvars
+	rm -rf debian/tmp debian/debian-edu-archive-keyring-udeb
 
 binary-indep: checkroot
 	test -f keyrings/debian-edu-archive-keyring.gpg
 	test -f keyrings/debian-edu-archive-removed-keys.gpg
 
-	-rm -rf debian/tmp
+	rm -rf debian/tmp
 	$(install_dir) debian/tmp/DEBIAN/
 	$(install_script) debian/postinst debian/tmp/DEBIAN/
 
@@ -46,7 +46,7 @@ binary-indep: checkroot
 	chmod -R go=rX debian/tmp
 	dpkg --build debian/tmp ..
 
-	-rm -rf debian/debian-edu-archive-keyring-udeb
+	rm -rf debian/debian-edu-archive-keyring-udeb
 	$(install_dir) debian/debian-edu-archive-keyring-udeb/DEBIAN/
 
 	$(install_dir) debian/debian-edu-archive-keyring-udeb/usr/share/keyrings/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/debian-edu-archive-keyring.git