r49325 - in /desktop/unstable/gtk+2.0/debian: changelog rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Jul 17 16:16:08 2016
New Revision: 49325

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49325
Log:
* Add build-indep and build-arch targets.
* Don't build the udeb or static flavors when only building arch-indep
  packages. Don't run the test suite either.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/rules

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=49325&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog	[utf-8] Sun Jul 17 16:16:08 2016
@@ -1,11 +1,17 @@
 gtk+2.0 (2.24.30-4) UNRELEASED; urgency=medium
 
+  [ Laurent Bigonville ]
   * debian/control.in: Bump hicolor-icon-theme to a hard dependency, the
     package is small and only provides the directory structure of the theme.
   * Depends against gnome-icon-theme | adwaita-icon-theme so we are sure the
     needed icons are installed by default. When using the GNOME, the desktop
     sets the icon theme to Adwaita by default, so the gnome-icon-theme package
     can be removed.
+
+  [ Emilio Pozuelo Monfort ]
+  * Add build-indep and build-arch targets.
+  * Don't build the udeb or static flavors when only building arch-indep
+    packages. Don't run the test suite either.
 
  -- Laurent Bigonville <bigon at debian.org>  Thu, 14 Jul 2016 02:08:30 +0200
 

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=49325&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules	[utf-8] Sun Jul 17 16:16:08 2016
@@ -188,7 +188,9 @@
 		$(MAKE) $(PARALLEL_FLAGS) -C $(builddir)
 	touch $@
 
-build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
+build-arch: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
+build-indep: $(addprefix $(STAMP_DIR)/build-stamp-, shared)
+build: build-arch build-indep
 
 $(STAMP_DIR)/check-stamp-%: $(STAMP_DIR)/build-stamp-%
 	dh_testdir
@@ -207,7 +209,8 @@
 		DESTDIR=$(installdir)
 	touch $@
 
-install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS))
+install-arch: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS))
+install-indep: $(addprefix $(STAMP_DIR)/install-stamp-, shared)
 
 # gross kludge to force control generation with the %.in target
 clean::
@@ -253,7 +256,7 @@
 
 maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
 
-binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) devhelpfiles
+binary-indep: build-indep install-indep $(call dh_subst_files,$(BINARY_INDEP_PKGS)) devhelpfiles
 	dh_testdir
 	dh_testroot
 	dh_install -i
@@ -275,7 +278,7 @@
 	dh_md5sums -i
 	dh_builddeb -i -- -Zxz
 
-binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/dh_gtkmodules debian/dh_gtkmodules.1
+binary-arch: build-arch $(maybe_check) install-arch $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/dh_gtkmodules debian/dh_gtkmodules.1
 	dh_testdir
 	dh_testroot
 	dh_install -s
@@ -323,4 +326,4 @@
 	    egrep -v '(\.la|$(LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2
 
 binary: binary-indep binary-arch
-.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary devhelpfiles
+.PHONY: patch configure build build-indep build-arch check install clean binary binary-indep binary-arch list-missing devhelpfiles