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

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Mon Sep 11 21:05:32 UTC 2017


Author: pochu
Date: Mon Sep 11 21:05:32 2017
New Revision: 53670

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

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=53670&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/rules	[utf-8] Mon Sep 11 21:05:32 2017
@@ -45,113 +45,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" \;)
-
-configure_flags_common = \
-	--libdir=/$(LIBDIR) \
-	--enable-test-print-backend
-
-configure_flags_deb = \
-	--enable-broadway-backend \
-	--enable-x11-backend \
-	--enable-gtk-doc \
-	--enable-man \
-	--enable-shared \
-	--enable-introspection \
-	--enable-cloudprint \
-	--disable-static
-
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-configure_flags_deb += --enable-colord
-else
-configure_flags_deb += --disable-colord
-endif
-
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-configure_flags_deb += --enable-wayland-backend
-else
-configure_flags_deb += --disable-wayland-backend
-endif
-
-ifeq ($(filter %-doc,$(binaries)),)
-configure_flags_deb += --disable-gtk-doc --disable-man
-endif
-
-configure_flags_udeb = \
-	--disable-broadway-backend \
-	--disable-wayland-backend \
-	--enable-x11-backend \
-	--disable-introspection \
-	--disable-cloudprint \
-	--disable-colord \
-	--disable-xcomposite \
-	--disable-xdamage \
-	--disable-xfixes \
-	--disable-xrandr
-
-%:
-	dh $@ --with gir
-
-override_dh_autoreconf:
-	dh_autoreconf "NOCONFIGURE=true ./autogen.sh"
-
-override_dh_auto_configure: debian/control
-	dh_auto_configure \
-		--builddirectory=debian/build/deb \
-		-- \
-		$(configure_flags_common) \
-		$(configure_flags_deb) \
-		$(NULL)
-ifneq ($(filter %-udeb,$(binaries)),)
-	dh_auto_configure \
-		--builddirectory=debian/build/udeb \
-		-- \
-		$(configure_flags_common) \
-		$(configure_flags_udeb) \
-		$(NULL)
-endif
-
-override_dh_auto_build:
-	dh_auto_build --builddirectory=debian/build/deb
-ifneq ($(filter %-udeb,$(binaries)),)
-	dh_auto_build --builddirectory=debian/build/udeb
-endif
-
-override_dh_auto_test:
-	# 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/
-	# 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
-
-override_dh_auto_install:
-	dh_auto_install --builddirectory=debian/build/deb --destdir=debian/install/deb
-ifneq ($(filter %-udeb,$(binaries)),)
-	dh_auto_install --builddirectory=debian/build/udeb --destdir=debian/install/udeb
-endif
-
-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
@@ -195,6 +88,51 @@
 		-e "s#@README@#$(README)#g" \
 		$@.in > $@
 
+configure_flags_common = \
+	--libdir=/$(LIBDIR) \
+	--enable-test-print-backend
+
+configure_flags_deb = \
+	--enable-broadway-backend \
+	--enable-x11-backend \
+	--enable-gtk-doc \
+	--enable-man \
+	--enable-shared \
+	--enable-introspection \
+	--enable-cloudprint \
+	--disable-static
+
+ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+configure_flags_deb += --enable-colord
+else
+configure_flags_deb += --disable-colord
+endif
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+configure_flags_deb += --enable-wayland-backend
+else
+configure_flags_deb += --disable-wayland-backend
+endif
+
+ifeq ($(filter %-doc,$(binaries)),)
+configure_flags_deb += --disable-gtk-doc --disable-man
+endif
+
+configure_flags_udeb = \
+	--disable-broadway-backend \
+	--disable-wayland-backend \
+	--enable-x11-backend \
+	--disable-introspection \
+	--disable-cloudprint \
+	--disable-colord \
+	--disable-xcomposite \
+	--disable-xdamage \
+	--disable-xfixes \
+	--disable-xrandr
+
+%:
+	dh $@ --with gir
+
 override_dh_clean: debian/control
 	# gross kludge to force control generation with the %.in target
 	touch debian/control.in
@@ -205,3 +143,65 @@
 
 # Add dependencies to generate files from the debian/*.in ones
 override_dh_auto_build: $(call dh_subst_files,$(binaries))
+
+override_dh_autoreconf:
+	dh_autoreconf "NOCONFIGURE=true ./autogen.sh"
+
+override_dh_auto_configure: debian/control
+	dh_auto_configure \
+		--builddirectory=debian/build/deb \
+		-- \
+		$(configure_flags_common) \
+		$(configure_flags_deb) \
+		$(NULL)
+ifneq ($(filter %-udeb,$(binaries)),)
+	dh_auto_configure \
+		--builddirectory=debian/build/udeb \
+		-- \
+		$(configure_flags_common) \
+		$(configure_flags_udeb) \
+		$(NULL)
+endif
+
+override_dh_auto_build:
+	dh_auto_build --builddirectory=debian/build/deb
+ifneq ($(filter %-udeb,$(binaries)),)
+	dh_auto_build --builddirectory=debian/build/udeb
+endif
+
+override_dh_auto_test:
+	# 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/
+	# 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
+
+override_dh_auto_install:
+	dh_auto_install --builddirectory=debian/build/deb --destdir=debian/install/deb
+ifneq ($(filter %-udeb,$(binaries)),)
+	dh_auto_install --builddirectory=debian/build/udeb --destdir=debian/install/udeb
+endif
+
+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)




More information about the pkg-gnome-commits mailing list