[debian-edu-commits] debian-edu/ 01/01: fixup Wolfgang's previous commit

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu-artwork.

commit a033e334aca5d6e28751f1c9b2f9ea5abc654e50
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Jan 8 17:33:29 2015 +0100

    fixup Wolfgang's previous commit
---
 debian/changelog                          | 3 +--
 debian/update-debian-edu-artwork-joy      | 4 ++--
 debian/update-debian-edu-artwork-lines    | 4 ++--
 debian/update-debian-edu-artwork-spacefun | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b378da..188e059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
 debian-edu-artwork (0.52-2) UNRELEASED; urgency=medium
 
   * debian/update-debian-edu-artwork-(joy|lines|spacefun):
-    Only execute 'glib-compile-schemas' if binary and related directory
-    are existent (Closes: #774864).
+    Only execute 'glib-compile-schemas' if it is available. (Closes: #774864)
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 08 Jan 2015 16:55:36 +0100
 
diff --git a/debian/update-debian-edu-artwork-joy b/debian/update-debian-edu-artwork-joy
index a7a1383..516edd7 100755
--- a/debian/update-debian-edu-artwork-joy
+++ b/debian/update-debian-edu-artwork-joy
@@ -101,8 +101,8 @@ restore_ksplash() {
 }
 
 compile_gschemas() {
-	if [ -d /usr/share/glib-2.0/schemas/ ]; then
-	[ ! -x $path/glib-compile-schemas ] || glib-compile-schemas /usr/share/glib-2.0/schemas/
+	if [ -d /usr/share/glib-2.0/schemas/ ] && [ -x /usr/bin/glib-compile-schemas ]; then
+		glib-compile-schemas /usr/share/glib-2.0/schemas/
 	fi
 }
 
diff --git a/debian/update-debian-edu-artwork-lines b/debian/update-debian-edu-artwork-lines
index afbb62f..36f1e13 100755
--- a/debian/update-debian-edu-artwork-lines
+++ b/debian/update-debian-edu-artwork-lines
@@ -101,8 +101,8 @@ restore_ksplash() {
 }
 
 compile_gschemas() {
-	if [ -d /usr/share/glib-2.0/schemas/ ]; then
-	[ ! -x $path/glib-compile-schemas ] || glib-compile-schemas /usr/share/glib-2.0/schemas/
+	if [ -d /usr/share/glib-2.0/schemas/ ] && [ -x /usr/bin/glib-compile-schemas ]; then
+		glib-compile-schemas /usr/share/glib-2.0/schemas/
 	fi
 }
 
diff --git a/debian/update-debian-edu-artwork-spacefun b/debian/update-debian-edu-artwork-spacefun
index 145c6a1..7fa3804 100755
--- a/debian/update-debian-edu-artwork-spacefun
+++ b/debian/update-debian-edu-artwork-spacefun
@@ -101,8 +101,8 @@ restore_ksplash() {
 }
 
 compile_gschemas() {
-	if [ -d /usr/share/glib-2.0/schemas/ ]; then
-	[ ! -x $path/glib-compile-schemas ] || glib-compile-schemas /usr/share/glib-2.0/schemas/
+	if [ -d /usr/share/glib-2.0/schemas/ ] && [ -x /usr/bin/glib-compile-schemas ]; then
+		glib-compile-schemas /usr/share/glib-2.0/schemas/
 	fi
 }
 

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