[Python-modules-commits] r30759 - in packages/flufl.lock/trunk/debian (8 files)

Fri Sep 26 15:35:18 UTC 2014

Date: Friday, September 26, 2014 @ 15:35:18
  Author: barry
Revision: 30759

* New upstream release.
* d/control:
  - Added Build-Depends on dh-python.
  - Bumped Standards-Version to 3.9.5 with no other changes necessary.
  - wrap-and-sort
* d/rules: Switch to --buildsystem=pybuild and simplify.
* d/*.install: Obsolete; removed.
* d/patches/setup.patch: Obsolete; removed.

Added:
  packages/flufl.lock/trunk/debian/python3-flufl.lock.pyremove
Modified:
  packages/flufl.lock/trunk/debian/changelog
  packages/flufl.lock/trunk/debian/control
  packages/flufl.lock/trunk/debian/patches/series
  packages/flufl.lock/trunk/debian/rules
Deleted:
  packages/flufl.lock/trunk/debian/patches/setup.patch
  packages/flufl.lock/trunk/debian/python-flufl.lock.install
  packages/flufl.lock/trunk/debian/python3-flufl.lock.install

Modified: packages/flufl.lock/trunk/debian/changelog
===================================================================

--- packages/flufl.lock/trunk/debian/changelog	2014-09-26 15:27:39 UTC (rev 30758)
+++ packages/flufl.lock/trunk/debian/changelog	2014-09-26 15:35:18 UTC (rev 30759)
@@ -1,11 +1,22 @@
-flufl.lock (2.2.1-3) UNRELEASED; urgency=low
+flufl.lock (2.3.1-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:48 +0200
+  [ Barry Warsaw ]
+  * New upstream release.
+  * d/control:
+    - Added Build-Depends on dh-python.
+    - Bumped Standards-Version to 3.9.5 with no other changes necessary.
+    - wrap-and-sort
+  * d/rules: Switch to --buildsystem=pybuild and simplify.
+  * d/*.install: Obsolete; removed.
+  * d/patches/setup.patch: Obsolete; removed.
 
+ -- Barry Warsaw <barry at debian.org>  Fri, 26 Sep 2014 11:04:58 -0400
+
 flufl.lock (2.2.1-2) unstable; urgency=low
 
   * debian/control: Fix Depends line so that python3-flufl.lock

Modified: packages/flufl.lock/trunk/debian/control
===================================================================
--- packages/flufl.lock/trunk/debian/control	2014-09-26 15:27:39 UTC (rev 30758)
+++ packages/flufl.lock/trunk/debian/control	2014-09-26 15:35:18 UTC (rev 30759)
@@ -6,15 +6,16 @@
 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-pkg-resources,
                python-setuptools,
-               python-pkg-resources,
                python-sphinx (>= 1.0.7+dfsg-1~),
-               debhelper (>= 8),
                python3-all,
-               python3-setuptools,
-               python3-pkg-resources
-Standards-Version: 3.9.3
+               python3-pkg-resources,
+               python3-setuptools
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/flufl.lock/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/flufl.lock/trunk/
 
@@ -23,27 +24,27 @@
 Section: doc
 Breaks: python-flufl.lock-docs
 Replaces: python-flufl.lock-docs
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Description: NFS-safe file-based lock with timeouts (common documentation)
- This package provides an NFS-safe file-based locking algorithm influenced 
+ This package provides an NFS-safe file-based locking algorithm influenced
  by the GNU/Linux open(2) manpage, under the  description of the O_EXCL option.
  .
  This is the common documentation package.
 
 Package: python-flufl.lock
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Suggests: python-flufl.lock-doc
 Description: NFS-safe file-based lock with timeouts (Python 2)
- This package provides an NFS-safe file-based locking algorithm influenced 
+ This package provides an NFS-safe file-based locking algorithm influenced
  by the GNU/Linux open(2) manpage, under the  description of the O_EXCL option.
 
 Package: python3-flufl.lock
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Suggests: python-flufl.lock-doc
 Description: NFS-safe file-based lock with timeouts (Python 3)
- This package provides an NFS-safe file-based locking algorithm influenced 
+ This package provides an NFS-safe file-based locking algorithm influenced
  by the GNU/Linux open(2) manpage, under the  description of the O_EXCL option.
  .
  This is the Python 3 version of the package.

Modified: packages/flufl.lock/trunk/debian/patches/series
===================================================================
--- packages/flufl.lock/trunk/debian/patches/series	2014-09-26 15:27:39 UTC (rev 30758)
+++ packages/flufl.lock/trunk/debian/patches/series	2014-09-26 15:35:18 UTC (rev 30759)
@@ -1 +0,0 @@
-setup.patch

Deleted: packages/flufl.lock/trunk/debian/patches/setup.patch
===================================================================
--- packages/flufl.lock/trunk/debian/patches/setup.patch	2014-09-26 15:27:39 UTC (rev 30758)
+++ packages/flufl.lock/trunk/debian/patches/setup.patch	2014-09-26 15:35:18 UTC (rev 30759)
@@ -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-20 02:11:22 +0000
-+++ b/setup.py	2012-01-27 00:47:41 +0000
-@@ -15,8 +15,8 @@
- # You should have received a copy of the GNU Lesser General Public License
- # along with flufl.lock.  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.lock/trunk/debian/python-flufl.lock.install
===================================================================
--- packages/flufl.lock/trunk/debian/python-flufl.lock.install	2014-09-26 15:27:39 UTC (rev 30758)
+++ packages/flufl.lock/trunk/debian/python-flufl.lock.install	2014-09-26 15:35:18 UTC (rev 30759)
@@ -1 +0,0 @@
-usr/lib/python2*

Deleted: packages/flufl.lock/trunk/debian/python3-flufl.lock.install
===================================================================
--- packages/flufl.lock/trunk/debian/python3-flufl.lock.install	2014-09-26 15:27:39 UTC (rev 30758)
+++ packages/flufl.lock/trunk/debian/python3-flufl.lock.install	2014-09-26 15:35:18 UTC (rev 30759)
@@ -1 +0,0 @@
-usr/lib/python3

Added: packages/flufl.lock/trunk/debian/python3-flufl.lock.pyremove
===================================================================
--- packages/flufl.lock/trunk/debian/python3-flufl.lock.pyremove	                        (rev 0)
+++ packages/flufl.lock/trunk/debian/python3-flufl.lock.pyremove	2014-09-26 15:35:18 UTC (rev 30759)
@@ -0,0 +1 @@
+flufl.i18n-*.egg-info

Modified: packages/flufl.lock/trunk/debian/rules
===================================================================
--- packages/flufl.lock/trunk/debian/rules	2014-09-26 15:27:39 UTC (rev 30758)
+++ packages/flufl.lock/trunk/debian/rules	2014-09-26 15:35:18 UTC (rev 30759)
@@ -1,41 +1,18 @@
 #!/usr/bin/make -f
 
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
+export PYBUILD_NAME=flufl.lock
+#export PYBUILD_VERBOSE=1
+#export DH_VERBOSE=1
 
 # multiprocessing.synchronize.Lock() does not work inside pbuilder
 DEB_BUILD_OPTIONS=nocheck
 
 %:
-	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/lock/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


