[Python-modules-commits] r20948 - in packages/flufl.password/trunk/debian (3 files)

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

    Date: Tuesday, March 27, 2012 @ 19:13:18
  Author: warsaw-guest
Revision: 20948

* debian/rules:
  - Build and install Python 3 versions via % expansion targets instead
    of for loops in override targets.
  - Remove test target debugging output when DEB_BUILD_OPTIONS=nocheck.
  - Remove questionable workaround for bug 618367.
  - Better override_dh_auto_clean rule so that the package can be built
    twice in a row.
* debian/control:
  - Rename flufl.password-docs to the more usual flufl.password-doc
    without adding transitional packages since it has never been in a
    stable release.
  - Bump standards-version to 3.9.3 without further changes.

Modified:
  packages/flufl.password/trunk/debian/changelog
  packages/flufl.password/trunk/debian/control
  packages/flufl.password/trunk/debian/rules

Modified: packages/flufl.password/trunk/debian/changelog
===================================================================
--- packages/flufl.password/trunk/debian/changelog	2012-03-27 18:34:39 UTC (rev 20947)
+++ packages/flufl.password/trunk/debian/changelog	2012-03-27 19:13:18 UTC (rev 20948)
@@ -1,3 +1,20 @@
+flufl.password (1.2-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - Build and install Python 3 versions via % expansion targets instead
+      of for loops in override targets.
+    - Remove test target debugging output when DEB_BUILD_OPTIONS=nocheck.
+    - Remove questionable workaround for bug 618367.
+    - Better override_dh_auto_clean rule so that the package can be built
+      twice in a row.
+  * debian/control:
+    - Rename flufl.password-docs to the more usual flufl.password-doc
+      without adding transitional packages since it has never been in a
+      stable release.
+    - Bump standards-version to 3.9.3 without further changes.
+
+ -- Barry Warsaw <barry at python.org>  Tue, 27 Mar 2012 14:36:22 -0400
+
 flufl.password (1.2-1) unstable; urgency=low
 
   * Initial release (closes: #657082)

Modified: packages/flufl.password/trunk/debian/control
===================================================================
--- packages/flufl.password/trunk/debian/control	2012-03-27 18:34:39 UTC (rev 20947)
+++ packages/flufl.password/trunk/debian/control	2012-03-27 19:13:18 UTC (rev 20948)
@@ -12,13 +12,15 @@
                debhelper (>= 8),
                python3-all,
                python3-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/flufl.password/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/flufl.password/trunk/
 
-Package: python-flufl.password-docs
+Package: python-flufl.password-doc
 Architecture: all
 Section: doc
+Breaks: python-flufl.password-docs
+Replaces: python-flufl.password-docs
 Depends: ${sphinxdoc:Depends}, ${misc:Depends}
 Description: password hashing and verification (common documentation)
  This package provides utilities for hashing and verification of passwords, as
@@ -29,7 +31,7 @@
 Package: python-flufl.password
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
-Suggests: python-flufl.password-docs
+Suggests: python-flufl.password-doc
 Description: password hashing and verification (Python 2)
  This package provides utilities for hashing and verification of passwords, as
  well as generating user-friendly passwords.
@@ -37,7 +39,7 @@
 Package: python3-flufl.password
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}
-Suggests: python-flufl.password-docs
+Suggests: python-flufl.password-doc
 Description: password hashing and verification (Python 3)
  This package provides utilities for hashing and verification of passwords, as
  well as generating user-friendly passwords.

Modified: packages/flufl.password/trunk/debian/rules
===================================================================
--- packages/flufl.password/trunk/debian/rules	2012-03-27 18:34:39 UTC (rev 20947)
+++ packages/flufl.password/trunk/debian/rules	2012-03-27 19:13:18 UTC (rev 20948)
@@ -11,23 +11,19 @@
 	python$* setup.py test -vv
 
 override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
-else
-	@echo "nocheck set, skipping tests"
 endif
 
-override_dh_auto_build:
+build-python%:
+	python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
 	dh_auto_build
-	set -ex; for py in $(PYTHON3) ; do \
-		python$$py setup.py build; \
-	done;
 
-override_dh_auto_install:
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
 	dh_auto_install
-	set -ex; for py in $(PYTHON3) ; do \
-		python$$py setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
-	done;
-	# Debian bug #618367
-	rm -rf debian/*/usr/lib/python*/*-packages/flufl.password.egg-info
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k flufl/password/NEWS.rst
@@ -38,5 +34,5 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf build/sphinx
+	rm -rf build
 	rm -rf *.egg-info