summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-04-27 21:33:48 -0400
committerJoey Hess <joey@kitenet.net>2011-04-27 21:33:48 -0400
commit3ee3359a3e3e07d5d18c429a3535219d225bbb20 (patch)
tree492a4c43a280ba37173655329db2b358b1001c72
parentcf567c40f965ed9163a1d0f906eff57d0876cfb4 (diff)
dh_installgsettings: Correct bug in use of find that caused some gsettings files to be missed. Closes: #624377
-rw-r--r--debian/changelog2
-rwxr-xr-xdh_installgsettings2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 04a5d97..ad0c767 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
debhelper (8.1.5) UNRELEASED; urgency=low
* dh_ucf: New command, contributed by Jeroen Schot. Closes: #213078
+ * dh_installgsettings: Correct bug in use of find that caused some
+ gsettings files to be missed. Closes: #624377
-- Joey Hess <joeyh@debian.org> Mon, 25 Apr 2011 19:30:01 -0400
diff --git a/dh_installgsettings b/dh_installgsettings
index df38e51..8500706 100755
--- a/dh_installgsettings
+++ b/dh_installgsettings
@@ -72,7 +72,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (-d "$gsettings_schemas_dir") {
# Get a list of the schemas
- my $schemas = `find $gsettings_schemas_dir -type f -name \\*.xml -o -name \\*.override -printf '%P '`;
+ my $schemas = `find $gsettings_schemas_dir -type f \\( -name \\*.xml -o -name \\*.override \\) -printf '%P '`;
if ($schemas ne '') {
addsubstvar($package, "misc:Depends", "dconf-gsettings-backend | gsettings-backend");
}