[Python-modules-commits] r17462 - in packages/python-gflags/trunk/debian (6 files)

[soren-guest at users.alioth.debian.org]

    Date: Tuesday, June 14, 2011 @ 22:08:42
  Author: soren-guest
Revision: 17462

* Convert to dh7 and dh_python2.
* Bump Standards-Version to 3.9.2. No changes needed.

Added:
  packages/python-gflags/trunk/debian/docs
Modified:
  packages/python-gflags/trunk/debian/changelog
  packages/python-gflags/trunk/debian/compat
  packages/python-gflags/trunk/debian/control
  packages/python-gflags/trunk/debian/patches/python2.7-testsuite.patch
  packages/python-gflags/trunk/debian/rules

Modified: packages/python-gflags/trunk/debian/changelog
===================================================================
--- packages/python-gflags/trunk/debian/changelog	2011-06-14 21:27:15 UTC (rev 17461)
+++ packages/python-gflags/trunk/debian/changelog	2011-06-14 22:08:42 UTC (rev 17462)
@@ -2,6 +2,8 @@
 
   * New upstream release
   * python2.7-testsuite.patch: Make test suite pass with Python 2.7.
+  * Convert to dh7 and dh_python2.
+  * Bump Standards-Version to 3.9.2. No changes needed.
 
  -- Soren Hansen <soren at ubuntu.com>  Tue, 14 Jun 2011 13:58:41 +0200
 

Modified: packages/python-gflags/trunk/debian/compat
===================================================================
--- packages/python-gflags/trunk/debian/compat	2011-06-14 21:27:15 UTC (rev 17461)
+++ packages/python-gflags/trunk/debian/compat	2011-06-14 22:08:42 UTC (rev 17462)
@@ -1 +1 @@
-5
+7

Modified: packages/python-gflags/trunk/debian/control
===================================================================
--- packages/python-gflags/trunk/debian/control	2011-06-14 21:27:15 UTC (rev 17461)
+++ packages/python-gflags/trunk/debian/control	2011-06-14 22:08:42 UTC (rev 17462)
@@ -1,15 +1,15 @@
 Source: python-gflags
 Section: python
 Priority: optional
-Maintainer: Soren Hansen <soren at ubuntu.com>
-Build-Depends: python-support, debhelper (>= 5.0.38), python-setuptools (>= 0.6b3), python-all, cdbs
-XS-Python-Version: all
-Standards-Version: 3.9.1
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Soren Hansen <soren at ubuntu.com>
+Build-Depends: debhelper (>= 7.0.50~), python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3~)
+X-Python-Version: all
+Standards-Version: 3.9.2
 
 Package: python-gflags
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
-XB-Python-Version: ${python:Versions}
 Description: Python implementation of the Google command line flags module
  GFlags defines a distributed command line system, replacing systems like
  getopt(), optparse and manual argument processing. Rather than an application

Added: packages/python-gflags/trunk/debian/docs
===================================================================
Modified: packages/python-gflags/trunk/debian/patches/python2.7-testsuite.patch
===================================================================
--- packages/python-gflags/trunk/debian/patches/python2.7-testsuite.patch	2011-06-14 21:27:15 UTC (rev 17461)
+++ packages/python-gflags/trunk/debian/patches/python2.7-testsuite.patch	2011-06-14 22:08:42 UTC (rev 17462)
@@ -75,3 +75,26 @@
    def _GetNamesOfDefinedFlags(self, module, flag_values):
      """Returns the list of names of flags defined by a module.
  
+Index: python-gflags-1.5.1/test_module_baz.py
+===================================================================
+--- /dev/null
++++ python-gflags-1.5.1/test_module_baz.py
+@@ -0,0 +1,18 @@
++#!/usr/bin/python2.4
++#
++# Copyright 2010 Google Inc. All Rights Reserved.
++
++"""Auxiliary module for testing flags.py.
++
++The purpose of this module is to test the behavior of flags that are defined
++before main() executes.
++"""
++
++
++__author__ = 'mikecurtis at google.com (Michael Bennett Curtis)'
++
++import gflags as flags
++
++FLAGS = flags.FLAGS
++
++flags.DEFINE_boolean('tmod_baz_x', True, 'Boolean flag.')

Modified: packages/python-gflags/trunk/debian/rules
===================================================================
--- packages/python-gflags/trunk/debian/rules	2011-06-14 21:27:15 UTC (rev 17461)
+++ packages/python-gflags/trunk/debian/rules	2011-06-14 22:08:42 UTC (rev 17462)
@@ -1,27 +1,15 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM = pysupport
-DEB_DH_INSTALLCHANGELOGS_ARGS = ChangeLog
+%:
+	dh $@ --with python2
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-common-build-indep:: debian/stamp-makefile-check
-debian/stamp-makefile-check:
-	for pyversion in $(shell pyversions -vr); do python$$pyversion gflags_unittest.py; done
-	touch $@
-
-clean::
-	rm -f debian/stamp-makefile-check
+override_dh_auto_test:
+	dh_auto_test
+	for pyversion in $(shell pyversions -r); do $$pyversion gflags_unittest.py; done
 endif
 
-install/python-gflags::
+override_dh_auto_install:
+	dh_auto_install
 	mv $(CURDIR)/debian/python-gflags/usr/bin/gflags2man.py $(CURDIR)/debian/python-gflags/usr/bin/gflags2man
-	PYTHONPATH=$(CURDIR) python$(cdbs_python_current_version) gflags2man.py --dest_dir $(CURDIR) $(CURDIR)/debian/python-gflags/usr/bin/gflags2man
-
-binary-install/python-gflags::
-	for f in README AUTHORS; do rm "$(CURDIR)/debian/python-gflags/usr/share/doc/python-gflags/$$f"; done
-
-clean::
-	rm -f gflags2man.1
+	PYTHONPATH=$(CURDIR) python gflags2man.py --dest_dir $(CURDIR) $(CURDIR)/debian/python-gflags/usr/bin/gflags2man