[Python-modules-commits] r24517 - in packages/musicbrainzngs/trunk/debian (14 files)

laarmen-guest at users.alioth.debian.org laarmen-guest at users.alioth.debian.org
Fri May 24 17:37:37 UTC 2013


    Date: Friday, May 24, 2013 @ 17:37:35
  Author: laarmen-guest
Revision: 24517

* Use canonical URIs for Vcs-* fields.
* Bump standards version to 3.9.4
  + B-D on debhelper >= 8.1 to get the build-indep targets.
* Update copyright years and authors.
* Add a Python3 and a -doc packages.
  + Patch the sphinx config to use local documentation for reference
  + Remove the test data and docs from setup.py as they are not necessary
    in the binary package or shipped on their own.
* Remove python-unittest2 from Build-Depends as python 2.6 isn't supported
  anymore.

Added:
  packages/musicbrainzngs/trunk/debian/patches/
  packages/musicbrainzngs/trunk/debian/patches/remove_unused_data
  packages/musicbrainzngs/trunk/debian/patches/series
  packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.doc-base
  packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.docs
  packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.links
  packages/musicbrainzngs/trunk/debian/python-musicbrainzngs.docs
  packages/musicbrainzngs/trunk/debian/python-musicbrainzngs.install
  packages/musicbrainzngs/trunk/debian/python3-musicbrainzngs.docs
  packages/musicbrainzngs/trunk/debian/python3-musicbrainzngs.install
Modified:
  packages/musicbrainzngs/trunk/debian/changelog
  packages/musicbrainzngs/trunk/debian/control
  packages/musicbrainzngs/trunk/debian/copyright
  packages/musicbrainzngs/trunk/debian/rules

Modified: packages/musicbrainzngs/trunk/debian/changelog
===================================================================
--- packages/musicbrainzngs/trunk/debian/changelog	2013-05-24 12:18:50 UTC (rev 24516)
+++ packages/musicbrainzngs/trunk/debian/changelog	2013-05-24 17:37:35 UTC (rev 24517)
@@ -1,16 +1,23 @@
-musicbrainzngs (0.3-1) UNRELEASED; urgency=low
+musicbrainzngs (0.4-1) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
   [ Simon Chopin ]
   * New upstream release
   * Acknowledge Jonas' NMU, drop the patch as it is now unnecessary
-  * Bump standards version to 3.9.4 (No changes needed)
-  * Update copyright years.
+  * Bump standards version to 3.9.4
+    + B-D on debhelper >= 8.1 to get the build-indep targets.
+  * Update copyright years and authors.
+  * Add a Python3 and a -doc packages.
+    + Patch the sphinx config to use local documentation for reference
+    + Remove the test data and docs from setup.py as they are not necessary
+      in the binary package or shipped on their own.
+  * Remove python-unittest2 from Build-Depends as python 2.6 isn't supported
+    anymore.
 
-  [ Jakub Wilk ]
-  * Use canonical URIs for Vcs-* fields.
+ -- Simon Chopin <chopin.simon at gmail.com>  Thu, 16 May 2013 09:53:37 +0200
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:01:18 +0200
-
 musicbrainzngs (0.2-1.1) experimental; urgency=low
 
   * Non-maintainer upload.

Modified: packages/musicbrainzngs/trunk/debian/control
===================================================================
--- packages/musicbrainzngs/trunk/debian/control	2013-05-24 12:18:50 UTC (rev 24516)
+++ packages/musicbrainzngs/trunk/debian/control	2013-05-24 17:37:35 UTC (rev 24517)
@@ -3,9 +3,17 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Simon Chopin <chopin.simon at gmail.com>
-Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python-unittest2
+Build-Depends:
+ debhelper (>= 8.1),
+ libc-bin (>= 2.13-1~),
+ python-all (>= 2.6.6-3~),
+ python-doc,
+ python-sphinx (>= 1.0.7+dfsg),
+ python2.7-doc,
+ python3-all
 X-Python-Version: >=2.6
-Standards-Version: 3.9.3
+X-Python3-Version: >=3.2
+Standards-Version: 3.9.4
 Homepage: https://github.com/alastair/python-musicbrainz-ngs/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/musicbrainzngs/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/musicbrainzngs/trunk/
@@ -13,9 +21,33 @@
 Package: python-musicbrainzngs
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
+Suggests: python-musicbrainzngs-doc
 Description: Python bindings for the Musicbrainz NGS webservice interface
  This package provides a Python interface to the
  Musicbrainz NGS API.
  .
  Musicbrainz is an open music encyclopedia that collects music metadata
  and makes it available to the public.
+
+Package: python3-musicbrainzngs
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Suggests: python-musicbrainzngs-doc
+Description: Python 3 bindings for the Musicbrainz NGS webservice interface
+ This package provides a Python 3 interface to the
+ Musicbrainz NGS API.
+ .
+ Musicbrainz is an open music encyclopedia that collects music metadata
+ and makes it available to the public.
+
+Package: python-musicbrainzngs-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Recommends: python-musicbrainzngs | python3-musicbrainzngs
+Description: Documentation for the Python Musicbrainz NGS interface modules
+ This package provides documentation for the Python bindings for the
+ Musicbrainz NGS webservice interface.
+ .
+ Musicbrainz is an open music encyclopedia that collects music metadata
+ and makes it available to the public.

Modified: packages/musicbrainzngs/trunk/debian/copyright
===================================================================
--- packages/musicbrainzngs/trunk/debian/copyright	2013-05-24 12:18:50 UTC (rev 24516)
+++ packages/musicbrainzngs/trunk/debian/copyright	2013-05-24 17:37:35 UTC (rev 24517)
@@ -9,6 +9,12 @@
            2012-2013 Thomas Vander Stichele
            2012-2013 Ian McEwen
            2012-2013 Wieland Hoffmann
+           2013 Galen Hazelwood
+           2013 Greg Ward
+           2013 Johannes Dewender
+           2013 Patrick Speiser
+           2013 Paul Bailey
+           2013 Sam Doshi
 License: BSD-2-clause
 
 Files: debian/*

Added: packages/musicbrainzngs/trunk/debian/patches/remove_unused_data
===================================================================
--- packages/musicbrainzngs/trunk/debian/patches/remove_unused_data	                        (rev 0)
+++ packages/musicbrainzngs/trunk/debian/patches/remove_unused_data	2013-05-24 17:37:35 UTC (rev 24517)
@@ -0,0 +1,24 @@
+Description: Remove the unused package data in setup.py
+Author: Simon Chopin <chopin.simon at gmail.com>
+Forwarded: not-needed
+Applied-Upstream: 2013-05-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setup.py
++++ b/setup.py
+@@ -52,15 +52,6 @@
+     author_email="alastair at porter.net.nz",
+     url="https://github.com/alastair/python-musicbrainz-ngs",
+     packages=['musicbrainzngs'],
+-    package_data={'musicbrainzngs': ['CHANGES',
+-                                     '../docs/*',
+-                                     '../examples/*',
+-                                     '../test/data/*.xml',
+-                                     '../test/data/artist/*',
+-                                     '../test/data/label/*',
+-                                     '../test/data/release/*',
+-                                     '../test/data/release-group/*',
+-                                     '../test/data/work/*']},
+     cmdclass={'test': test },
+     license='BSD 2-clause',
+     classifiers=[

Added: packages/musicbrainzngs/trunk/debian/patches/series
===================================================================
--- packages/musicbrainzngs/trunk/debian/patches/series	                        (rev 0)
+++ packages/musicbrainzngs/trunk/debian/patches/series	2013-05-24 17:37:35 UTC (rev 24517)
@@ -0,0 +1,2 @@
+remove_unused_data
+use_local_interphix_links

Added: packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.doc-base
===================================================================
--- packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.doc-base	                        (rev 0)
+++ packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.doc-base	2013-05-24 17:37:35 UTC (rev 24517)
@@ -0,0 +1,12 @@
+Document: python-musicbrainzngs
+Title: Python Musicbrainz NGS
+Author: Adrian Sampson
+Abstract: Python bindings for the Musicbrainz NGS interface
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-musicbrainzngs-doc/html/index.html
+Files: /usr/share/doc/python-musicbrainzngs-doc/html/*.html
+
+Format: Text
+Files: /usr/share/doc/python-musicbrainzngs-doc/rst/*.txt

Added: packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.docs
===================================================================
--- packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.docs	                        (rev 0)
+++ packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.docs	2013-05-24 17:37:35 UTC (rev 24517)
@@ -0,0 +1 @@
+docs/_build/html

Added: packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.links
===================================================================
--- packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.links	                        (rev 0)
+++ packages/musicbrainzngs/trunk/debian/python-musicbrainzngs-doc.links	2013-05-24 17:37:35 UTC (rev 24517)
@@ -0,0 +1 @@
+/usr/share/doc/python-musicbrainzngs-doc/html/_sources /usr/share/doc/python-musicbrainzngs-doc/rst

Added: packages/musicbrainzngs/trunk/debian/python-musicbrainzngs.docs
===================================================================
--- packages/musicbrainzngs/trunk/debian/python-musicbrainzngs.docs	                        (rev 0)
+++ packages/musicbrainzngs/trunk/debian/python-musicbrainzngs.docs	2013-05-24 17:37:35 UTC (rev 24517)
@@ -0,0 +1 @@
+README.md

Added: packages/musicbrainzngs/trunk/debian/python-musicbrainzngs.install
===================================================================
--- packages/musicbrainzngs/trunk/debian/python-musicbrainzngs.install	                        (rev 0)
+++ packages/musicbrainzngs/trunk/debian/python-musicbrainzngs.install	2013-05-24 17:37:35 UTC (rev 24517)
@@ -0,0 +1 @@
+usr/lib/python2.*

Added: packages/musicbrainzngs/trunk/debian/python3-musicbrainzngs.docs
===================================================================
--- packages/musicbrainzngs/trunk/debian/python3-musicbrainzngs.docs	                        (rev 0)
+++ packages/musicbrainzngs/trunk/debian/python3-musicbrainzngs.docs	2013-05-24 17:37:35 UTC (rev 24517)
@@ -0,0 +1 @@
+README.md

Added: packages/musicbrainzngs/trunk/debian/python3-musicbrainzngs.install
===================================================================
--- packages/musicbrainzngs/trunk/debian/python3-musicbrainzngs.install	                        (rev 0)
+++ packages/musicbrainzngs/trunk/debian/python3-musicbrainzngs.install	2013-05-24 17:37:35 UTC (rev 24517)
@@ -0,0 +1 @@
+usr/lib/python3*

Modified: packages/musicbrainzngs/trunk/debian/rules
===================================================================
--- packages/musicbrainzngs/trunk/debian/rules	2013-05-24 12:18:50 UTC (rev 24516)
+++ packages/musicbrainzngs/trunk/debian/rules	2013-05-24 17:37:35 UTC (rev 24517)
@@ -4,10 +4,27 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3,sphinxdoc
 
+override_dh_auto_build:
+	dh_auto_build
+	make -C docs html
+	python3 setup.py build
+
+override_dh_auto_install:
+	dh_auto_install
+	python3 setup.py install --skip-build --no-compile \
+							 --root debian/tmp \
+							 --install-layout=deb
+
 override_dh_auto_test:
 	set -e -x; \
-	for python in $(shell pyversions -r); do \
+	export LC_ALL=C.UTF-8; \
+	for python in $(shell pyversions -r) $(shell py3versions -r); do \
 		$$python setup.py test; \
 	done
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build/
+	rm -rf docs/_build




More information about the Python-modules-commits mailing list