[debhelper-devel] [debhelper] 02/02: dh_gconf: Only add depends if a scheme is installed

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 22ee2dfd0c67548d9abf62c64e524e55181d22c2
Author: Josselin Mouette <joss at debian.org>
Date:   Thu Jan 1 20:36:33 2015 +0100

    dh_gconf: Only add depends if a scheme is installed
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_gconf         | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fa6ad7..c106cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ debhelper (9.20150101.1) UNRELEASED; urgency=medium
     invoking dh_link.  (Closes: #610173)
   * dh_compress: Apply patch from Osamu Aoki to avoid compressing
     ".xhtml" files.  (Closes: #740405)
+  * dh_gconf: Apply patch from Josselin Mouette to avoid
+    dependency on gconf2 for installs of non-schema files.
+    (Closes: #592958)
 
  -- Niels Thykier <niels at thykier.net>  Thu, 01 Jan 2015 17:24:38 +0100
 
diff --git a/dh_gconf b/dh_gconf
index 48b05ba..7c88293 100755
--- a/dh_gconf
+++ b/dh_gconf
@@ -63,20 +63,15 @@ if (defined $dh{PRIORITY}) {
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	
-	my $gconf_dep = 0;
 	my $mandatory = pkgfile($package, "gconf-mandatory");
 	if ($mandatory ne '') {
 		doit("mkdir","-p","$tmp/usr/share/gconf/mandatory");
 		doit("install","-p","-m644",$mandatory,"$tmp/usr/share/gconf/mandatory/${priority}_$package");
-		addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)");
-		$gconf_dep = 1;
 	}
 	my $defaults = pkgfile($package,"gconf-defaults");
 	if ($defaults ne '') {
 		doit("mkdir","-p","$tmp/usr/share/gconf/defaults");
 		doit("install","-p","-m644",$defaults,"$tmp/usr/share/gconf/defaults/${priority}_$package");
-		addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)") unless $gconf_dep;
-		$gconf_dep = 1;
 	}
 
 	my $old_schemas_dir = "$tmp/etc/gconf/schemas";
@@ -93,7 +88,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		# Get a list of the schemas
 		my $schemas = `find $new_schemas_dir -type f -name \\*.schemas -printf '%P '`;
 		if ($schemas ne '') {
-			addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)") unless $gconf_dep;
+			addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)");
 		}
 	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git