[Python-modules-commits] r31058 - in packages/nose2/trunk/debian (7 files)

Wed Oct 15 18:54:52 UTC 2014

Date: Wednesday, October 15, 2014 @ 18:54:50
  Author: barry
Revision: 31058

* New upstream release.
* d/control:
  - Bumped Standards-Version to 3.9.6 with no other changes necessary.
  - Removed unused build dependency on python-tox.
  - Added Vcs-* headers.
  - Use PyPI as the Homepage.
* d/rules:
  - Now that PYBUILD_NAME works, use it.
  - Added dh_installman override to build manpages via help2man.
* d/patches:
  - doc-support.patch obsolete; removed.
  - requirements.patch: Refreshed.
* d/*.manpages: Added.

Added:
  packages/nose2/trunk/debian/python-nose2.manpages
  packages/nose2/trunk/debian/python3-nose2.manpages
Modified:
  packages/nose2/trunk/debian/changelog
  packages/nose2/trunk/debian/control
  packages/nose2/trunk/debian/patches/requirements.patch
  packages/nose2/trunk/debian/patches/series
  packages/nose2/trunk/debian/rules

Modified: packages/nose2/trunk/debian/changelog
===================================================================

--- packages/nose2/trunk/debian/changelog	2014-10-15 09:04:33 UTC (rev 31057)
+++ packages/nose2/trunk/debian/changelog	2014-10-15 18:54:50 UTC (rev 31058)
@@ -1,3 +1,21 @@
+nose2 (0.5.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * d/control:
+    - Bumped Standards-Version to 3.9.6 with no other changes necessary.
+    - Removed unused build dependency on python-tox.
+    - Added Vcs-* headers.
+    - Use PyPI as the Homepage.
+  * d/rules:
+    - Now that PYBUILD_NAME works, use it.
+    - Added dh_installman override to build manpages via help2man.
+  * d/patches:
+    - doc-support.patch obsolete; removed.
+    - requirements.patch: Refreshed.
+  * d/*.manpages: Added.
+
+ -- Barry Warsaw <barry at debian.org>  Wed, 15 Oct 2014 11:41:09 -0400
+
 nose2 (0.4.7-2) unstable; urgency=low
 
   * debian/copyright: Describe Python-derived files.

Modified: packages/nose2/trunk/debian/control
===================================================================
--- packages/nose2/trunk/debian/control	2014-10-15 09:04:33 UTC (rev 31057)
+++ packages/nose2/trunk/debian/control	2014-10-15 18:54:50 UTC (rev 31058)
@@ -5,18 +5,20 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper,
                dh-python,
+               help2man,
                python-all,
                python-setuptools,
                python-six,
                python-sphinx,
-               python-tox,
                python3-all,
                python3-setuptools,
                python3-six
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
-Standards-Version: 3.9.4
-Homepage: https://nose2.readthedocs.org/en/latest/index.html
+Standards-Version: 3.9.6
+Homepage: https://pypi.python.org/pypi/nose2
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/nose2/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/nose2/trunk/
 
 Package: python-nose2-doc
 Architecture: all

Modified: packages/nose2/trunk/debian/patches/requirements.patch
===================================================================
--- packages/nose2/trunk/debian/patches/requirements.patch	2014-10-15 09:04:33 UTC (rev 31057)
+++ packages/nose2/trunk/debian/patches/requirements.patch	2014-10-15 18:54:50 UTC (rev 31058)
@@ -6,7 +6,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -69,7 +69,9 @@
+@@ -74,7 +74,9 @@
              '%s = nose2:discover' % SCRIPT2,
          ],
      }

Modified: packages/nose2/trunk/debian/patches/series
===================================================================
--- packages/nose2/trunk/debian/patches/series	2014-10-15 09:04:33 UTC (rev 31057)
+++ packages/nose2/trunk/debian/patches/series	2014-10-15 18:54:50 UTC (rev 31058)
@@ -1,2 +1 @@
 requirements.patch
-doc-support.patch

Added: packages/nose2/trunk/debian/python-nose2.manpages
===================================================================
--- packages/nose2/trunk/debian/python-nose2.manpages	                        (rev 0)
+++ packages/nose2/trunk/debian/python-nose2.manpages	2014-10-15 18:54:50 UTC (rev 31058)
@@ -0,0 +1,2 @@
+debian/nose2.1
+debian/nose2-2.7.1

Added: packages/nose2/trunk/debian/python3-nose2.manpages
===================================================================
--- packages/nose2/trunk/debian/python3-nose2.manpages	                        (rev 0)
+++ packages/nose2/trunk/debian/python3-nose2.manpages	2014-10-15 18:54:50 UTC (rev 31058)
@@ -0,0 +1,2 @@
+debian/nose2-3.1
+debian/nose2-3.4.1

Modified: packages/nose2/trunk/debian/rules
===================================================================
--- packages/nose2/trunk/debian/rules	2014-10-15 09:04:33 UTC (rev 31057)
+++ packages/nose2/trunk/debian/rules	2014-10-15 18:54:50 UTC (rev 31058)
@@ -1,17 +1,10 @@
 #!/usr/bin/make -f
 
-#DH_VERBOSE=1
+#export DH_VERBOSE=1
+export PYBUILD_NAME=nose2
+export pkgversion=$(shell dpkg-parsechangelog --show-field version)
 
-# This doesn't work yet.
-#export PYBUILD_NAME=nose2
-export PYBUILD_DESTDIR_python2=debian/python-nose2
-export PYBUILD_DESTDIR_python3=debian/python3-nose2
 
-
-# Prevent setuptools/distribute from accessing the internet.
-export http_proxy = http://127.0.9.1:9
-export https_proxy = https://127.0.9.1:9
-
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
@@ -24,3 +17,14 @@
 	dh_auto_install
 	mv debian/python3-nose2/usr/bin/nose2 \
 	   debian/python3-nose2/usr/bin/nose2-3
+
+override_dh_installman:
+	PYTHONPATH=$(CURDIR) help2man -n nose2 -s 1 -o debian/nose2.1 \
+		 --version-string=$(pkgversion) --no-discard-stderr --no-info \
+		 debian/python-nose2/usr/bin/nose2
+	PYTHONPATH=$(CURDIR) help2man -n nose2-3 -s 1 -o debian/nose2-3.1 \
+		 --version-string=$(pkgversion) --no-discard-stderr --no-info \
+		 debian/python3-nose2/usr/bin/nose2-3
+	cp debian/nose2.1   debian/nose2-2.7.1
+	cp debian/nose2-3.1 debian/nose2-3.4.1
+	dh_installman


