as debdiff

diff -Nru spamassassin-3.3.2/debian/changelog spamassassin-3.3.2/debian/changelog
--- spamassassin-3.3.2/debian/changelog	2012-06-15 06:00:17.000000000 +0000
+++ spamassassin-3.3.2/debian/changelog	2012-08-04 16:22:34.000000000 +0000
@@ -1,3 +1,10 @@
+spamassassin (3.3.2-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * move GPG.KEY out of /usr/share/doc per ยง12.3 (Closes: #683431)
+
+ -- Shawn Landden <shawnland...@gmail.com>  Sat, 04 Aug 2012 16:20:46 +0000
+
 spamassassin (3.3.2-3) unstable; urgency=low
 
   * Run sa-update and sa-compile as a non-root user. 
diff -Nru spamassassin-3.3.2/debian/rules spamassassin-3.3.2/debian/rules
--- spamassassin-3.3.2/debian/rules	2012-06-15 06:52:38.000000000 +0000
+++ spamassassin-3.3.2/debian/rules	2012-08-02 04:30:09.000000000 +0000
@@ -112,7 +112,8 @@
 
 #	dh_installdocs isn't flexible enough to install all the docs to the right place
 #	Do it here!
-	cp debian/copyright debian/GPG.KEY		debian/spamassassin/usr/share/doc/spamassassin/
+	cp debian/GPG.KEY				debian/spamassassin/usr/share/spamassassin/
+	cp debian/copyright				debian/spamassassin/usr/share/doc/spamassassin/
 	cp debian/spamassassin.README.Debian		debian/spamassassin/usr/share/doc/spamassassin/README.Debian
 	cp CREDITS README TRADEMARK UPGRADE USAGE NOTICE 	debian/spamassassin/usr/share/doc/spamassassin/
 	cp ldap/README 					debian/spamassassin/usr/share/doc/spamassassin/README.ldap
diff -Nru spamassassin-3.3.2/debian/spamassassin.postinst spamassassin-3.3.2/debian/spamassassin.postinst
--- spamassassin-3.3.2/debian/spamassassin.postinst	2012-06-14 05:58:26.000000000 +0000
+++ spamassassin-3.3.2/debian/spamassassin.postinst	2012-08-02 04:30:52.000000000 +0000
@@ -26,7 +26,7 @@
         install -d -o debian-spamd -g debian-spamd -m 700 /var/lib/spamassassin/sa-update-keys
 
     su debian-spamd -c "sa-update --gpghomedir /var/lib/spamassassin/sa-update-keys \
-        --import /usr/share/doc/spamassassin/GPG.KEY"
+        --import /usr/share/spamassassin/GPG.KEY"
 
     sa_compile
 fi

Reply via email to