r53633 - /desktop/unstable/gtk+3.0/debian/rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Sep 11 16:14:03 2017
New Revision: 53633

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53633
Log:
reorder some targets

didn't do it earlier to keep the diff cleaner, but this makes more sense as
it's closer to the order dh runs them

Modified:
    desktop/unstable/gtk+3.0/debian/rules

Modified: desktop/unstable/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/rules?rev=53633&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/rules	[utf-8] Mon Sep 11 16:14:03 2017
@@ -43,13 +43,6 @@
 # so append a .gz suffix to avoid dangling symlinks
 NEWS := NEWS$(shell find -maxdepth 1 -size +4k -name NEWS -exec echo ".gz" \;)
 README := README$(shell find -maxdepth 1 -size +4k -name README -exec echo ".gz" \;)
-
-override_dh_missing:
-	dh_missing --sourcedir=debian/install/udeb --list-missing -X.la
-	dh_missing --sourcedir=debian/install/deb --list-missing -X.la
-
-override_dh_autoreconf:
-	dh_autoreconf "NOCONFIGURE=true ./autogen.sh"
 
 DEB_CONFIGURE_EXTRA_FLAGS = \
 			--libdir=/$(LIBDIR) \
@@ -91,6 +84,9 @@
 
 %:
 	dh $@ --with gir
+
+override_dh_autoreconf:
+	dh_autoreconf "NOCONFIGURE=true ./autogen.sh"
 
 override_dh_auto_configure: debian/control
 	dh_auto_configure \
@@ -106,6 +102,19 @@
 		$(DEB_CONFIGURE_FLAGS_shared_udeb) \
 		$(NULL)
 
+override_dh_auto_build:
+	# Mark reftests with known failures as non-fatal
+	touch testsuite/reftests/nonresizable-size.ui.known_fail
+	touch testsuite/reftests/window-show-contents-on-map.ui.known_fail
+	touch testsuite/reftests/inherit-and-initial.ui.known_fail
+	touch testsuite/reftests/textview-margins.ui.known_fail
+	# So that gsettings can find the (uninstalled) gtk schemas
+	mkdir -p debian/build/glib-2.0/schemas/
+	cp gtk/org.gtk.* debian/build/glib-2.0/schemas/
+	glib-compile-schemas debian/build/glib-2.0/schemas/
+	dh_auto_build --builddirectory=debian/build/deb
+	dh_auto_build --builddirectory=debian/build/udeb
+
 override_dh_auto_test:
 	# Remove LD_PRELOAD so we don't run with fakeroot, which makes dbus-related tests fail
 	env -u LD_PRELOAD dh_auto_test --builddirectory=debian/build/deb -- -k check -j1
@@ -117,6 +126,20 @@
 override_dh_install:
 	dh_install -p$(UDEB_PKG) --sourcedir=debian/install/udeb
 	dh_install --remaining-packages --sourcedir=debian/install/deb
+
+override_dh_missing:
+	dh_missing --sourcedir=debian/install/udeb --list-missing -X.la
+	dh_missing --sourcedir=debian/install/deb --list-missing -X.la
+
+override_dh_installdocs:
+	dh_installdocs -p$(COMMON_PKG) AUTHORS README NEWS
+	dh_installdocs -p$(DOC_PKG) AUTHORS -X.in
+	dh_installdocs --remaining-packages -A AUTHORS
+
+override_dh_makeshlibs:
+	dh_makeshlibs -p$(SHARED_PKG) -V --add-udeb=$(UDEB_PKG) -X$(MODULES_BASE_PATH) -- -c4
+	dh_makeshlibs -plibgail-3-0 -V -- -c4
+	dh_makeshlibs --remaining-packages -X$(MODULES_BASE_PATH)
 
 # Avoid test failures on buildd environments
 export HOME=$(CURDIR)/debian/build
@@ -131,16 +154,6 @@
 unexport XDG_DATA_HOME
 # Get failing tests' stdout/err so we have some information when a build fails
 export VERBOSE=1
-
-override_dh_installdocs:
-	dh_installdocs -p$(COMMON_PKG) AUTHORS README NEWS
-	dh_installdocs -p$(DOC_PKG) AUTHORS -X.in
-	dh_installdocs --remaining-packages -A AUTHORS
-
-override_dh_makeshlibs:
-	dh_makeshlibs -p$(SHARED_PKG) -V --add-udeb=$(UDEB_PKG) -X$(MODULES_BASE_PATH) -- -c4
-	dh_makeshlibs -plibgail-3-0 -V -- -c4
-	dh_makeshlibs --remaining-packages -X$(MODULES_BASE_PATH)
 
 # macro computing the list of 'debian/<pkg>.*" files which have a
 # corresponding ".in" file; pass the list of packages in $(1)
@@ -178,19 +191,6 @@
 	rm -rf debian/build debian/install
 	dh_clean
 
-override_dh_auto_build:
-	# Mark reftests with known failures as non-fatal
-	touch testsuite/reftests/nonresizable-size.ui.known_fail
-	touch testsuite/reftests/window-show-contents-on-map.ui.known_fail
-	touch testsuite/reftests/inherit-and-initial.ui.known_fail
-	touch testsuite/reftests/textview-margins.ui.known_fail
-	# So that gsettings can find the (uninstalled) gtk schemas
-	mkdir -p debian/build/glib-2.0/schemas/
-	cp gtk/org.gtk.* debian/build/glib-2.0/schemas/
-	glib-compile-schemas debian/build/glib-2.0/schemas/
-	dh_auto_build --builddirectory=debian/build/deb
-	dh_auto_build --builddirectory=debian/build/udeb
-
 DEB_INDEP_PACKAGES = $(shell dh_listpackages -i)
 DEB_ARCH_PACKAGES = $(shell dh_listpackages -a)
 DEB_ALL_PACKAGES = $(shell dh_listpackages)