[Python-apps-commits] r9985 - in packages/picard/trunk/debian (changelog control links rules)

Tue Aug 27 16:25:13 UTC 2013

Date: Tuesday, August 27, 2013 @ 16:25:11
  Author: cjsmo-guest
Revision: 9985

* New upstream release.
* Removed Depends on libofa0-dev as upstream no longer requires it.
* Moved libchromaprint-tools from Recommends to Depends.
* Update packaging to use pybuild.
* debian/control
  - Added Build Depends on python3 >= 3.3.0-2.
  - Added Build Depends on python-dev.
  - Increased debhelper to >= 9
  - added libchromaprint-tools, hicolor-icon-theme to Suggests.
  - increased debhelper dependency to >= 9
* Increased Standards Version to 3.9.4 no changes needed.
* Moved /usr/bin/picard link creation to debian/links.
  - updated to use pybuild
  - cleaned up not needed cruft.

Modified:
  packages/picard/trunk/debian/changelog
  packages/picard/trunk/debian/control
  packages/picard/trunk/debian/links
  packages/picard/trunk/debian/rules

Modified: packages/picard/trunk/debian/changelog
===================================================================

--- packages/picard/trunk/debian/changelog	2013-08-21 01:49:16 UTC (rev 9984)
+++ packages/picard/trunk/debian/changelog	2013-08-27 16:25:11 UTC (rev 9985)
@@ -1,22 +1,25 @@
-picard (1.1-1) UNRELEASED; urgency=low
+picard (1.2-1) UNRELEASED; urgency=low
 
-  [ Charlie Smotherman ]
-  * New upstream release. Closes: #687650
+  * New upstream release.
+  * Removed Depends on libofa0-dev as upstream no longer requires it.
+  * Moved libchromaprint-tools from Recommends to Depends.
+  * Update packaging to use pybuild.
   * Increased debian/compat to 9.
-  * debian/control:
-    - added libchromaprint-tools to Suggests field.  Closes: #681102
-    - increased debhelper to >= 9.
-    - added hicolor-icon-theme to Suggests.
+  * debian/control
+    - Added Build Depends on python3 >= 3.3.0-2.
+    - Added Build Depends on python-dev.
+    - Increased debhelper to >= 9
+    - added libchromaprint-tools, hicolor-icon-theme to Suggests.
+    - increased debhelper dependency to >= 9
+  * Increased Standards Version to 3.9.4 no changes needed.
+  * Moved /usr/bin/picard link creation to debian/links.
   * debian/rules
-    - cleaned up debian/rules of not needed cruft.
+    - updated to use pybuild
+    - cleaned up not needed cruft.
     - removed CFLAGS calls, this is now being done by dh9.
-    - added for loop to dh_auto_build to build exts for all support pyvers.
 
-  [ Jakub Wilk ]
-  * Add Vcs-* fields.
+ -- Charlie Smotherman <cjsmo at cableone.net>  Wed, 31 Oct 2012 16:45:44 -0500
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 15:14:01 +0200
-
 picard (1.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/picard/trunk/debian/control
===================================================================
--- packages/picard/trunk/debian/control	2013-08-21 01:49:16 UTC (rev 9984)
+++ packages/picard/trunk/debian/control	2013-08-27 16:25:11 UTC (rev 9985)
@@ -4,26 +4,26 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Charlie Smotherman <cjsmo at cableone.net>
 Build-Depends: debhelper (>= 9),
- python-all-dev (>= 2.6.6-3~),
+ python3 (>= 3.3.0-2),
+ python-dev (>= 2.6.6-3~),
+ dh-python,
  gettext,
- libofa0-dev,
  libavcodec-dev (>= 4:0.7),
  libavformat-dev,
  imagemagick,
  pkg-config
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://musicbrainz.org/doc/PicardTagger
 X-Python-Version: >= 2.5
-Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/picard/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/picard/trunk/
 
 Package: picard
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
  python-qt4 (>= 4.5),
  python-mutagen (>= 1.20),
- libdiscid0
-Suggests: libchromaprint-tools, hicolor-icon-theme
+ libdiscid0,
+ libchromaprint-tools
+Suggests: hicolor-icon-theme
 Description: Next-Generation MusicBrainz audio files tagger
  Picard is the next generation MusicBrainz tagging application.
  .

Modified: packages/picard/trunk/debian/links
===================================================================
--- packages/picard/trunk/debian/links	2013-08-21 01:49:16 UTC (rev 9984)
+++ packages/picard/trunk/debian/links	2013-08-27 16:25:11 UTC (rev 9985)
@@ -1 +1,9 @@
-/usr/share/pixmaps/picard-32.xpm	/usr/share/pixmaps/picard.xpm
+usr/lib/picard/picard_run /usr/bin/picard
+
+usr/share/picard/resources/images/16x16/picard.png /usr/share/icons/hicolor/16x16/apps/picard.png
+usr/share/picard/resources/images/24x24/picard.png /usr/share/icons/hicolor/24x24/apps/picard.png
+usr/share/picard/resources/images/32x32/picard.png /usr/share/icons/hicolor/32x32/apps/picard.png
+usr/share/picard/resources/images/48x48/picard.png /usr/share/icons/hicolor/48x48/apps/picard.png
+usr/share/picard/resources/images/128x128/picard.png /usr/share/icons/hicolor/128x128/apps/picard.png
+usr/share/picard/resources/images/256x256/picard.png /usr/share/icons/hicolor/256x256/apps/picard.png
+usr/share/picard/resources/image-src/Picard-256.svg /usr/share/icons/hicolor/scalable/apps/Picard-256.svg

Modified: packages/picard/trunk/debian/rules
===================================================================
--- packages/picard/trunk/debian/rules	2013-08-21 01:49:16 UTC (rev 9984)
+++ packages/picard/trunk/debian/rules	2013-08-27 16:25:11 UTC (rev 9985)
@@ -1,41 +1,21 @@
 #!/usr/bin/make -f
 
-PYVERS  = $(shell pyversions -r)
-DESTDIR = $(CURDIR)/debian/picard
-
+export PYBUILD_DISABLE_python3=1
+export PYBUILD_INTERPRETERS=python{version}
+export PYBUILD_VERSIONS=2.7
+export PYBUILD_AFTER_CLEAN_python2=rm -rf build/ build.cfg scripts/picard build-stamp*; \
+	find . \( -name '*.mo' -o -name '*.pyc' -o -name '*.gitignore' \) -delete;
+export PYBUILD_DESTDIR_python2=debian/picard
+export PYBUILD_CONFIGURE_ARGS_python2=config
+export PYBUILD_BUILD_ARGS_python2=build_ext
+export PYBUILD_INSTALL_ARGS_python2=--install-layout=deb \
+	--install-scripts=/usr/lib/picard \
+	--install-lib=/usr/lib/picard
+export PYBUILD_AFTER_INSTALL_python2=mkdir {destdir}/usr/share/pixmaps; \
+	convert ./resources/images/32x32/picard.png -resize 32 \
+		{destdir}/usr/share/pixmaps/picard.xpm; \
+	mv {destdir}/usr/lib/picard/picard/picard {destdir}/usr/lib/picard/picard_run; \
+	find . -type d -empty -delete;
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=pybuild
 
-override_dh_auto_build:
-	set -e; \
-	for py in $(PYVERS); do \
-		$$py setup.py config; \
-		$$py setup.py build_ext; \
-	done
-
-override_dh_auto_install:
-	set -e; \
-	for py in $(PYVERS); do \
-		$$py setup.py install --install-layout=deb --install-lib=/usr/lib/picard \
-		--root=$(DESTDIR) --no-compile --disable-autoupdate; \
-	done
-	rm -rf build/ build.cfg scripts/picard
-	mkdir -p $(DESTDIR)/usr/share/pixmaps
-	convert $(CURDIR)/resources/images/32x32/picard.png -resize 22 \
-			$(DESTDIR)/usr/share/pixmaps/picard-22.xpm; \
-	mkdir -p $(DESTDIR)/usr/share/icons/hicolor/22x22/apps
-	convert $(CURDIR)/resources/images/32x32/picard.png -resize 22 \
-			$(DESTDIR)/usr/share/icons/hicolor/22x22/apps/picard.png; \
-	for size in 16 24 32; do \
-		convert $(CURDIR)/resources/images/$${size}x$${size}/picard.png \
-				$(DESTDIR)/usr/share/pixmaps/picard-$${size}.xpm || exit 1; \
-	done
-	# And fix the shebang
-	sed -i 's,^#!/usr/bin/python.*,#!/usr/bin/python,' $(DESTDIR)/usr/bin/picard
-	mv $(DESTDIR)/usr/bin/picard $(DESTDIR)/usr/lib/picard/run
-	dh_link /usr/lib/picard/run /usr/bin/picard
-	find $(DESTDIR) -type d -empty -delete
-
-override_dh_auto_clean:
-	rm -rf build/ build.cfg scripts/picard build-stamp*
-	find $(CURDIR) \( -name '*.mo' -o -name '*.pyc' -o -name '*.gitignore' \) -delete


