[Python-modules-commits] [flufl.lock] 05/10: Drops python 2 version as upstream does not support it anymore

[Pierre-Elliott Bécue]

This is an automated email from the git hooks/post-receive script.

peb-guest pushed a commit to branch master
in repository flufl.lock.

commit e3f1c4b7731fca25052db8101d0dd2fe63278d5e
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Sat Nov 25 17:34:28 2017 +0100

    Drops python 2 version as upstream does not support it anymore
---
 debian/changelog                    | 10 ++++++++++
 debian/control                      | 31 +++++++++----------------------
 debian/python-flufl.lock.links      |  1 -
 debian/python3-flufl.lock-doc.links |  1 +
 debian/rules                        |  6 +++---
 debian/tests/control                |  6 ------
 6 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cdddcc5..a87144c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,16 @@ flufl.lock (2.4.1-2) UNRELEASED; urgency=medium
     - Bump to 10.
   * d/control:
     - Bump debhelper Build-Depends to version 10.
+    - Drops python2 package.
+    - Changes the -doc binary package name.
+    - Build-Depends on python3-public.
+  * d/rules:
+    - Removes python2 build.
+  * d/tests:
+    - Removes all python2 references.
+  * d/python-flufl.lock.links -> d/python3-flufl.lock-doc.links
+    - The pointer to rst should be with the doc, if not, it points to a
+      nonexisting directory.
 
  -- Pierre-Elliott Bécue <becue at crans.org>  Sat, 25 Nov 2017 16:51:28 +0100
 
diff --git a/debian/control b/debian/control
index 82cbf2b..4c1dc53 100644
--- a/debian/control
+++ b/debian/control
@@ -3,41 +3,28 @@ Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.
 Uploaders: Barry Warsaw <barry at debian.org>
 Homepage: http://flufllock.readthedocs.io/en/latest/
 Section: python
-X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.2
 Priority: optional
 Build-Depends: debhelper (>= 10),
                dh-python,
-               python-all (>= 2.6.6-3~),
-               python-pkg-resources,
-               python-setuptools,
-               python-sphinx (>= 1.0.7+dfsg-1~),
                python3-all,
                python3-pkg-resources,
-               python3-setuptools
 Standards-Version: 3.9.8
+               python3-public,
+               python3-setuptools,
+               python3-sphinx (>= 1.0.7+dfsg-1~)
+X-Python3-Version: >= 3.4
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/flufl.lock.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/flufl.lock.git
 
-Package: python-flufl.lock-doc
+Package: python3-flufl.lock-doc
 Architecture: all
 Section: doc
-Breaks: python-flufl.lock-docs
-Replaces: python-flufl.lock-docs
 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
- by the GNU/Linux open(2) manpage, under the  description of the O_EXCL option.
+ 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: ${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
- by the GNU/Linux open(2) manpage, under the  description of the O_EXCL option.
+ This is the documentation package.
 
 Package: python3-flufl.lock
 Architecture: all
@@ -45,6 +32,6 @@ 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
- by the GNU/Linux open(2) manpage, under the  description of the O_EXCL option.
+ by the GNU/Linux open(2) manpage, under the description of the O_EXCL option.
  .
- This is the Python 3 version of the package.
+ This is the python3 library. There is no longer python2 library.
diff --git a/debian/python-flufl.lock.links b/debian/python-flufl.lock.links
deleted file mode 100644
index a7e1a88..0000000
--- a/debian/python-flufl.lock.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/python-flufl.lock/html/_sources usr/share/doc/python-flufl.lock/rst
diff --git a/debian/python3-flufl.lock-doc.links b/debian/python3-flufl.lock-doc.links
new file mode 100644
index 0000000..8e91f19
--- /dev/null
+++ b/debian/python3-flufl.lock-doc.links
@@ -0,0 +1 @@
+usr/share/doc/python3-flufl.lock/html/_sources usr/share/doc/python3-flufl.lock/rst
diff --git a/debian/rules b/debian/rules
index afa9b4e..cede095 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,14 @@ export PYBUILD_NAME=flufl.lock
 #export DH_VERBOSE=1
 
 # multiprocessing.synchronize.Lock() does not work inside pbuilder
-export DEB_BUILD_OPTIONS=nocheck
+#export DEB_BUILD_OPTIONS=nocheck
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k flufl/lock/NEWS.rst
 
 override_dh_installdocs:
-	python setup.py build_sphinx
+	python3 setup.py build_sphinx
 	dh_installdocs build/sphinx/html
diff --git a/debian/tests/control b/debian/tests/control
index 8c3ca9f..2f7de9d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,11 +1,5 @@
-Test-Command: python -c "import flufl.lock; print flufl.lock"
-
 Test-Command: python3 -c "import flufl.lock; print(flufl.lock)"
 
-Test-Command: python -m unittest discover flufl.lock -vv
-Depends: @, python-pkg-resources
-Restrictions: allow-stderr
-
 # Disabled due to: http://bugs.python.org/issue24168
 #Test-Command: python3 -m unittest discover flufl.lock -vv
 #Depends: @, python3-pkg-resources

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flufl.lock.git