[Python-modules-commits] r26641 - in packages/python-formencode/trunk/debian (5 files)

Mon Dec 2 20:30:39 UTC 2013

Date: Monday, December 2, 2013 @ 20:30:38
  Author: piotr
Revision: 26641

* New upstream release (closes: #727229)
  - works fine with Python 2.7, tested also with tests from github repo
    (closes: #606521)
* Rewrite debian/rules to use pybuild, dh-python added to Build-Depends
* debhelper's compat level changed to 9
* python-nose, python-dns and python-pycountry added to Build-Depends
  (used in tests which are run at build time now, closes: #606518)
* debian/watch file updated (closes: #727230)
* Standards-version bumped to 3.9.5 (dh sequencer covers build-* targets)

Modified:
  packages/python-formencode/trunk/debian/changelog
  packages/python-formencode/trunk/debian/compat
  packages/python-formencode/trunk/debian/control
  packages/python-formencode/trunk/debian/rules
  packages/python-formencode/trunk/debian/watch

Modified: packages/python-formencode/trunk/debian/changelog
===================================================================

--- packages/python-formencode/trunk/debian/changelog	2013-12-02 17:20:21 UTC (rev 26640)
+++ packages/python-formencode/trunk/debian/changelog	2013-12-02 20:30:38 UTC (rev 26641)
@@ -1,9 +1,21 @@
-python-formencode (1.2.4-3) UNRELEASED; urgency=low
+python-formencode (1.2.6-1) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:36 +0200
+  [ Piotr OÅ¼arowski ]
+  * New upstream release (closes: #727229)
+    - works fine with Python 2.7, tested also with tests from github repo
+      (closes: #606521)
+  * Rewrite debian/rules to use pybuild, dh-python added to Build-Depends
+  * debhelper's compat level changed to 9
+  * python-nose, python-dns and python-pycountry added to Build-Depends
+    (used in tests which are run at build time now, closes: #606518)
+  * debian/watch file updated (closes: #727230)
+  * Standards-version bumped to 3.9.5 (dh sequencer covers build-* targets)
 
+ -- Piotr OÅ¼arowski <piotr at debian.org>  Mon, 02 Dec 2013 20:54:01 +0100
+
 python-formencode (1.2.4-2) unstable; urgency=low
 
   * Add `set -e` to build loop (closes: #606620)

Modified: packages/python-formencode/trunk/debian/compat
===================================================================
--- packages/python-formencode/trunk/debian/compat	2013-12-02 17:20:21 UTC (rev 26640)
+++ packages/python-formencode/trunk/debian/compat	2013-12-02 20:30:38 UTC (rev 26641)
@@ -1 +1 @@
-5
+9

Modified: packages/python-formencode/trunk/debian/control
===================================================================
--- packages/python-formencode/trunk/debian/control	2013-12-02 17:20:21 UTC (rev 26640)
+++ packages/python-formencode/trunk/debian/control	2013-12-02 20:30:38 UTC (rev 26641)
@@ -1,11 +1,13 @@
 Source: python-formencode
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.6.6-3), python-setuptools (>= 0.6a9)
+Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3), python-setuptools (>= 0.6a9),
+# used in tests:
+ python-nose, python-pycountry, python-dns
 Maintainer: Fabio Tranchitella <kobold at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
  Piotr OÅ¼arowski <piotr at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.4
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-formencode/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-formencode/trunk/

Modified: packages/python-formencode/trunk/debian/rules
===================================================================
--- packages/python-formencode/trunk/debian/rules	2013-12-02 17:20:21 UTC (rev 26640)
+++ packages/python-formencode/trunk/debian/rules	2013-12-02 20:30:38 UTC (rev 26641)
@@ -1,57 +1,11 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+#! /usr/bin/make -f
+export PYBUILD_NAME=formencode
+export PYBUILD_TEST_NOSE=1
 
-PYVERS=$(shell pyversions -r debian/control)
-include /usr/share/python/python.mk
+%:
+	dh $@ --with python2 --buildsystem=pybuild
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	set -e; for python in $(PYVERS); \
-	    do $$python setup.py build; \
-	done
-	touch build-stamp
-
-clean:
-	dh_testdir
-	for python in $(PYVERS); \
-	    do $$python setup.py clean; \
-	done
-	rm -rf build-stamp build
-	rm -rf FormEncode.egg-info
-	find . -name '*\.py[co]' -delete
-	dh_clean
-
-install: build $(PYVERS:%=install-%)
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-
-install-python%:
-	python$* setup.py install $(py_setup_install_args) \
-		--skip-build --single-version-externally-managed \
-		--root debian/python-formencode
-	rm -rf debian/python-formencode/$(call py_libdir,$*)/formencode/i18n
+override_dh_auto_install:
+	dh_auto_install --buildsystem=pybuild
+	find debian/python-formencode/ -type d -name i18n --print0 | xargs --null --no-run-if-empty rm -rf
 	dh_install -X.po -X.py formencode/i18n/* /usr/share/locale/
-
-# Build architecture-dependent files here.
-binary-arch:
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -ppython-formencode
-	dh_installdocs -i docs/*.txt
-	dh_installchangelogs -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_python2 -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary

Modified: packages/python-formencode/trunk/debian/watch
===================================================================
--- packages/python-formencode/trunk/debian/watch	2013-12-02 17:20:21 UTC (rev 26640)
+++ packages/python-formencode/trunk/debian/watch	2013-12-02 20:30:38 UTC (rev 26641)
@@ -1,2 +1,3 @@
 version=3
-http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-(.*)\.tar\.gz debian uupdate
+opts=uversionmangle=s/(rc|dev|a|b|c)/~$1/ \
+http://pypi.python.org/packages/source/F/FormEncode/FormEncode-(.*)\.(?:tar\.gz|zip)


