Bug#562475: picard: diff for NMU version 0.11-2.1

[Sandro Tosi]

Dear maintainer,

I've prepared an NMU for picard (versioned as 0.11-2.1) and
uploaded it to DELAYED/2.

Please also consider joining PAPT [1] and maintain the package with us.

[1] http://wiki.debian.org/Teams/PythonAppsPackagingTeam/

Regards.

diff -u picard-0.11/debian/rules picard-0.11/debian/rules
--- picard-0.11/debian/rules
+++ picard-0.11/debian/rules
@@ -9,6 +9,7 @@
 
 build-stamp%:
 	dh_testdir
+	echo "# let it installed by recent python-support" > picard/plugins/__init__.py
 	CFLAGS="$(CFLAGS)" python$* setup.py config
 	CFLAGS="$(CFLAGS)" python$* setup.py build_ext
 	python$* setup.py install --root=$(DESTDIR) --prefix=/usr \
@@ -19,6 +20,7 @@
 clean:
 	dh_testdir
 	dh_testroot
+	> picard/plugins/__init__.py
 	rm -rf build/ build.cfg scripts/picard build-stamp*
 	find $(CURDIR) \( -name '*.mo' -o -name '*.pyc' \) -delete
 	dh_clean
diff -u picard-0.11/debian/control picard-0.11/debian/control
--- picard-0.11/debian/control
+++ picard-0.11/debian/control
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net>
 Build-Depends: debhelper (>= 5.0.51~),
- python-all-dev,
- python-all,
+ python-all-dev (>= 2.5),
  python-support (>= 0.4),
  gettext,
  libofa0-dev,
@@ -14,7 +13,7 @@
  pkg-config
 Standards-Version: 3.8.0
 Homepage: http://musicbrainz.org/doc/PicardTagger
-XS-Python-Version: >= 2.4
+XS-Python-Version: >= 2.5
 XB-Python-Version: ${python:Versions}
 
 Package: picard
@@ -22,7 +21,6 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
  python-qt4 (>= 4.1),
  python-mutagen (>= 1.9),
- python-ctypes,
  libdiscid0
 Description: Next-Generation MusicBrainz audio files tagger
  Picard is the next generation MusicBrainz tagging application.
diff -u picard-0.11/debian/changelog picard-0.11/debian/changelog
--- picard-0.11/debian/changelog
+++ picard-0.11/debian/changelog
@@ -1,3 +1,17 @@
+picard (0.11-2.1) unstable; urgency=low
+
+  * Non-maintainer upload, to drop Python 2.4; thanks to Luca Falavigna for the
+    report and to Jakub Wilk for the patch; Closes: #562475
+    - debian/control
+      + b-d only on 'python-all-dev (>= 2.5)'
+      + bump XS-Python-Version to '>= 2.5'
+      + drop python-ctypes from Depends
+  * debian/rules
+    - fake a comment into empty picard/plugins/__init__.py to let it be
+      installed by recent python-support
+
+ -- Sandro Tosi <mo...@debian.org>  Tue, 12 Jan 2010 00:18:45 +0100
+
 picard (0.11-2) unstable; urgency=low
 
   * Upload to unstable (Closes: #517269).