r52170 - in /desktop/experimental/glib2.0/debian: changelog control control.in rules

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Sat Mar 4 15:34:49 UTC 2017


Author: smcv
Date: Sat Mar  4 15:34:48 2017
New Revision: 52170

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52170
Log:
* Add support for noudeb build profile

- Do not do the udeb build if the noudeb profile is selected,
  for faster test-builds

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/control.in
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=52170&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Sat Mar  4 15:34:48 2017
@@ -29,6 +29,9 @@
   * Move gdb helpers from libglib2.0-0-dbg to libglib2.0-dev, move
     detached debug symbols from libglib2.0-0-dbg to autogenerated -dbgsym
     packages, and remove the libglib2.0-0-dbg binary package
+  * Add support for noudeb build profile
+    - Do not do the udeb build if the noudeb profile is selected,
+      for faster test-builds
   * Fix assorted Lintian warnings
     - Add missing build-dependency on dh-python
       + remove obsolete Lintian override for mmissing B-D on python

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=52170&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control	[utf-8] Sat Mar  4 15:34:48 2017
@@ -75,6 +75,7 @@
  regression testsuite.
 
 Package: libglib2.0-udeb
+Build-Profiles: <!noudeb>
 Section: debian-installer
 Package-Type: udeb
 Architecture: any

Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=52170&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in	[utf-8] Sat Mar  4 15:34:48 2017
@@ -71,6 +71,7 @@
  regression testsuite.
 
 Package: libglib2.0-udeb
+Build-Profiles: <!noudeb>
 Section: debian-installer
 Package-Type: udeb
 Architecture: any

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=52170&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules	[utf-8] Sat Mar  4 15:34:48 2017
@@ -4,6 +4,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE := glib
+binaries := $(shell dh_listpackages)
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 
@@ -30,12 +31,14 @@
 		$(DEB_CONFIGURE_EXTRA_FLAGS) \
 		$(DEB_CONFIGURE_FLAGS_deb) \
 		$(NULL)
+ifneq ($(filter %-udeb,$(binaries)),)
 	dh_auto_configure \
 		--builddirectory=debian/build/udeb \
 		-- \
 		$(DEB_CONFIGURE_EXTRA_FLAGS) \
 		$(DEB_CONFIGURE_FLAGS_udeb) \
 		$(NULL)
+endif
 
 override_dh_clean:
 	rm -rf $(CURDIR)/debian/build \
@@ -125,7 +128,9 @@
 override_dh_auto_build:
 	mkdir -p debian/tmp-xdg-runtime-dir
 	dh_auto_build --builddirectory=debian/build/deb
+ifneq ($(filter %-udeb,$(binaries)),)
 	dh_auto_build --builddirectory=debian/build/udeb
+endif
 
 override_dh_auto_install:
 	set -e; for script in postinst postrm triggers; do \
@@ -135,7 +140,9 @@
 		    > debian/libglib2.0-0.$$script ; \
 	done
 	dh_auto_install -plibglib2.0-tests --sourcedir=debian/build/deb -X.la
+ifneq ($(filter %-udeb,$(binaries)),)
 	dh_auto_install -plibglib2.0-udeb --builddirectory=debian/build/udeb --destdir=debian/install/udeb
+endif
 	dh_auto_install --remaining-packages --builddirectory=debian/build/deb --destdir=debian/install/deb
 
 override_dh_python3:
@@ -150,6 +157,7 @@
 	rm -fr debian/install/deb/usr/share/glib-2.0/codegen/__pycache__
 	# Re-created by .links to point into /lib
 	rm -f debian/install/deb/usr/lib/*/libglib-2.0.so
+ifneq ($(filter %-udeb,$(binaries)),)
 	# Unwanted bits from the .udeb build
 	rm -f debian/install/udeb/lib/*/*.la
 	rm -f debian/install/udeb/usr/lib/*/*.la
@@ -161,4 +169,5 @@
 	rm -fr debian/install/udeb/usr/share/glib-2.0/valgrind
 	rm -fr debian/install/udeb/usr/share/man
 	dh_install -plibglib2.0-udeb --sourcedir=debian/install/udeb --list-missing
+endif
 	dh_install --remaining-packages --sourcedir=debian/install/deb --list-missing




More information about the pkg-gnome-commits mailing list