r2329 - in zope2.12/trunk/debian (changelog rules zopeZVER.dirs.in)

[mejo at users.alioth.debian.org]

    Date: Friday, June 24, 2011 @ 00:26:15
  Author: mejo
Revision: 2329

further packaging improvements: really install changelogs, remove extra license files, remove scripts in EGG-INFO subdirs, ...

Modified:
  zope2.12/trunk/debian/changelog
  zope2.12/trunk/debian/rules
  zope2.12/trunk/debian/zopeZVER.dirs.in

Modified: zope2.12/trunk/debian/changelog
===================================================================
--- zope2.12/trunk/debian/changelog	2011-06-23 20:34:42 UTC (rev 2328)
+++ zope2.12/trunk/debian/changelog	2011-06-24 00:26:15 UTC (rev 2329)
@@ -22,8 +22,11 @@
       file-in-unusual-dir
     - Add lintian override wrong-path-for-interpreter for python wrapper
   * Add debian/README.source to explain the current packaging approach.
+  * Install the upstream changelogs to /usr/share/doc/zope2.12/changelogs.
+  * Remove upstream LICENSE.txt in eggs from zope2.12 binary package.
+  * Remove scripts from EGG-INFO subfolders in zope2.12 binary package.
 
- -- Jonas Meurer <mejo at debian.org>  Thu, 23 Jun 2011 22:29:49 +0200
+ -- Jonas Meurer <mejo at debian.org>  Fri, 24 Jun 2011 01:40:59 +0200
 
 zope2.12 (2.12.11-1) unstable; urgency=low
 

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2011-06-23 20:34:42 UTC (rev 2328)
+++ zope2.12/trunk/debian/rules	2011-06-24 00:26:15 UTC (rev 2329)
@@ -80,6 +80,25 @@
 		fi; \
 	done
 
+        # install the changelogs
+	dh_installchangelogs source/Zope2/doc/CHANGES.rst
+
+	cd $(CURDIR)/source; for egg_src in *; do \
+		if test "$$egg_src" != "Zope2"; then \
+			egg_changes=$$(find $$egg_src -name CHANGES.txt -or -name NEWS.txt | head -n1); \
+			if test -n "$$egg_changes"; then \
+				cp $$egg_changes $(DEBIAN)/$(ZOPE)/usr/share/doc/$(ZOPE)/changelogs/changelog.$$egg_src; \
+				echo "Copied changelog: $(DEBIAN)/$(ZOPE)/usr/share/doc/$(ZOPE)/changelogs/changelog.$$egg_src"; \
+			fi; \
+		fi; \
+	done
+
+	# remove extra license files
+	find $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python -type f -a \( -name LICENSE.txt -o -name COPYING.txt \) -exec rm -f {} \;
+
+	# remove scripts from egg-info subfolders
+	rm -r $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python/*/EGG-INFO/scripts
+
 	cp $(DEBIAN)/python_interpreter_template $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/bin/python
 ifeq ($(distribution),Ubuntu)
 	mv $(DEBIAN)/$(ZOPE)-sandbox/usr/share/doc/$(ZOPE)-sandbox/README.Debian \

Modified: zope2.12/trunk/debian/zopeZVER.dirs.in
===================================================================
--- zope2.12/trunk/debian/zopeZVER.dirs.in	2011-06-23 20:34:42 UTC (rev 2328)
+++ zope2.12/trunk/debian/zopeZVER.dirs.in	2011-06-24 00:26:15 UTC (rev 2329)
@@ -1,9 +1,10 @@
-usr/lib/zope2.12
-usr/lib/zope2.12/bin
-usr/lib/zope2.12/lib/python
-etc/zope2.12
-var/lib/zope2.12
-var/lib/zope2.12/zeo
-var/lib/zope2.12/instance
-var/lib/zope2.12/lib
-var/log/zope2.12
\ No newline at end of file
+usr/lib/zope at ZVER@
+usr/lib/zope at ZVER@/bin
+usr/lib/zope at ZVER@/lib/python
+etc/zope at ZVER@
+var/lib/zope at ZVER@
+var/lib/zope at ZVER@/zeo
+var/lib/zope at ZVER@/instance
+var/lib/zope at ZVER@/lib
+var/log/zope at ZVER@
+usr/share/doc/zope at ZVER@/changelogs