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

barry at users.alioth.debian.org barry at users.alioth.debian.org
Thu Oct 2 18:43:02 UTC 2014


    Date: Thursday, October 2, 2014 @ 18:43:00
  Author: barry
Revision: 30839

* New upstream release.
* d/control:
  - Updated Maintainer email address.
  - Bump Standards-Version with no other changes necessary.
  - Updated Build-Depends.
  - wrap-and-sort
  - Updated descriptions.
* d/rules: Converted to --buildsystem=pybuild
* d/copyright: Converted to DEP-5 format.
* d/*.install: Obsolete; removed.
* d/patches/setup.patch: Obsolete; removed.
* d/tests: Added DEP-8 tests.

Added:
  packages/flufl.password/trunk/debian/python3-flufl.password.pyremove
  packages/flufl.password/trunk/debian/tests/
  packages/flufl.password/trunk/debian/tests/control
  packages/flufl.password/trunk/debian/tests/smoketest-2
  packages/flufl.password/trunk/debian/tests/smoketest-3
Modified:
  packages/flufl.password/trunk/debian/changelog
  packages/flufl.password/trunk/debian/control
  packages/flufl.password/trunk/debian/copyright
  packages/flufl.password/trunk/debian/patches/series
  packages/flufl.password/trunk/debian/rules
Deleted:
  packages/flufl.password/trunk/debian/patches/setup.patch
  packages/flufl.password/trunk/debian/python-flufl.password.install
  packages/flufl.password/trunk/debian/python3-flufl.password.install

Modified: packages/flufl.password/trunk/debian/changelog
===================================================================
--- packages/flufl.password/trunk/debian/changelog	2014-09-30 21:42:12 UTC (rev 30838)
+++ packages/flufl.password/trunk/debian/changelog	2014-10-02 18:43:00 UTC (rev 30839)
@@ -1,11 +1,26 @@
-flufl.password (1.2.1-2) UNRELEASED; urgency=low
+flufl.password (1.3-1) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
   * Remove DM-Upload-Allowed; it's no longer used by the archive
     software.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:40:49 +0200
+  [ Barry Warsaw ]
+  * New upstream release.
+  * d/control:
+    - Updated Maintainer email address.
+    - Bump Standards-Version with no other changes necessary.
+    - Updated Build-Depends.
+    - wrap-and-sort
+    - Updated descriptions.
+  * d/rules: Converted to --buildsystem=pybuild
+  * d/copyright: Converted to DEP-5 format.
+  * d/*.install: Obsolete; removed.
+  * d/patches/setup.patch: Obsolete; removed.
+  * d/tests: Added DEP-8 tests.
 
+ -- Barry Warsaw <barry at debian.org>  Thu, 02 Oct 2014 13:53:17 -0400
+
 flufl.password (1.2.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/flufl.password/trunk/debian/control
===================================================================
--- packages/flufl.password/trunk/debian/control	2014-09-30 21:42:12 UTC (rev 30838)
+++ packages/flufl.password/trunk/debian/control	2014-10-02 18:43:00 UTC (rev 30839)
@@ -1,18 +1,20 @@
 Source: flufl.password
-Maintainer: Barry Warsaw <barry at python.org>
+Maintainer: Barry Warsaw <barry at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Homepage: http://launchpad.net/flufl.password
 Section: python
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 Priority: optional
-Build-Depends: python-all (>= 2.6.6-3~),
+Build-Depends: debhelper (>= 8),
+               dh-python,
+               python-all (>= 2.6.6-3~),
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg-1~),
-               debhelper (>= 8),
                python3-all,
                python3-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
+XS-Testsuite: autopkgtest
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/flufl.password/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/flufl.password/trunk/
 
@@ -21,7 +23,7 @@
 Section: doc
 Breaks: python-flufl.password-docs
 Replaces: python-flufl.password-docs
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Description: password hashing and verification (common documentation)
  This package provides utilities for hashing and verification of passwords, as
  well as generating user-friendly passwords.
@@ -30,17 +32,19 @@
 
 Package: python-flufl.password
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Suggests: python-flufl.password-doc
-Description: password hashing and verification (Python 2)
+Description: password hashing and verification
  This package provides utilities for hashing and verification of passwords, as
  well as generating user-friendly passwords.
+ .
+ This is the Python 2 version of the package.
 
 Package: python3-flufl.password
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Suggests: python-flufl.password-doc
-Description: password hashing and verification (Python 3)
+Description: password hashing and verification
  This package provides utilities for hashing and verification of passwords, as
  well as generating user-friendly passwords.
  .

Modified: packages/flufl.password/trunk/debian/copyright
===================================================================
--- packages/flufl.password/trunk/debian/copyright	2014-09-30 21:42:12 UTC (rev 30838)
+++ packages/flufl.password/trunk/debian/copyright	2014-10-02 18:43:00 UTC (rev 30839)
@@ -1,40 +1,41 @@
-This work was packaged for Debian by:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: flufl.password
+Source: http://pypi.python.org/pypi/flufl.password
 
-    Barry A. Warsaw <barry at python.org> on 2012-01-23
+Files: *
+Copyright: Copyright 2004-2014 Barry A. Warsaw <barry at python.org>
+License: LGPL-3
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this package. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 3 can be found in the file `/usr/share/common-licenses/LGPL-3'.
 
-It was downloaded from:
-
-    <http://pypi.python.org/pypi/flufl.password>
-
-Upstream Author:
-
-    Barry Warsaw <barry at python.org>
-
-Copyright:
-
-    <Copyright (C) 2004-2012 Barry A. Warsaw>
-
-License:
-
-    This package is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this package. If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in "/usr/share/common-licenses/LGPL-3".
-
-The Debian packaging is:
-
-    Copyright (C) 2012 Barry A. Warsaw <barry at python.org>
-
-and is licensed under the LGPL version 3,
-see "/usr/share/common-licenses/LGPL-3".
+Files: debian/*
+Copyright: Copyright 2012-2014 Barry A. Warsaw <barry at debian.org>
+License: LGPL-3
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this package. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 3 can be found in the file `/usr/share/common-licenses/LGPL-3'.

Modified: packages/flufl.password/trunk/debian/patches/series
===================================================================
--- packages/flufl.password/trunk/debian/patches/series	2014-09-30 21:42:12 UTC (rev 30838)
+++ packages/flufl.password/trunk/debian/patches/series	2014-10-02 18:43:00 UTC (rev 30839)
@@ -1 +0,0 @@
-setup.patch

Deleted: packages/flufl.password/trunk/debian/patches/setup.patch
===================================================================
--- packages/flufl.password/trunk/debian/patches/setup.patch	2014-09-30 21:42:12 UTC (rev 30838)
+++ packages/flufl.password/trunk/debian/patches/setup.patch	2014-10-02 18:43:00 UTC (rev 30839)
@@ -1,20 +0,0 @@
-Description: Comment out distribute_setup since this could lead to the
- downloading of distribute from PyPI.
-Author: Barry Warsaw <barry at python.org>
-Forwarded: not-needed
-
-=== modified file 'setup.py'
---- a/setup.py	2012-01-23 21:58:35 +0000
-+++ b/setup.py	2012-01-27 00:56:49 +0000
-@@ -15,8 +15,8 @@
- # You should have received a copy of the GNU Lesser General Public License
- # along with flufl.password.  If not, see <http://www.gnu.org/licenses/>.
- 
--import distribute_setup
--distribute_setup.use_setuptools()
-+## import distribute_setup
-+## distribute_setup.use_setuptools()
- 
- from setup_helpers import (
-     description, get_version, long_description, require_python)
-

Deleted: packages/flufl.password/trunk/debian/python-flufl.password.install
===================================================================
--- packages/flufl.password/trunk/debian/python-flufl.password.install	2014-09-30 21:42:12 UTC (rev 30838)
+++ packages/flufl.password/trunk/debian/python-flufl.password.install	2014-10-02 18:43:00 UTC (rev 30839)
@@ -1 +0,0 @@
-usr/lib/python2*

Deleted: packages/flufl.password/trunk/debian/python3-flufl.password.install
===================================================================
--- packages/flufl.password/trunk/debian/python3-flufl.password.install	2014-09-30 21:42:12 UTC (rev 30838)
+++ packages/flufl.password/trunk/debian/python3-flufl.password.install	2014-10-02 18:43:00 UTC (rev 30839)
@@ -1 +0,0 @@
-usr/lib/python3

Added: packages/flufl.password/trunk/debian/python3-flufl.password.pyremove
===================================================================
--- packages/flufl.password/trunk/debian/python3-flufl.password.pyremove	                        (rev 0)
+++ packages/flufl.password/trunk/debian/python3-flufl.password.pyremove	2014-10-02 18:43:00 UTC (rev 30839)
@@ -0,0 +1 @@
+flufl.password-*.egg-info

Modified: packages/flufl.password/trunk/debian/rules
===================================================================
--- packages/flufl.password/trunk/debian/rules	2014-09-30 21:42:12 UTC (rev 30838)
+++ packages/flufl.password/trunk/debian/rules	2014-10-02 18:43:00 UTC (rev 30839)
@@ -1,38 +1,13 @@
 #!/usr/bin/make -f
 
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
+export PYBUILD_NAME=flufl.password
 
 %:
-	dh $@ --with python2,python3,sphinxdoc
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-test-python%:
-	python$* setup.py test -vv
-
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
-endif
-
-build-python%:
-	python$* setup.py build
-
-override_dh_auto_build: $(PYTHON3:%=build-python%)
-	dh_auto_build
-
-install-python%:
-	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
-
-override_dh_auto_install: $(PYTHON3:%=install-python%)
-	dh_auto_install
-
 override_dh_installchangelogs:
 	dh_installchangelogs -k flufl/password/NEWS.rst
 
 override_dh_installdocs:
 	python setup.py build_sphinx
 	dh_installdocs build/sphinx/html
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf build
-	rm -rf *.egg-info

Added: packages/flufl.password/trunk/debian/tests/control
===================================================================
--- packages/flufl.password/trunk/debian/tests/control	                        (rev 0)
+++ packages/flufl.password/trunk/debian/tests/control	2014-10-02 18:43:00 UTC (rev 30839)
@@ -0,0 +1,2 @@
+Tests: smoketest-2 smoketest-3
+Depends: @

Added: packages/flufl.password/trunk/debian/tests/smoketest-2
===================================================================
--- packages/flufl.password/trunk/debian/tests/smoketest-2	                        (rev 0)
+++ packages/flufl.password/trunk/debian/tests/smoketest-2	2014-10-02 18:43:00 UTC (rev 30839)
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+import flufl.password
+print flufl.password.__file__, flufl.password.__version__

Added: packages/flufl.password/trunk/debian/tests/smoketest-3
===================================================================
--- packages/flufl.password/trunk/debian/tests/smoketest-3	                        (rev 0)
+++ packages/flufl.password/trunk/debian/tests/smoketest-3	2014-10-02 18:43:00 UTC (rev 30839)
@@ -0,0 +1,4 @@
+#!/usr/bin/python3
+
+import flufl.password
+print(flufl.password.__file__, flufl.password.__version__)




More information about the Python-modules-commits mailing list