r2864 - in zope.contenttype/trunk/debian (7 files)

[barry at users.alioth.debian.org]

    Date: Tuesday, July 8, 2014 @ 19:10:50
  Author: barry
Revision: 2864

* debian/control:
  - Updated Build-Depends.
  - Added myself to Uploaders.
  - wrap-and-sort
* debian/compat: Bumped to version 9.
* debian/rules: Converted to --buildsystem=pybuild and simplify.
* debian/tests:
  - all: Simplified to just making sure the import works.
  - all-3: Added
  - control: Updated.

Added:
  zope.contenttype/trunk/debian/tests/all-3
Modified:
  zope.contenttype/trunk/debian/changelog
  zope.contenttype/trunk/debian/compat
  zope.contenttype/trunk/debian/control
  zope.contenttype/trunk/debian/rules
  zope.contenttype/trunk/debian/tests/all
  zope.contenttype/trunk/debian/tests/control

Modified: zope.contenttype/trunk/debian/changelog
===================================================================
--- zope.contenttype/trunk/debian/changelog	2014-07-02 22:40:59 UTC (rev 2863)
+++ zope.contenttype/trunk/debian/changelog	2014-07-08 19:10:50 UTC (rev 2864)
@@ -1,6 +1,8 @@
 zope.contenttype (4.0.1-1) UNRELEASED; urgency=low
 
   * Team upload.
+
+  [ Gediminas Paulauskas ]
   * New upstream release.
   * Add support for Python 3
   * debian/control:
@@ -10,6 +12,18 @@
   * debian/tests: switch to zope.testrunner.
   * debian/tests/all: specify the package to test
 
+  [ Barry Warsaw ]
+  * debian/control:
+    - Updated Build-Depends.
+    - Added myself to Uploaders.
+    - wrap-and-sort
+  * debian/compat: Bumped to version 9.
+  * debian/rules: Converted to --buildsystem=pybuild and simplify.
+  * debian/tests:
+    - all: Simplified to just making sure the import works.
+    - all-3: Added
+    - control: Updated.
+
  -- Gediminas Paulauskas <menesis at pov.lt>  Tue, 17 Jun 2014 17:32:12 +0300
 
 zope.contenttype (3.5.3-2) unstable; urgency=low

Modified: zope.contenttype/trunk/debian/compat
===================================================================
--- zope.contenttype/trunk/debian/compat	2014-07-02 22:40:59 UTC (rev 2863)
+++ zope.contenttype/trunk/debian/compat	2014-07-08 19:10:50 UTC (rev 2864)
@@ -1 +1 @@
-7
+9

Modified: zope.contenttype/trunk/debian/control
===================================================================
--- zope.contenttype/trunk/debian/control	2014-07-02 22:40:59 UTC (rev 2863)
+++ zope.contenttype/trunk/debian/control	2014-07-08 19:10:50 UTC (rev 2864)
@@ -3,11 +3,13 @@
 Priority: optional
 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 (>= 7.0.50~),
+           Fabio Tranchitella <kobold at debian.org>,
+           Barry Warsaw <barry at debian.org>
+Build-Depends: debhelper (>= 9),
+               dh-python,
                python-all (>= 2.6.6-14~),
+               python-setuptools,
                python3-all,
-               python-setuptools,
                python3-setuptools
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
@@ -19,12 +21,12 @@
 
 Package: python-zope.contenttype
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Description: Utility module for content-type handling
  This package provides a simple utility module for content-type handling.
 
 Package: python3-zope.contenttype
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Description: Utility module for content-type handling
  This package provides a simple utility module for content-type handling.

Modified: zope.contenttype/trunk/debian/rules
===================================================================
--- zope.contenttype/trunk/debian/rules	2014-07-02 22:40:59 UTC (rev 2863)
+++ zope.contenttype/trunk/debian/rules	2014-07-08 19:10:50 UTC (rev 2864)
@@ -1,27 +1,7 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ --with python2,python3
+export PYBUILD_NAME=zope.contenttype
 
-package=python-zope.contenttype
-package3=python3-zope.contenttype
 
-override_dh_auto_build:
-	set -ex; for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py build; \
-	done
-	set -ex; for pyvers in $(shell py3versions -sv); do \
-		python$$pyvers setup.py build; \
-	done
-
-override_dh_auto_install:
-	set -ex; \
-	for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/$(package); \
-	done
-	set -ex; \
-	for pyvers in $(shell py3versions -vs); do \
-		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/$(package3); \
-	done
+%:
+	dh $@ --with python2,python3 --buildsystem=pybuild

Modified: zope.contenttype/trunk/debian/tests/all
===================================================================
--- zope.contenttype/trunk/debian/tests/all	2014-07-02 22:40:59 UTC (rev 2863)
+++ zope.contenttype/trunk/debian/tests/all	2014-07-08 19:10:50 UTC (rev 2864)
@@ -1,3 +1,4 @@
-#!/bin/bash
-testfilter="-s zope.contenttype"
-. /usr/share/python-zope.testrunner/test_helper
+#!/usr/bin/python
+
+import zope.contenttype
+print zope.contenttype

Added: zope.contenttype/trunk/debian/tests/all-3
===================================================================
--- zope.contenttype/trunk/debian/tests/all-3	                        (rev 0)
+++ zope.contenttype/trunk/debian/tests/all-3	2014-07-08 19:10:50 UTC (rev 2864)
@@ -0,0 +1,4 @@
+#!/usr/bin/python3
+
+import zope.contenttype
+print(zope.contenttype)

Modified: zope.contenttype/trunk/debian/tests/control
===================================================================
--- zope.contenttype/trunk/debian/tests/control	2014-07-02 22:40:59 UTC (rev 2863)
+++ zope.contenttype/trunk/debian/tests/control	2014-07-08 19:10:50 UTC (rev 2864)
@@ -1,5 +1,2 @@
-Tests: all
-Depends: @, python-zope.testrunner
-
-Tests: all-3
-Depends: @, python3-zope.testrunner
+Tests: all all-3
+Depends: @