[Python-apps-commits] r13726 - in packages/mypaint/trunk/debian (changelog rules)

[vcheng at users.alioth.debian.org]

    Date: Tuesday, November 22, 2016 @ 08:09:00
  Author: vcheng
Revision: 13726

mypaint: use d/rules sequencer

Modified:
  packages/mypaint/trunk/debian/changelog
  packages/mypaint/trunk/debian/rules

Modified: packages/mypaint/trunk/debian/changelog
===================================================================
--- packages/mypaint/trunk/debian/changelog	2016-11-20 04:39:16 UTC (rev 13725)
+++ packages/mypaint/trunk/debian/changelog	2016-11-22 08:09:00 UTC (rev 13726)
@@ -1,3 +1,10 @@
+mypaint (1.2.0-3) UNRELEASED; urgency=medium
+
+  * Update d/rules to use dh sequencer. Fixes arch-indep FTBFS.
+    (Closes: #845111)
+
+ -- Vincent Cheng <vcheng at debian.org>  Tue, 22 Nov 2016 00:02:02 -0800
+
 mypaint (1.2.0-2) unstable; urgency=medium
 
   * Acknowledge NMU. Thanks Tobias!

Modified: packages/mypaint/trunk/debian/rules
===================================================================
--- packages/mypaint/trunk/debian/rules	2016-11-20 04:39:16 UTC (rev 13725)
+++ packages/mypaint/trunk/debian/rules	2016-11-22 08:09:00 UTC (rev 13726)
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 # Hardening
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
@@ -10,16 +7,16 @@
 # Program build options
 MYPAINT_SCONSOPTS = enable_openmp=true
 
+%:
+	dh $@ --with python2 --buildsystem=pybuild
 
-build: build-arch build-indep
+override_dh_clean:
+	scons -c
+	rm -f lib/mypaintlib_wrap.cpp options.cache .sconsign.dblite
+	find . -type f -name "*.pyc" -delete
+	dh_clean
 
-build-arch: build-stamp
-
-build-indep: build-stamp
-
-
-build-stamp:
-	dh_testdir
+override_dh_auto_build:
 	scons $(MYPAINT_SCONSOPTS)
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Max-RSS: ~74000 kbytes
@@ -28,23 +25,8 @@
 	# MPLCONFIGDIR=`mktemp -d` python tests/test_brushlib.py
 	# Commented out because it'll FTBFS on 512M Debian ARM buildbots.
 endif
-	touch $@
 
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	scons -c
-	rm -f lib/mypaintlib_wrap.cpp options.cache .sconsign.dblite debian/*.debhelper debian/*.log
-	find . -type f -name "*.pyc" -exec rm -vf {} \;
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_install:
 	# Install to debian/tmp, then cut up.
 	scons prefix=/usr $(MYPAINT_SCONSOPTS) --install-sandbox=$(CURDIR)/debian/tmp
 	# Headers and a static lib are installed by the above, but are not
@@ -56,32 +38,6 @@
 	# When the ABI settles a bit more, let's consider dynamic libs.
 	# https://mail.gna.org/public/mypaint-discuss/2013-01/msg00021.html
 	dh_install --fail-missing -X prev-template.xcf.gz -X FX_blender_prev.png -X label-brush-mypaint.sh -X generate.py
-	dh_installchangelogs Changelog.md
-	dh_installdocs
-	dh_installmenu
-	dh_python2
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_icons
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
 
-
-binary-indep: install
-	dh_builddeb --indep
-
-
-binary-arch: install
-	dh_builddeb --arch
-
-
-binary: install
-	dh_builddeb
-
-
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_installchangelogs:
+	dh_installchangelogs Changelog.md