From: Gerfried Fuchs <alfie@debian.org>
Date: Mon, 5 Sep 2005 10:33:49 +0000 (+0200)
Subject: Imported Debian patch 0.5.4-2
X-Git-Tag: debian/0.5.4-2^0
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=6254d62ebd44b79316891a4ee45cb67cbe98cba4;p=pkg%2Fabook.git

Imported Debian patch 0.5.4-2
---

diff --git a/debian/changelog b/debian/changelog
index e4fbbbd..068c46e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+abook (0.5.4-2) unstable; urgency=low
+
+  * The "lintian bugs R us" release:
+    - Moved menu file from /usr/lib/menu to /usr/share/menu.
+    - Removed bashism in postrm and config.
+
+ -- Gerfried Fuchs <alfie@debian.org>  Mon, 05 Sep 2005 12:33:49 +0200
+
 abook (0.5.4-1) unstable; urgency=low
 
   * New upstream release (closes: #314611)
diff --git a/debian/config b/debian/config
index c4a0c8a..05bb732 100644
--- a/debian/config
+++ b/debian/config
@@ -7,7 +7,7 @@ version=$2
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-if [ "$action" = "configure" -a -n "$version" ]; then
+if [ "$action" = "configure" ] && [ -n "$version" ]; then
 	if dpkg --compare-versions "$version" lt "0.5.0"; then
 		db_input medium abook/files_moved || true
 		db_go
diff --git a/debian/postrm b/debian/postrm
index d388fb4..e6df067 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -5,7 +5,7 @@ if [ -x "`which update-menus 2>/dev/null`" ]; then
 	update-menus
 fi
 
-if [ "$1" = 'purge' -a -e /usr/share/debconf/confmodule ]; then
+if [ "$1" = 'purge' ] && [ -e /usr/share/debconf/confmodule ]; then
 	. /usr/share/debconf/confmodule
 	db_purge
 fi
diff --git a/debian/rules b/debian/rules
index 8086d1a..5e0c518 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,8 +69,8 @@ binary-indep: build install
 binary-arch: build install
 	$(checkdir)
 	$(checkroot)
-	$(INSTALL_DIR) $(TMP)/DEBIAN $(TMP)/usr/lib/menu
-	$(INSTALL_FILE) debian/menu $(TMP)/usr/lib/menu/$(PACKAGE)
+	$(INSTALL_DIR) $(TMP)/DEBIAN $(TMP)/usr/share/menu
+	$(INSTALL_FILE) debian/menu $(TMP)/usr/share/menu/$(PACKAGE)
 	$(INSTALL_FILE) debian/copyright $(TMP)/usr/share/doc/$(PACKAGE)
 	$(INSTALL_FILE) debian/changelog \
 		$(TMP)/usr/share/doc/$(PACKAGE)/changelog.Debian