[Python-modules-commits] r21061 - in packages/mocker/trunk/debian (4 files)

[plessy at users.alioth.debian.org]

    Date: Thursday, April 5, 2012 @ 14:07:21
  Author: plessy
Revision: 21061

Merge Ubuntu's changes.

Modified:
  packages/mocker/trunk/debian/changelog
  packages/mocker/trunk/debian/control
  packages/mocker/trunk/debian/rules
Deleted:
  packages/mocker/trunk/debian/pycompat

Modified: packages/mocker/trunk/debian/changelog
===================================================================
--- packages/mocker/trunk/debian/changelog	2012-04-05 13:57:40 UTC (rev 21060)
+++ packages/mocker/trunk/debian/changelog	2012-04-05 14:07:21 UTC (rev 21061)
@@ -1,3 +1,21 @@
+mocker (1.0-2) UNRELEASED; urgency=low
+
+  * Merge Ubuntu's changes (debian/rules, debian/control, debian/pycompat).
+
+ -- Charles Plessy <plessy at debian.org>  Thu, 05 Apr 2012 23:05:16 +0900
+
+mocker (1.0-0ubuntu3) precise; urgency=low
+
+  * Rebuild to drop python2.6 dependencies.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sat, 31 Dec 2011 02:05:27 +0000
+
+mocker (1.0-0ubuntu2) oneiric; urgency=low
+
+  * Convert to dh_python2 and eliminate cdbs.  (LP: #621242)
+
+ -- Barry Warsaw <barry at ubuntu.com>  Fri, 09 Sep 2011 10:26:08 -0400
+
 mocker (1.0-1) experimental; urgency=low
 
   * Initial Debian upload (Closes: #595209)

Modified: packages/mocker/trunk/debian/control
===================================================================
--- packages/mocker/trunk/debian/control	2012-04-05 13:57:40 UTC (rev 21060)
+++ packages/mocker/trunk/debian/control	2012-04-05 14:07:21 UTC (rev 21061)
@@ -3,20 +3,17 @@
 Uploaders: Rodney Dawes <rodney.dawes at ubuntu.com>
 Section: python
 Priority: optional
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Build-Depends-Indep:
-    python-setuptools,
-    python-support
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-all
-XS-Python-Version: all
+    python-setuptools
+Build-Depends: python-all (>= 2.6.6-3~),
+               debhelper (>= 7.0.50)
 Homepage: http://labix.org/mocker
 
 Package: python-mocker
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
-XB-Python-Version: ${python:Versions}
 Description: Mocker object mocking framework
  Mocker provides an API for mocking Python objects in unit tests. Mocker
  provides graceful creation of test doubles (mocks, stubs, fakes, and dummies)
  for Python testing needs.
-

Deleted: packages/mocker/trunk/debian/pycompat
===================================================================
--- packages/mocker/trunk/debian/pycompat	2012-04-05 13:57:40 UTC (rev 21060)
+++ packages/mocker/trunk/debian/pycompat	2012-04-05 14:07:21 UTC (rev 21061)
@@ -1 +0,0 @@
-2

Modified: packages/mocker/trunk/debian/rules
===================================================================
--- packages/mocker/trunk/debian/rules	2012-04-05 13:57:40 UTC (rev 21060)
+++ packages/mocker/trunk/debian/rules	2012-04-05 14:07:21 UTC (rev 21061)
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_PYTHON_SYSTEM=pysupport
-include /usr/share/cdbs/1/class/python-distutils.mk
+PYTHON2=$(shell pyversions -vr)
 
-common-build-arch common-build-indep:: debian/stamp-check
-debian/stamp-check:
-	cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) test.py
-	touch $@
+%:
+	dh $@ --with python2
 
-makefile-clean::
-	rm -f debian/stamp-check
+test-python%:
+	python$* test.py -vv
+
+override_dh_auto_test: $(PYTHON2:%=test-python%)
+
+override_dh_installchangelogs:
+	dh_installchangelogs -k NEWS