[Python-modules-commits] [case] 08/08: Merge branch 'master' of git+ssh://git.debian.org/git/python-modules/packages/case

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository case.

commit f55ff44fe7e9792a84a8b14eb82e21579e40b018
Merge: 5634c2e 2a5eff5
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Mon Feb 20 08:16:45 2017 +0000

    Merge branch 'master' of git+ssh://git.debian.org/git/python-modules/packages/case

 debian/changelog |   8 ++
 debian/control   |  40 ++++++--
 debian/copyright | 300 +++++++++++++++++++++++++++----------------------------
 debian/rules     |   2 +-
 4 files changed, 192 insertions(+), 158 deletions(-)

diff --cc debian/changelog
index 198f309,fc57387..4fd75a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 -case (1.5.2+dfsg-2) unstable; urgency=low
++case (1.5.2+dfsg-3) UNRELEASED; urgency=low
+ 
+   * Team upload.
+   * Reformat packaging files with cme for better readability.
+   * Add Python2 support through separate binary package.
+ 
+  -- Michael Fladischer <fladi at debian.org>  Sun, 19 Feb 2017 19:56:07 +0100
+ 
 +case (1.5.2+dfsg-2) unstable; urgency=medium
 +
 +  * Add documentation package 
 +
 + -- Christopher Hoskin <mans0954 at debian.org>  Thu, 16 Feb 2017 14:04:44 +0000
 +
  case (1.5.2+dfsg-1) unstable; urgency=low
  
    * source package automatically created by stdeb 0.8.5. Closes: #854891
diff --cc debian/control
index f628790,e162784..68dd7ad
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,35 +3,37 @@@ Maintainer: Debian Python Modules Team 
  Uploaders: Christopher Hoskin <mans0954 at debian.org>
  Section: python
  Priority: optional
- Build-Depends: dh-python, python3-setuptools, python3-all, debhelper (>= 9),
-  python3-nose, python3-six, python3-sphinx, python3-sphinx-celery
+ Build-Depends: debhelper (>= 9),
+                dh-python,
+                python-all,
+                python-mock,
+                python-nose,
+                python-setuptools,
+                python-six,
+                python3-all,
+                python3-nose,
+                python3-setuptools,
 -               python3-six
++               python3-six,
++               python3-sphinx,
++               python3-sphinx-celery
  Standards-Version: 3.9.8
- Homepage: http://github.com/celery/case
- Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/case.git
  Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/case.git
+ Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/case.git
+ Homepage: http://github.com/celery/case
  
+ Package: python-case
+ Architecture: all
+ Depends: ${misc:Depends},
+          ${python:Depends}
+ Description: Python unittest Utilities (Python2 version)
+  Python unittest Utilities. Includes:
+  .
+   * case.case
+   * case.skip
+   * case.mock
+   * case.utils
+  .
+  This package contains the Python 2 version of the library.
  
  Package: python3-case
  Architecture: all
@@@ -21,17 -44,5 +46,20 @@@ Description: Python unittest Utilities 
    * case.skip
    * case.mock
    * case.utils
+  .
+  This package contains the Python 3 version of the library.
++
 +
 +Package: python-case-doc
 +Architecture: all
 +Section: doc
 +Depends: ${sphinxdoc:Depends}, ${misc:Depends}
 +Description: Python unittest Utilities (documentation)
 + Python unittest Utilities. Includes:
 + .
 +  * case.case
 +  * case.skip
 +  * case.mock
 +  * case.utils
 + .
 + This is the documentation package.
diff --cc debian/rules
index ae44b6a,ee3feff..0621292
--- a/debian/rules
+++ b/debian/rules
@@@ -4,15 -4,5 +4,15 @@@
  # Sat, 11 Feb 2017 15:42:43 +0000
  export PYBUILD_NAME=case
  %:
- 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 -	dh $@ --with python2,python3 --buildsystem=pybuild
++	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 +
 +override_dh_auto_build: export http_proxy=127.0.0.1:9
 +override_dh_auto_build: export https_proxy=127.0.0.1:9
 +override_dh_auto_build:
 +	dh_auto_build
 +	PYTHONPATH=. sphinx-build -N -bhtml docs/ build/html # HTML generator
 +	PYTHONPATH=. sphinx-build -N -bman docs/ build/man # Manpage generator
 +
 +override_dh_compress:
 +	dh_compress -Xpython-case-doc/html/changelog.html 
  

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