[Python-modules-commits] r29330 - in packages/mutagen/trunk/debian (5 files)

[mithrandi at users.alioth.debian.org]

    Date: Saturday, June 14, 2014 @ 11:24:06
  Author: mithrandi
Revision: 29330

New upstream release, and packaging changes.

Modified:
  packages/mutagen/trunk/debian/changelog
  packages/mutagen/trunk/debian/control
  packages/mutagen/trunk/debian/rules
  packages/mutagen/trunk/debian/watch
Deleted:
  packages/mutagen/trunk/debian/python-mutagen.install

Modified: packages/mutagen/trunk/debian/changelog
===================================================================
--- packages/mutagen/trunk/debian/changelog	2014-06-14 10:51:17 UTC (rev 29329)
+++ packages/mutagen/trunk/debian/changelog	2014-06-14 11:24:06 UTC (rev 29330)
@@ -1,3 +1,11 @@
+mutagen (1.23-1) UNRELEASED; urgency=low
+
+  * New upstream release. (Closes: #751155)
+  * Switch to pybuild.
+  * Bump Standards-Version.
+
+ -- Tristan Seligmann <mithrandi at debian.org>  Thu, 12 Jun 2014 21:17:56 +0200
+
 mutagen (1.22-1) unstable; urgency=low
 
   [ Tristan Seligmann ]

Modified: packages/mutagen/trunk/debian/control
===================================================================
--- packages/mutagen/trunk/debian/control	2014-06-14 10:51:17 UTC (rev 29329)
+++ packages/mutagen/trunk/debian/control	2014-06-14 11:24:06 UTC (rev 29330)
@@ -15,8 +15,9 @@
  python-docutils,
  python-pyvorbis,
  python-sphinx (>= 1.0.7+dfsg),
- vorbis-tools
-Standards-Version: 3.9.4
+ vorbis-tools,
+ dh-python
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/mutagen/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/mutagen/trunk/

Deleted: packages/mutagen/trunk/debian/python-mutagen.install
===================================================================
--- packages/mutagen/trunk/debian/python-mutagen.install	2014-06-14 10:51:17 UTC (rev 29329)
+++ packages/mutagen/trunk/debian/python-mutagen.install	2014-06-14 11:24:06 UTC (rev 29330)
@@ -1,2 +0,0 @@
-usr/lib
-usr/bin

Modified: packages/mutagen/trunk/debian/rules
===================================================================
--- packages/mutagen/trunk/debian/rules	2014-06-14 10:51:17 UTC (rev 29329)
+++ packages/mutagen/trunk/debian/rules	2014-06-14 11:24:06 UTC (rev 29330)
@@ -1,10 +1,17 @@
 #!/usr/bin/make -f
 
-PYTHON2=$(shell pyversions -vr)
+export PYBUILD_NAME=mutagen
 
+# This is generally a good idea to avoid littering the filesystem with unneeded
+# pyc files, but it is also specifically needed to avoid byte-compilation of
+# the binaries in tools/ when the test suite is run.
+export PYTHONDONTWRITEBYTECODE=yes
+
+
 %:
-	dh $@ --with python2,sphinxdoc
+	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
 
+
 override_dh_auto_build:
 	dh_auto_build
 	PYTHONPATH=$(CURDIR) docs/id3_frames_gen.py > docs/api/id3_frames.rst
@@ -12,17 +19,16 @@
 	mv docs/_build docs/html
 	$(MAKE) -C docs/man
 
+
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
-test-python%:
-	-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	LC_ALL=C.UTF-8 python$* setup.py test
-endif
 
-override_dh_auto_test: $(PYTHON2:%=test-python%)
-
 override_dh_clean:
 	dh_clean
 	rm -rf docs/html docs/man/_man
+
+
+override_dh_auto_test:
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="{interpreter} setup.py test" dh_auto_test

Modified: packages/mutagen/trunk/debian/watch
===================================================================
--- packages/mutagen/trunk/debian/watch	2014-06-14 10:51:17 UTC (rev 29329)
+++ packages/mutagen/trunk/debian/watch	2014-06-14 11:24:06 UTC (rev 29330)
@@ -1,5 +1,3 @@
 version=3
-opts=\
-downloadurlmangle=s|.*[?]name=(.*?)&.*|http://mutagen.googlecode.com/files/$1|,\
-filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1| \
-http://code.google.com/p/mutagen/downloads/detail[?]name=mutagen-([0-9.]+).tar.gz&.*
+# Latest upstream version is unsigned, sadly
+http://bitbucket.org/lazka/mutagen/downloads/mutagen-([0-9.]+).tar.gz