r1963 - in zodb/trunk/debian (changelog control rules)

[kobold at users.alioth.debian.org]

    Date: Tuesday, January 5, 2010 @ 21:19:53
  Author: kobold
Revision: 1963

* New upstream release.
* Convert to debhelper 7 and the pydeb dh7 extension.

Modified:
  zodb/trunk/debian/changelog
  zodb/trunk/debian/control
  zodb/trunk/debian/rules

Modified: zodb/trunk/debian/changelog
===================================================================
--- zodb/trunk/debian/changelog	2010-01-05 21:17:15 UTC (rev 1962)
+++ zodb/trunk/debian/changelog	2010-01-05 21:19:53 UTC (rev 1963)
@@ -1,9 +1,14 @@
-zodb (1:3.9.1-3) UNRELEASED; urgency=low
+zodb (1:3.9.3-1) unstable; urgency=low
 
+  [ Brian Sutherland ]
   * debian/tests/all: Test the correct python modules.
 
- -- Brian Sutherland <brian at vanguardistas.net>  Sun, 22 Nov 2009 15:04:27 +0100
+  [ Fabio Tranchitella ]
+  * New upstream release.
+  * Convert to debhelper 7 and the pydeb dh7 extension.
 
+ -- Fabio Tranchitella <kobold at debian.org>  Tue, 05 Jan 2010 22:22:35 +0100
+
 zodb (1:3.9.1-2) unstable; urgency=low
 
   * debian/control: build-depend on pyton-vab.pydeb >= 1.3.0-2.

Modified: zodb/trunk/debian/control
===================================================================
--- zodb/trunk/debian/control	2010-01-05 21:17:15 UTC (rev 1962)
+++ zodb/trunk/debian/control	2010-01-05 21:19:53 UTC (rev 1963)
@@ -3,23 +3,24 @@
 Priority: extra
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <brian at vanguardistas.net>, Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b9), python-van.pydeb (>= 1.3.0-2)
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b9), python-van.pydeb (>= 1.3.0-4)
 Standards-Version: 3.8.3
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zodb/trunk
 
 Package: python-zodb
 Architecture: any
-Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
-Provides: ${setuptools:Provides}, ${python:Provides}
-Suggests: ${setuptools:Suggests}
+Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Recommends: ${pydeb:Recommends}
+Provides: ${pydeb:Provides}, ${python:Provides}
+Suggests: ${pydeb:Suggests}
+Conflicts: zope3, python2.4-zodb
 Replaces: zope3, python2.4-zodb
 XB-Python-Version: ${python:Versions}
-Description: set of tools for using the Zope Object Database (ZODB)
- The Zope Object Database provides an object-oriented database for 
- Python that provides a high-degree of transparency. Applications 
- can take advantage of object database features with few, if any, 
- changes to application logic. 
+Description: Set of tools for using the Zope Object Database (ZODB)
+ The Zope Object Database provides an object-oriented database for Python that
+ provides a high-degree of transparency. Applications can take advantage of
+ object database features with few, if any, changes to application logic. 
  .
- ZODB includes features such as a pluggable storage interface, 
- rich transaction support, and undo.
+ ZODB includes features such as a pluggable storage interface, rich transaction
+ support, and undo.

Modified: zodb/trunk/debian/rules
===================================================================
--- zodb/trunk/debian/rules	2010-01-05 21:17:15 UTC (rev 1962)
+++ zodb/trunk/debian/rules	2010-01-05 21:19:53 UTC (rev 1963)
@@ -1,11 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
+%:
+	dh --with pydeb --with python-central $@
 
-post-install-python%:
-	for i in fsdump fsoids fsrefs fstail mkzeoinst repozo runzeo strip_versions zeoctl zeopack zeopasswd; do \
-	    mv debian/$(package)/usr/bin/$$i debian/$(package)/usr/bin/$${i}$*; \
-	done
-	sed -s -i -e 's/python2.3/python/g' debian/$(package)/$(call py_libdir,$*)/ZEO/zeoctl.py
-	sed -s -i -e 's/python2.3/python/g' debian/$(package)/$(call py_libdir,$*)/ZEO/scripts/*.py
-	sed -s -i -e 's/python2.3/python/g' debian/$(package)/$(call py_libdir,$*)/ZODB/scripts/*.py
+override_dh_install::
+	dh_install
+	# console scripts
+	rm debian/python-zc.buildout/usr/README.txt
+	for script in debian/python-zc.buildout/usr/bin/*; do \
+	  for py in $(shell pyversions -vr debian/control); do \
+	    cat $$script |  sed -e "s,/usr/bin/python,/usr/bin/python$$py,g" > $$script$$py; \
+	    chmod 755 $$script$$py; \
+	  done; \
+	  rm $$script; \
+	done;