[Python-modules-commits] [flufl.lock] 01/01: Reverts the naming of -doc package

[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 463aadeb9467b75669e5de876af06aa2e2d27544
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Sun Nov 26 15:50:35 2017 +0100

    Reverts the naming of -doc package
---
 debian/changelog                                                      | 2 +-
 debian/control                                                        | 4 +++-
 debian/{python3-flufl.lock-doc.dirs => python-flufl.lock-doc.dirs}    | 0
 ...python3-flufl.lock-doc.doc-base => python-flufl.lock-doc.doc-base} | 0
 debian/{python3-flufl.lock-doc.links => python-flufl.lock-doc.links}  | 0
 debian/rules                                                          | 4 ++--
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cd1835..065aaa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,7 +40,7 @@ flufl.lock (3.2-1) unstable; urgency=medium
       suffix.
   * d/tests:
     - Removes all python2 references.
-  * d/python-flufl.lock.links -> d/python3-flufl.lock-doc.links
+  * d/python-flufl.lock.links -> d/python-flufl.lock-doc.links
     - The pointer to rst should be with the doc, if not, it points to a
       nonexisting directory.
   * Adds d/python3-flufl.lock-doc.dirs:
diff --git a/debian/control b/debian/control
index 5f9041a..24d7f83 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,11 @@ 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: python3-flufl.lock-doc
+Package: python-flufl.lock-doc
 Architecture: all
 Section: doc
+Conflicts: python-flufl.lock-docs
+Breaks: 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
diff --git a/debian/python3-flufl.lock-doc.dirs b/debian/python-flufl.lock-doc.dirs
similarity index 100%
rename from debian/python3-flufl.lock-doc.dirs
rename to debian/python-flufl.lock-doc.dirs
diff --git a/debian/python3-flufl.lock-doc.doc-base b/debian/python-flufl.lock-doc.doc-base
similarity index 100%
rename from debian/python3-flufl.lock-doc.doc-base
rename to debian/python-flufl.lock-doc.doc-base
diff --git a/debian/python3-flufl.lock-doc.links b/debian/python-flufl.lock-doc.links
similarity index 100%
rename from debian/python3-flufl.lock-doc.links
rename to debian/python-flufl.lock-doc.links
diff --git a/debian/rules b/debian/rules
index ff923f3..c0730ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,5 +16,5 @@ override_dh_installchangelogs:
 override_dh_installdocs:
 	python3 setup.py build_sphinx
 	dh_installdocs build/sphinx/html
-	mv debian/python3-flufl.lock-doc/usr/share/doc/python3-flufl.lock-doc/html \
-	   debian/python3-flufl.lock-doc/usr/share/doc/python3-flufl.lock/
+	mv debian/python-flufl.lock-doc/usr/share/doc/python-flufl.lock-doc/html \
+	   debian/python-flufl.lock-doc/usr/share/doc/python3-flufl.lock/

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