Package: debian-archive-keyring
Version: 2007.02.19
Severity: normal
Tags: patch

Hi,

Attached is the diff for my debian-archive-keyring 2007.02.19-0.1 NMU.
-- 
see shy jo
diff -Nru /home/joey/tmp/NM0ybNA1Fn/debian-archive-keyring-2007.02.19/debian/changelog /home/joey/tmp/QFw9dp2jwV/debian-archive-keyring-2007.02.19/debian/changelog
--- /home/joey/tmp/NM0ybNA1Fn/debian-archive-keyring-2007.02.19/debian/changelog	2007-02-19 04:15:08.000000000 -0500
+++ /home/joey/tmp/QFw9dp2jwV/debian-archive-keyring-2007.02.19/debian/changelog	2007-05-30 14:40:41.000000000 -0400
@@ -1,3 +1,14 @@
+debian-archive-keyring (2007.02.19-0.1) unstable; urgency=low
+
+  * NMU for d-i.
+  * Add a postinst to the udeb that creates an archive.gpg symlink
+    if one doesn't yet exist. Closes: #423428
+  * Clean up use of dpkg-gencontrol, removing obsolete workaround.
+  * Remove removed-keys keyring from udeb to save space. Closes: #423422
+  * Set udeb priority to optional to match overrides.
+
+ -- Joey Hess <[EMAIL PROTECTED]>  Wed, 30 May 2007 14:38:39 -0400
+
 debian-archive-keyring (2007.02.19) unstable; urgency=low
 
   * added Etch stable release key (ID: ADB11277) (closes: #410788)
diff -Nru /home/joey/tmp/NM0ybNA1Fn/debian-archive-keyring-2007.02.19/debian/control /home/joey/tmp/QFw9dp2jwV/debian-archive-keyring-2007.02.19/debian/control
--- /home/joey/tmp/NM0ybNA1Fn/debian-archive-keyring-2007.02.19/debian/control	2006-11-21 10:35:23.000000000 -0500
+++ /home/joey/tmp/QFw9dp2jwV/debian-archive-keyring-2007.02.19/debian/control	2007-05-11 15:02:12.000000000 -0400
@@ -12,7 +12,7 @@
  contains the archive keys used for that.
 
 Package: debian-archive-keyring-udeb
-Priority: standard
+Priority: optional
 Architecture: all
 Section: debian-installer
 Recommends: gpgv-udeb
diff -Nru /home/joey/tmp/NM0ybNA1Fn/debian-archive-keyring-2007.02.19/debian/debian-archive-keyring-udeb.postinst /home/joey/tmp/QFw9dp2jwV/debian-archive-keyring-2007.02.19/debian/debian-archive-keyring-udeb.postinst
--- /home/joey/tmp/NM0ybNA1Fn/debian-archive-keyring-2007.02.19/debian/debian-archive-keyring-udeb.postinst	1969-12-31 19:00:00.000000000 -0500
+++ /home/joey/tmp/QFw9dp2jwV/debian-archive-keyring-2007.02.19/debian/debian-archive-keyring-udeb.postinst	2007-05-11 14:59:28.000000000 -0400
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+DIR=/usr/share/keyrings
+if [ ! -e $DIR/archive.gpg ]; then
+	ln -s debian-archive-keyring.gpg $DIR/archive.gpg 
+fi
diff -Nru /home/joey/tmp/NM0ybNA1Fn/debian-archive-keyring-2007.02.19/debian/rules /home/joey/tmp/QFw9dp2jwV/debian-archive-keyring-2007.02.19/debian/rules
--- /home/joey/tmp/NM0ybNA1Fn/debian-archive-keyring-2007.02.19/debian/rules	2006-01-18 17:20:17.000000000 -0500
+++ /home/joey/tmp/QFw9dp2jwV/debian-archive-keyring-2007.02.19/debian/rules	2007-05-11 15:00:48.000000000 -0400
@@ -49,12 +49,9 @@
 
 	$(install_dir) debian/debian-archive-keyring-udeb/usr/share/keyrings/
 	$(install_file) keyrings/debian-archive-keyring.gpg debian/debian-archive-keyring-udeb/usr/share/keyrings/
-	$(install_file) keyrings/debian-archive-removed-keys.gpg debian/debian-archive-keyring-udeb/usr/share/keyrings/
+	install -m 755 debian/debian-archive-keyring-udeb.postinst debian/debian-archive-keyring-udeb/DEBIAN/postinst
 
-	# Don't let dpkg-gencontrol write incorrect guesses to debian/files.
-	# Instead, register the udeb manually.
-	dpkg-gencontrol -pdebian-archive-keyring-udeb -Tdebian/debian-archive-keyring-udeb.substvars -Pdebian/debian-archive-keyring-udeb -isp -fdebian/files~
-	dpkg-distaddfile debian-archive-keyring-udeb_$(VERSION)_all.udeb debian-installer standard
+	dpkg-gencontrol -ndebian-archive-keyring-udeb_$(VERSION)_all.udeb -pdebian-archive-keyring-udeb -Tdebian/debian-archive-keyring-udeb.substvars -Pdebian/debian-archive-keyring-udeb -isp
 	chown -R root.root debian/debian-archive-keyring-udeb
 	chmod -R go=rX debian/debian-archive-keyring-udeb
 	dpkg --build debian/debian-archive-keyring-udeb ../debian-archive-keyring-udeb_$(VERSION)_all.udeb

Attachment: signature.asc
Description: Digital signature

Reply via email to