[Python-modules-commits] [flufl.i18n] 01/01: Reverts the naming for -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.i18n.

commit 9883a62f849e583b6cf344f358f58b514e89f101
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Sun Nov 26 16:02:55 2017 +0100

    Reverts the naming for -doc package
    
     * Also, there was a typo as the python3-flufl.i18n package was still
       suggesting python-flufl.i18n-doc
---
 debian/changelog                                                    | 2 +-
 debian/control                                                      | 6 +++---
 debian/{python3-flufl.i18n-doc.dirs => python-flufl.i18n-doc.dirs}  | 0
 ...thon3-flufl.i18n-doc.doc-base => python-flufl.i18n-doc.doc-base} | 0
 .../{python3-flufl.i18n-doc.links => python-flufl.i18n-doc.links}   | 0
 debian/rules                                                        | 4 ++--
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e75be0..6487450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,7 +33,7 @@ flufl.i18n (2.0.1-1) unstable; urgency=medium
       suffix.
   * d/tests:
     - Removes all python2 references.
-  * d/python-flufl.i18n.links -> d/python3-flufl.i18n-doc.links:
+  * d/python-flufl.i18n.links -> d/python-flufl.i18n-doc.links:
     - The pointer to rst should be with the doc, if not, it points to a
       nonexisting directory.
   * Adds d/python3-flufl.i18n-doc.dirs:
diff --git a/debian/control b/debian/control
index 478dca2..69f00ac 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,11 @@ X-Python3-Version: >= 3.5
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/flufl.i18n.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/flufl.i18n.git
 
-Package: python3-flufl.i18n-doc
+Package: python-flufl.i18n-doc
 Architecture: all
 Section: doc
+Conflicts: python-flufl.i18n-docs
+Breaks: python-flufl.i18n-docs
 Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Suggests: python-pkg-resources
 Description: high level API for Python internationalization (common documentation)
@@ -43,5 +45,3 @@ Description: high level API for Python internationalization (Python 3)
  execution.  There is a more flexible, but still convenient API for
  multi-context applications, such as servers, which may need to switch language
  contexts for different tasks.
- .
- This is the Python 3 version of the package.
diff --git a/debian/python3-flufl.i18n-doc.dirs b/debian/python-flufl.i18n-doc.dirs
similarity index 100%
rename from debian/python3-flufl.i18n-doc.dirs
rename to debian/python-flufl.i18n-doc.dirs
diff --git a/debian/python3-flufl.i18n-doc.doc-base b/debian/python-flufl.i18n-doc.doc-base
similarity index 100%
rename from debian/python3-flufl.i18n-doc.doc-base
rename to debian/python-flufl.i18n-doc.doc-base
diff --git a/debian/python3-flufl.i18n-doc.links b/debian/python-flufl.i18n-doc.links
similarity index 100%
rename from debian/python3-flufl.i18n-doc.links
rename to debian/python-flufl.i18n-doc.links
diff --git a/debian/rules b/debian/rules
index 11bdcc1..7f276bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,5 +14,5 @@ override_dh_installchangelogs:
 override_dh_installdocs:
 	python3 setup.py build_sphinx
 	dh_installdocs build/sphinx/html
-	mv debian/python3-flufl.i18n-doc/usr/share/doc/python3-flufl.i18n-doc/html \
-	   debian/python3-flufl.i18n-doc/usr/share/doc/python3-flufl.i18n/
+	mv debian/python-flufl.i18n-doc/usr/share/doc/python-flufl.i18n-doc/html \
+	   debian/python-flufl.i18n-doc/usr/share/doc/python3-flufl.i18n/

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