r2131 - in zope2.12/branches/with-revived-tarball/debian (7 files)

pumazi-guest at users.alioth.debian.org pumazi-guest at users.alioth.debian.org
Wed Nov 10 03:48:09 UTC 2010 

    Date: Wednesday, November 10, 2010 @ 03:47:50
  Author: pumazi-guest
Revision: 2131

Adding a bunch of already packaged dependencies (see the changelog for details). Added a patch to fix the libraries install location to the legacy location. Merged in more of the previous rules file statements.

Added:
  zope2.12/branches/with-revived-tarball/debian/patches/fix_lib_location.patch
Modified:
  zope2.12/branches/with-revived-tarball/debian/changelog
  zope2.12/branches/with-revived-tarball/debian/control
  zope2.12/branches/with-revived-tarball/debian/patches/debian-changes-2.12.10-1
  zope2.12/branches/with-revived-tarball/debian/patches/series
  zope2.12/branches/with-revived-tarball/debian/rules
  zope2.12/branches/with-revived-tarball/debian/zopeZVER.dirs.in

Modified: zope2.12/branches/with-revived-tarball/debian/changelog
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/changelog	2010-11-09 23:58:56 UTC (rev 2130)
+++ zope2.12/branches/with-revived-tarball/debian/changelog	2010-11-10 03:47:50 UTC (rev 2131)
@@ -6,8 +6,19 @@
   * Modified the watch file to point at the new tarball location.
   * Rewrote the rules file to use the newest style debhelper with override
     support.
+  * Added the following package dependencies: python-clientform,
+    python-mechanize, python-transaction, python-zconfig, python-zdaemon,
+    python-zodb, python-zope.authentication, python-zope.browser,
+    python-zope.component, python-zope.component-zcml,
+    python-zope.configuration, python-zope.contenttype, python-zope.copy,
+    python-zope.event, python-zope.exceptions, python-zope.hookable,
+    python-zope.i18n, python-zope.i18nmessageid, python-zope.location,
+    python-zope.proxy, python-zope.publisher, python-zope.schema,
+    python-zope.security
+  * Adding python-profiler as a suggested package, since a Zope2
+    ZPublisher test module uses the profiler.
 
- -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Sun, 07 Nov 2010 05:17:31 -0500
+ -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Sun, 07 Nov 2010 14:41:18 -0500
 
 zope2.12 (2.12.0-1) unstable; urgency=low
 

Modified: zope2.12/branches/with-revived-tarball/debian/control
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/control	2010-11-09 23:58:56 UTC (rev 2130)
+++ zope2.12/branches/with-revived-tarball/debian/control	2010-11-10 03:47:50 UTC (rev 2131)
@@ -12,9 +12,9 @@
 Package: zope2.12
 Architecture: any
 Pre-Depends: zope-common (>= 0.5.49)
-Depends: python-zope.traversing, python-zope.testbrowser, python-zope.testing, python-tz, python-docutils, zodb, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
+Depends: python-clientform, python-docutils, python-mechanize, python-transaction, python-tz, python-zconfig, python-zdaemon, python-zodb, python-zope.authentication, python-zope.browser, python-zope.component, python-zope.component-zcml, python-zope.configuration, python-zope.contenttype, python-zope.copy, python-zope.event, python-zope.exceptions, python-zope.hookable, python-zope.i18n, python-zope.i18nmessageid, python-zope.location, python-zope.proxy, python-zope.publisher, python-zope.schema, python-zope.security, python-zope.traversing, python-zope.testbrowser, python-zope.testing, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
 Provides: zope
-Suggests: python-unit, zope-book, zope-devguide
+Suggests: python-unit, python-profiler, zope-book, zope-devguide
 Description: Open Source Web Application Server
  Zope is an open source web application server primarily written in
  the Python programming language. It features a transactional object

Modified: zope2.12/branches/with-revived-tarball/debian/patches/debian-changes-2.12.10-1
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/patches/debian-changes-2.12.10-1	2010-11-09 23:58:56 UTC (rev 2130)
+++ zope2.12/branches/with-revived-tarball/debian/patches/debian-changes-2.12.10-1	2010-11-10 03:47:50 UTC (rev 2131)
@@ -11,6 +11,17 @@
    * Modified the watch file to point at the new tarball location.
    * Rewrote the rules file to use the newest style debhelper with override
      support.
+   * Added the following package dependencies: python-clientform,
+     python-mechanize, python-transaction, python-zconfig, python-zdaemon,
+     python-zodb, python-zope.authentication, python-zope.browser,
+     python-zope.component, python-zope.component-zcml,
+     python-zope.configuration, python-zope.contenttype, python-zope.copy,
+     python-zope.event, python-zope.exceptions, python-zope.hookable,
+     python-zope.i18n, python-zope.i18nmessageid, python-zope.location,
+     python-zope.proxy, python-zope.publisher, python-zope.schema,
+     python-zope.security
+   * Adding python-profiler as a suggested package, since a Zope2
+     ZPublisher test module uses the profiler.
  .
  The person named in the Author field signed this changelog entry.
 Author: Michael Mulich (pumazi) <michael.mulich at gmail.com>
@@ -38,9 +49,9 @@
 +export ZFULLVER:=$(ZVER).10
 +export PIPVER:=0.8.1
 +
-+export DIST_DEST:=/usr/lib/zope2.12/lib/python2.6/site-packages
++export DIST_DEST:=/usr/lib/zope2.12/lib/python
 +export SCRIPT_DEST:=/usr/lib/zope2.12/bin
-+export PTH_DEST:=/usr/lib/zope2.12/lib/python2.6/site-packages
++export PTH_DEST:=/usr/lib/zope2.12/lib/python
 +
 +export PYTHONPATH:=
 +DESTDIR:=
@@ -147,9 +158,9 @@
 -dists-location = /home/mrm41/z2tar/testcase-env/lib/python2.6/site-packages
 -scripts-location = /home/mrm41/z2tar/testcase-env/bin
 -pth-location = /home/mrm41/z2tar/testcase-env/lib/python2.6/site-packages
-+dists-location = /usr/lib/zope2.12/lib/python2.6/site-packages
++dists-location = /usr/lib/zope2.12/lib/python
 +scripts-location = /usr/lib/zope2.12/bin
-+pth-location = /usr/lib/zope2.12/lib/python2.6/site-packages
++pth-location = /usr/lib/zope2.12/lib/python
  # Do we really need this if we are adjusting the path in rules build anyhow?
 -executable = /home/mrm41/z2tar/testcase-env/bin/python
 +executable = python

Added: zope2.12/branches/with-revived-tarball/debian/patches/fix_lib_location.patch
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/patches/fix_lib_location.patch	                        (rev 0)
+++ zope2.12/branches/with-revived-tarball/debian/patches/fix_lib_location.patch	2010-11-10 03:47:50 UTC (rev 2131)
@@ -0,0 +1,13 @@
+Fixing the python path to the zope2.x legacy location.
+--- a/configure
++++ b/configure
+@@ -51,8 +51,7 @@
+     python_version = '.'.join([str(i) for i in sys.version_info[:2]])
+     python_str = 'python'
+     prefixed_site_pkgs = os.path.join(prefix, 'lib',
+-                                      python_str + python_version,
+-                                      'site-packages')
++                                      python_str)
+     prefixed_bin_dir = os.path.join(prefix, 'bin')
+     python_exec = os.path.join(prefixed_bin_dir, python_str)
+     lib_dest = prefixed_site_pkgs

Modified: zope2.12/branches/with-revived-tarball/debian/patches/series
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/patches/series	2010-11-09 23:58:56 UTC (rev 2130)
+++ zope2.12/branches/with-revived-tarball/debian/patches/series	2010-11-10 03:47:50 UTC (rev 2131)
@@ -2,3 +2,4 @@
 webdav.patch
 deb-zopeconf.patch
 zodb-script-fix.patch
+fix_lib_location.patch

Modified: zope2.12/branches/with-revived-tarball/debian/rules
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/rules	2010-11-09 23:58:56 UTC (rev 2130)
+++ zope2.12/branches/with-revived-tarball/debian/rules	2010-11-10 03:47:50 UTC (rev 2131)
@@ -10,7 +10,16 @@
 export DH_VERBOSE=1
 
 ZVER:=2.12
+ZOPE:=zope$(ZVER)
+DEBIAN:=$(CURDIR)/debian
+DEB_SATISFIED:=ClientForm:Docutils:mechanize:pytz:transaction:zdaemon:ZConfig:ZODB3:zope.authentication:zope.browser:zope.component:zope.configuration:zope.contenttype:zope.copy:zope.event:zope.exceptions:zope.hookable:zope.i18n:zope.i18nmessageid:zope.location:zope.proxy:zope.publisher:zope.schema:zope.security:zope.testbrowser:zope.testing:zope.traversing
 
+# TODO:
+#  - Bring back lsb-release for Ubuntu support
+#  - sys.path insertion will happen in the upstream tarball. The feature was
+#    temporarily removed during the zc.buildout removal.
+#  - 
+
 %:
 	dh $@ 
 
@@ -22,11 +31,11 @@
 	dh_auto_clean --
 
 override_dh_auto_configure:
-	./configure --prefix=/usr/lib/zope${ZVER}
+	./configure --prefix=/usr/lib/${ZOPE}
 
 override_dh_auto_build:
 	make PYTHON=python \
-	     DIST_EXCLUSIONS=zope.traversing:zope.testbrowser:zope.testing:pytz:Docutils:ZODB3
+	     DIST_EXCLUSIONS=$(DEB_SATISFIED)
 
 override_dh_prep:
 	for f in debian/*.in; do \
@@ -39,8 +48,22 @@
 		fi; \
 	done
 	dh_prep --
+	dh_installzopeinstance -pzope$(ZVER)-sandbox sandbox
 
+override_dh_installdirs:
+	dh_installdirs --
+	echo "Zope$(ZVER) logs placeholder" > $(DEBIAN)/$(ZOPE)/var/log/$(ZOPE)/.placeholder
+
 override_dh_auto_install:
-	make install PYTHON=python DESTDIR=$(CURDIR)/debian/zope${ZVER}
+	make install PYTHON=python DESTDIR=$(DEBIAN)/$(ZOPE)
 
-.PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build override_dh_prep override_dh_auto_install
\ No newline at end of file
+override_dh_fixperms:
+	dh_fixperms --
+	chmod 755 \
+		$(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python/Zope2-*/ZPublisher/Client.py \
+		$(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python/Zope2-*/ZPublisher/Test.py
+	find $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python -type f -a \
+		\( -name \*.gif -o -name \*.html -o -name \*.dtml -o -name \*.txt -o -name \*.bat -o -name \*.jpg \) -exec chmod 644 {} \;
+	chmod 644 $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python/Zope2-*/Zope2/utilities/reindex_catalog.py
+
+.PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build override_dh_prep override_dh_installdirs override_dh_auto_install override_dh_fixperms

Modified: zope2.12/branches/with-revived-tarball/debian/zopeZVER.dirs.in
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/zopeZVER.dirs.in	2010-11-09 23:58:56 UTC (rev 2130)
+++ zope2.12/branches/with-revived-tarball/debian/zopeZVER.dirs.in	2010-11-10 03:47:50 UTC (rev 2131)
@@ -1,3 +1,9 @@
 usr/lib/zope2.12
 usr/lib/zope2.12/bin
-usr/lib/zope2.12/lib/python/site-packages
+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

More information about the pkg-zope-developers mailing list