r10168 - in /desktop/unstable/pango1.0/debian: changelog dh_pangomodules.in rules

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Apr 19 21:28:44 2007
New Revision: 10168

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10168
Log:
* dh_pangomodules.in: add a "-k" option to avoid generating the
  dependencies.
* rules: use it for libpango1.0-0 and libpango1.0-udeb to avoid a
  self-dependency for the former, and an impossible dependency for the
  latter (closes: #419593).

Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/dh_pangomodules.in
    desktop/unstable/pango1.0/debian/rules

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=10168&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Thu Apr 19 21:28:44 2007
@@ -1,3 +1,13 @@
+pango1.0 (1.16.2-2) UNRELEASED; urgency=low
+
+  * dh_pangomodules.in: add a "-k" option to avoid generating the
+    dependencies.
+  * rules: use it for libpango1.0-0 and libpango1.0-udeb to avoid a
+    self-dependency for the former, and an impossible dependency for the
+    latter (closes: #419593).
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 19 Apr 2007 23:28:17 +0200
+
 pango1.0 (1.16.2-1) unstable; urgency=low
 
   * Fix control generation.

Modified: desktop/unstable/pango1.0/debian/dh_pangomodules.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/dh_pangomodules.in?rev=10168&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/dh_pangomodules.in (original)
+++ desktop/unstable/pango1.0/debian/dh_pangomodules.in Thu Apr 19 21:28:44 2007
@@ -26,6 +26,14 @@
 
 If this command finds at least one Pango module, it will generate
 a dependency on the Module API version of pango in ${misc:Depends}.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-k>
+
+Do not generate any dependencies in ${misc:Depends}.
 
 =cut
 
@@ -110,7 +118,9 @@
 
     # since there's at least one module, generate a dependency on the
     # Pango binary version
-    addsubstvar($package, "misc:Depends", $pango_modver_dep);
+    if (! $dh{K_FLAG}) {
+        addsubstvar($package, "misc:Depends", $pango_modver_dep);
+    }
 
     my $do_query = join ' ', $querymodules, @modules;
     open(QUERY, "$do_query |")

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=10168&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules (original)
+++ desktop/unstable/pango1.0/debian/rules Thu Apr 19 21:28:44 2007
@@ -248,12 +248,12 @@
 	LD_LIBRARY_PATH=$(CURDIR)/debian/$(SHARED_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \
 	PANGO_QUERYMODULES=$(buildbasedir)/shared/pango/pango-querymodules \
 		debian/$(DEV_PKG)/usr/bin/dh_pangomodules \
-			-p$(SHARED_PKG)
+			-p$(SHARED_PKG) -k
 	# generate $(UDEB_PKG).modules for the udeb
 	LD_LIBRARY_PATH=$(CURDIR)/debian/$(UDEB_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \
 	PANGO_QUERYMODULES=$(buildbasedir)/udeb/pango/pango-querymodules \
 		debian/$(DEV_PKG)/usr/bin/dh_pangomodules \
-			-p$(UDEB_PKG)
+			-p$(UDEB_PKG) -k
 	dh_installinfo -a
 	dh_installman -a
 	dh_link -a