[Python-modules-commits] [python-docutils] 01/02: Partial wrap-and-sort.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository python-docutils.

commit 7d38422cc2a8d93ffba3f27c2e20b5825ae9a4a7
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 31 18:20:14 2016 +0300

    Partial wrap-and-sort.
---
 debian/control   | 57 ++++++++++++++++++++++++++++++--------------------------
 debian/copyright |  2 +-
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index 5b842ac..b91ce40 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,9 @@ Uploaders: Michael Schutte <michi at debian.org>,
 Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: dh-python,
                      python-all (>= 2.6.6-3~),
+                     python-roman,
                      python3-all (>= 3.1.2-7~),
-                     python-roman, python3-roman,
+                     python3-roman,
                      xml-core
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.4
@@ -19,18 +20,20 @@ Homepage: http://docutils.sourceforge.net/
 Package: python-docutils
 Provides: docutils
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
+Depends: docutils-common (= ${source:Version}),
          python-roman,
-         docutils-common (= ${source:Version})
-Recommends: python-pil,
-            python-pygments,
+         ${misc:Depends},
+         ${python:Depends}
+Recommends: docutils-doc (= ${source:Version}),
             libpaper-utils,
-            docutils-doc (= ${source:Version})
-Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, fonts-linuxlibertine | ttf-linux-libertine
-Conflicts: python-odtwriter,
-           docutils-writer-odt
-Replaces: python-odtwriter,
-          docutils-writer-odt
+            python-pil,
+            python-pygments
+Suggests: fonts-linuxlibertine | ttf-linux-libertine,
+          texlive-lang-french,
+          texlive-latex-base,
+          texlive-latex-recommended
+Conflicts: docutils-writer-odt, python-odtwriter
+Replaces: docutils-writer-odt, python-odtwriter
 Breaks: python-epydoc (<< 3.0.1-4~), python-sphinx (<< 1.1.3+dfsg-7~)
 Description: text processing system for reStructuredText (implemented in Python 2)
  reStructuredText is an easy-to-read, what-you-see-is-what-you-get plaintext
@@ -47,17 +50,20 @@ Description: text processing system for reStructuredText (implemented in Python
 Package: python3-docutils
 Provides: docutils
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends},
+Depends: docutils-common (= ${source:Version}),
          python3-roman,
-         docutils-common (= ${source:Version})
-Recommends: python3-pil,
-            python3-pygments,
-            libpaper-utils
-Conflicts: python-docutils (<< 0.7-3~),
-           python-odtwriter,
-           docutils-writer-odt
+         ${misc:Depends},
+         ${python3:Depends}
+Recommends: libpaper-utils, python3-pil, python3-pygments
+Conflicts: docutils-writer-odt,
+           python-docutils (<< 0.7-3~),
+           python-odtwriter
 Breaks: python3-sphinx (<< 1.1.3+dfsg-7~)
-Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, fonts-linuxlibertine | ttf-linux-libertine, docutils-doc
+Suggests: docutils-doc,
+          fonts-linuxlibertine | ttf-linux-libertine,
+          texlive-lang-french,
+          texlive-latex-base,
+          texlive-latex-recommended
 Description: text processing system for reStructuredText (implemented in Python 3)
  reStructuredText is an easy-to-read, what-you-see-is-what-you-get plaintext
  markup syntax and parser system. It is useful for in-line program documentation
@@ -72,14 +78,13 @@ Description: text processing system for reStructuredText (implemented in Python
 
 Package: docutils-common
 Architecture: all
-Depends: ${misc:Depends}, 
+Depends: ${misc:Depends}
 Recommends: python-docutils | python3-docutils
 Conflicts: python-docutils (<< 0.7-3~)
-Breaks: python-odtwriter,
-        docutils-writer-odt
-Replaces: python-docutils (<< 0.7-3~),
-          python-odtwriter,
-          docutils-writer-odt
+Breaks: docutils-writer-odt, python-odtwriter
+Replaces: docutils-writer-odt,
+          python-docutils (<< 0.7-3~),
+          python-odtwriter
 Description: text processing system for reStructuredText - common data
  reStructuredText is an easy-to-read, what-you-see-is-what-you-get plaintext
  markup syntax and parser system. It is useful for in-line program documentation
diff --git a/debian/copyright b/debian/copyright
index e53827b..0c4f2ac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -314,7 +314,7 @@ License: Python-2.1.1
  .
  8. By clicking on the "ACCEPT" button where indicated, or by copying,
  installing or otherwise using Python 1.6.1, Licensee agrees to be
- bound by the terms and conditions of this License Agreement. 
+ bound by the terms and conditions of this License Agreement.
  .
  CWI PERMISSIONS STATEMENT AND DISCLAIMER
  ----------------------------------------

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