r42200 - in /packages/unstable/libproxy/debian: changelog control control.in rules

[ah at users.alioth.debian.org]

Author: ah
Date: Mon Aug 18 19:10:38 2014
New Revision: 42200

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42200
Log:
Break a couple of build dependency loops (Closes: #758466)

Modified:
    packages/unstable/libproxy/debian/changelog
    packages/unstable/libproxy/debian/control
    packages/unstable/libproxy/debian/control.in
    packages/unstable/libproxy/debian/rules

Modified: packages/unstable/libproxy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/changelog?rev=42200&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog	[utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog	[utf-8] Mon Aug 18 19:10:38 2014
@@ -2,6 +2,7 @@
 
   [ Peter Pentchev ]
   * Add explicit zlib build-dependency (Closes: #758465)
+  * Break a couple of build dependency loops (Closes: #758466)
 
  -- Andreas Henriksson <andreas at fatal.se>  Mon, 18 Aug 2014 21:07:56 +0200
 

Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=42200&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control	[utf-8] (original)
+++ packages/unstable/libproxy/debian/control	[utf-8] Mon Aug 18 19:10:38 2014
@@ -8,7 +8,11 @@
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Laurent Bigonville <bigon at debian.org>
+# In the stage1 build profile, remove both cli-common-dev and mono-devel.
 Build-Depends-Indep: cli-common-dev (>= 0.5.7~), mono-devel (>= 2.4.3)
+# In the stage1 build profile, remove libmozjs185-dev, kdelibs5-dev,
+# libqt4-dev, libwebkitgtk-3.0-dev, libjavascriptcoregtk-3.0-dev,
+# libglib2.0-dev, libxmu-dev.
 Build-Depends: debhelper (>= 9),
                gnome-pkg-tools,
                netbase,

Modified: packages/unstable/libproxy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control.in?rev=42200&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in	[utf-8] (original)
+++ packages/unstable/libproxy/debian/control.in	[utf-8] Mon Aug 18 19:10:38 2014
@@ -3,7 +3,11 @@
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
 Uploaders: @GNOME_TEAM@
+# In the stage1 build profile, remove both cli-common-dev and mono-devel.
 Build-Depends-Indep: cli-common-dev (>= 0.5.7~), mono-devel (>= 2.4.3)
+# In the stage1 build profile, remove libmozjs185-dev, kdelibs5-dev,
+# libqt4-dev, libwebkitgtk-3.0-dev, libjavascriptcoregtk-3.0-dev,
+# libglib2.0-dev, libxmu-dev.
 Build-Depends: debhelper (>= 9),
                gnome-pkg-tools,
                netbase,

Modified: packages/unstable/libproxy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/rules?rev=42200&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/rules	[utf-8] (original)
+++ packages/unstable/libproxy/debian/rules	[utf-8] Mon Aug 18 19:10:38 2014
@@ -10,41 +10,56 @@
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 # only invoke dh --with cli if cli-common-dev is present
+WITH_CLI = 
+WITH_DOTNET = -DWITH_DOTNET=OFF
+ifneq (,$(wildcard /usr/share/perl5/Debian/Debhelper/Sequence/cli.pm))
+ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
 WITH_CLI = --with cli
 WITH_DOTNET = -DWITH_DOTNET=ON
-ifeq (,$(wildcard /usr/share/perl5/Debian/Debhelper/Sequence/cli.pm))
-WITH_CLI = 
-WITH_DOTNET = -DWITH_DOTNET=OFF
+endif
 endif
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CONFIGURE_FLAGS = $(WITH_DOTNET) \
 		-DWITH_VALA=ON \
-		-DWITH_GNOME3=ON \
-		-DWITH_MOZJS=ON \
-		-DWITH_WEBKIT3=ON \
 		-DGMCS_EXECUTABLE=/usr/bin/mono-csc \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DBIPR=0 \
 		-DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		-DLIBEXEC_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/libproxy/$(SHLIBVER)
 
+ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+CONFIGURE_FLAGS += \
+		-DWITH_GNOME3=ON \
+		-DWITH_MOZJS=ON \
+		-DWITH_WEBKIT3=ON
+DH_EXCLUDE	=
+else
+CONFIGURE_FLAGS += \
+		-DWITH_GNOME3=OFF \
+		-DWITH_MOZJS=OFF \
+		-DWITH_WEBKIT3=OFF
+DH_EXCLUDE	= -Nlibproxy1-plugin-gsettings -Nlibproxy1-plugin-kconfig -Nlibproxy1-plugin-mozjs -Nlibproxy1-plugin-webkit -Nlibproxy0.4-cil -Nlibproxy-cil-dev
+endif
+
 override_dh_auto_configure:
 	dh_auto_configure -- $(CONFIGURE_FLAGS)
 
 override_dh_install-arch:
-	dh_install
+	dh_install $(DH_EXCLUDE)
 	rm -f \
 	  debian/libproxy-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libproxy-sharp-*.pc
 
 override_dh_install-indep:
-	dh_install
+	dh_install $(DH_EXCLUDE)
+ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
 	sed -i 's!/usr/lib/mono/libproxy-sharp!/usr/lib/cli/libproxy-sharp-0.4!' \
 		debian/libproxy-cil-dev/usr/lib/pkgconfig/libproxy-sharp-1.0.pc
+endif
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V '$(libproxy) (>= $(SHLIBVER))' -- -c4
+	dh_makeshlibs -V '$(libproxy) (>= $(SHLIBVER))' $(DH_EXCLUDE) -- -c4
 
 %:
-	dh $@ $(WITH_CLI) --with python2
+	dh $@ $(WITH_CLI) --with python2 $(DH_EXCLUDE)