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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Oct 25 01:24:32 2011
New Revision: 31032

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31032
Log:
Don't hard-code the Recommends on libwebkitgtk-1.0-0 | libmozjs6d.
Instead filter out the correct library package names as found by
dpkg-shlibdeps and set them via substvars.

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=31032&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog [utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog [utf-8] Tue Oct 25 01:24:32 2011
@@ -5,6 +5,9 @@
   * Bump debhelper compatibility level to 8.
     - Update Build-Depends on debhelper.
     - Strip debian/tmp/ from .install files.
+  * Don't hard-code the Recommends on libwebkitgtk-1.0-0 | libmozjs6d.
+    Instead filter out the correct library package names as found by
+    dpkg-shlibdeps and set them via substvars.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 25 Oct 2011 01:41:45 +0200
 

Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=31032&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control [utf-8] (original)
+++ packages/unstable/libproxy/debian/control [utf-8] Tue Oct 25 01:24:32 2011
@@ -32,7 +32,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: libwebkitgtk-1.0-0 | libmozjs6d
+Recommends: ${webkit:Recommends} | ${moz:Recommends}
 Description: automatic proxy configuration management library (shared)
  libproxy is a lightweight library which makes it easy to develop
  applications proxy-aware with a simple and stable API.

Modified: packages/unstable/libproxy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control.in?rev=31032&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in [utf-8] (original)
+++ packages/unstable/libproxy/debian/control.in [utf-8] Tue Oct 25 01:24:32 2011
@@ -27,7 +27,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: libwebkitgtk-1.0-0 | libmozjs6d
+Recommends: ${webkit:Recommends} | ${moz:Recommends}
 Description: automatic proxy configuration management library (shared)
  libproxy is a lightweight library which makes it easy to develop
  applications proxy-aware with a simple and stable API.

Modified: packages/unstable/libproxy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/rules?rev=31032&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/rules [utf-8] (original)
+++ packages/unstable/libproxy/debian/rules [utf-8] Tue Oct 25 01:24:32 2011
@@ -11,9 +11,13 @@
 
 DEB_DH_MAKESHLIBS_ARGS_$(libproxy) = -V '$(libproxy) (>= $(SHLIBVER))'
 DEB_DH_SHLIBDEPS_ARGS_$(libproxy) := -Xmodules
+DEB_DH_GENCONTROL_ARGS_libproxy0 = -- \
+	-Vmoz:Recommends=$(shell grep -o "libmoz[a-z0-9]*" debian/libproxy0.substvars) \
+	-Vwebkit:Recommends=$(shell grep -o "libwebkit[a-z0-9.-]*" debian/libproxy0.substvars)
 
 binary-install/python-libproxy::
 	dh_python2 -p$(cdbs_curpkg)
 
 binary-install/$(libproxy)::
+	dh_shlibdeps -plibproxy0 -- -pmodules
 	rm debian/$(libproxy)/usr/lib/libproxy/*/modules/wpad_dnsdevolution.so