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

[cjsmo-guest at users.alioth.debian.org]

    Date: Thursday, August 29, 2013 @ 00:58:29
  Author: cjsmo-guest
Revision: 9991

Added openteacher.dirs and updated rules, control as suggested by Piotr

Added:
  packages/picard/trunk/debian/dirs
Modified:
  packages/picard/trunk/debian/control
  packages/picard/trunk/debian/links
  packages/picard/trunk/debian/rules

Modified: packages/picard/trunk/debian/control
===================================================================
--- packages/picard/trunk/debian/control	2013-08-28 20:28:11 UTC (rev 9990)
+++ packages/picard/trunk/debian/control	2013-08-29 00:58:29 UTC (rev 9991)
@@ -4,7 +4,6 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Charlie Smotherman <cjsmo at cableone.net>
 Build-Depends: debhelper (>= 9),
- python3 (>= 3.3.0-2),
  python-dev (>= 2.6.6-3~),
  dh-python,
  gettext,

Added: packages/picard/trunk/debian/dirs
===================================================================
--- packages/picard/trunk/debian/dirs	                        (rev 0)
+++ packages/picard/trunk/debian/dirs	2013-08-29 00:58:29 UTC (rev 9991)
@@ -0,0 +1 @@
+usr/share/pixmaps

Modified: packages/picard/trunk/debian/links
===================================================================
--- packages/picard/trunk/debian/links	2013-08-28 20:28:11 UTC (rev 9990)
+++ packages/picard/trunk/debian/links	2013-08-29 00:58:29 UTC (rev 9991)
@@ -1,5 +1,4 @@
 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

Modified: packages/picard/trunk/debian/rules
===================================================================
--- packages/picard/trunk/debian/rules	2013-08-28 20:28:11 UTC (rev 9990)
+++ packages/picard/trunk/debian/rules	2013-08-29 00:58:29 UTC (rev 9991)
@@ -1,21 +1,26 @@
 #!/usr/bin/make -f
 
-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_DESTDIR=debian/picard
+export PYBUILD_CONFIGURE_ARGS=config
 export PYBUILD_BUILD_ARGS_python2=build_ext
-export PYBUILD_INSTALL_ARGS_python2=--install-layout=deb \
+export PYBUILD_INSTALL_ARGS=--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;
+
+DESTDIR = $(CURDIR)/debian/picard
+
 %:
 	dh $@ --with python2 --buildsystem=pybuild
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build/ build.cfg scripts/picard build-stamp*
+	find . \( -name '*.mo' -o -name '*.pyc' -o -name '*.gitignore' \) -delete
+
+override_dh_auto_install:
+	dh_auto_install
+	convert $(CURDIR)/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
+