[Pkg-mpd-commits] [python-mpd] 05/19: Update packaging

[Simon McVittie]

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

smcv pushed a commit to branch debian/experimental
in repository python-mpd.

commit f8fd2b07ecc5b401357b0627d0237462ad561515
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Apr 30 14:37:22 2016 +0100

    Update packaging
    
    Heavily based on work done for python-mpd2 by Geoffroy Youri Berret.
    
      - use debhelper 9
      - force pybuild build system, since upstream provides a Makefile which
        we don't want to use here
      - add python3-mpd package
      - ship documentation
---
 debian/changelog        |  7 +++++++
 debian/control          | 40 +++++++++++++++++++++++++++++++++++-----
 debian/python-mpd.docs  |  2 ++
 debian/python3-mpd.docs |  2 ++
 debian/rules            |  7 ++++++-
 5 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9c5c34..74fc872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,13 @@ python-mpd (0.5.5-1) UNRELEASED; urgency=medium
       since the original python-mpd is no longer maintained
     - debian/watch: switch upstream to python-mpd2
     - debian/copyright: update
+  * Update packaging, heavily based on work done for python-mpd2 by
+    Geoffroy Youri Berret
+    - use debhelper 9
+    - force pybuild build system, since upstream provides a Makefile which
+      we don't want to use here
+    - add python3-mpd package
+    - ship documentation
 
  -- Simon McVittie <smcv at debian.org>  Sat, 30 Apr 2016 13:43:38 +0100
 
diff --git a/debian/control b/debian/control
index bc2add9..18e5d7d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,48 @@ Section: python
 Priority: optional
 Maintainer: mpd maintainers <pkg-mpd-maintainers at lists.alioth.debian.org>
 Uploaders: Geoffroy Youri Berret <efrim at azylum.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: python-all (>= 2.6.6-3~)
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ python3-setuptools,
+ python-setuptools,
+ python-all (>= 2.6.6-3~),
+ python3-all,
 Standards-Version: 3.9.3
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 Vcs-Git: git://git.debian.org/pkg-mpd/python-mpd.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mpd/python-mpd.git
-Homepage: http://jatreuman.indefero.net/p/python-mpd/
+Homepage: https://github.com/Mic92/python-mpd2
 
 Package: python-mpd
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${python:Depends},
+Conflicts: python-mpd2
+Replaces: python-mpd2
 Description: Python MPD client library
  Fast MPD (Music Player Daemon) client library written in pure Python.
  It was written to be a replacement for python-mpdclient which is a bit
  outdated and does not perform good in many situations.
+ .
+ This is the Python 2 version of python-mpd2, a fork of the original
+ python-mpd.
+
+Package: python3-mpd
+Architecture: all
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${python3:Depends},
+Conflicts: python3-mpd2
+Replaces: python3-mpd2
+Description: Python MPD client library (Python 3)
+ Fast MPD (Music Player Daemon) client library written in pure Python.
+ It was written to be a replacement for python-mpdclient which is a bit
+ outdated and does not perform good in many situations.
+ .
+ This is the Python 3 version of python-mpd2, a fork of the original
+ python-mpd.
diff --git a/debian/python-mpd.docs b/debian/python-mpd.docs
new file mode 100644
index 0000000..a67e98a
--- /dev/null
+++ b/debian/python-mpd.docs
@@ -0,0 +1,2 @@
+README.rst
+doc/topics/commands.rst
diff --git a/debian/python3-mpd.docs b/debian/python3-mpd.docs
new file mode 100644
index 0000000..a67e98a
--- /dev/null
+++ b/debian/python3-mpd.docs
@@ -0,0 +1,2 @@
+README.rst
+doc/topics/commands.rst
diff --git a/debian/rules b/debian/rules
index 97090e6..efdc47b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
 #!/usr/bin/make -f
 
+export PYBUILD_DISABLE=test
+
 %:
-	dh $@  --with python2
+	dh $@  --with python2,python3 --buildsystem=pybuild
+
+override_dh_installchangelogs:
+	dh_installchangelogs doc/changes.rst

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/python-mpd.git