r564 - zope2.9/trunk/debian

[Fabio Tranchitella]

Author: kobold
Date: 2006-12-21 11:21:03 +0100 (Thu, 21 Dec 2006)
New Revision: 564

Modified:
   zope2.9/trunk/debian/changelog
   zope2.9/trunk/debian/rules
Log:
Changes for the new debian release.


Modified: zope2.9/trunk/debian/changelog
===================================================================
--- zope2.9/trunk/debian/changelog	2006-12-18 19:21:12 UTC (rev 563)
+++ zope2.9/trunk/debian/changelog	2006-12-21 10:21:03 UTC (rev 564)
@@ -1,3 +1,10 @@
+zope2.9 (2.9.6-2) unstable; urgency=high
+
+  * debian/rules: fixed file conflict between zope2.9 and zope2.9-sandbox.
+    (Closes: #404013)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Sun, 26 Nov 2006 18:18:23 +0100
+
 zope2.9 (2.9.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: zope2.9/trunk/debian/rules
===================================================================
--- zope2.9/trunk/debian/rules	2006-12-18 19:21:12 UTC (rev 563)
+++ zope2.9/trunk/debian/rules	2006-12-21 10:21:03 UTC (rev 564)
@@ -142,6 +142,9 @@
 	        $(DEBIAN)/usr/share/linda/overrides/$(ZOPE)
 
 	dh_installdocs -p$(ZOPE) z/README.txt
+	dh_installdocs -a -X INSTALL.txt z/doc/*
+	dh_link /usr/share/doc/zope-common/README.Debian.gz \
+	        /usr/share/doc/zope$(ZVER)/README.Debian.gz
 	cp debian/zope2.9.NEWS.Debian $(DEBIAN)/usr/share/doc/zope2.9/NEWS.Debian
 	dh_installexamples -p$(ZOPE) z/lib/python/Products/PageTemplates/examples/*
 	dh_pycentral -p$(ZOPE) /usr/lib/$(ZOPE) -V $(PYTHONVER)
@@ -150,10 +153,6 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -k z/doc/CHANGES.txt
-	dh_installdocs -X INSTALL.txt z/doc/*
-	dh_link /usr/share/doc/zope-common/README.Debian.gz \
-	        /usr/share/doc/zope$(ZVER)/README.Debian.gz
-	dh_installdocs
 	dh_installlogrotate
 	dh_installdebconf
 	dh_installinit