Imported Debian patch 0.5.4-2

diff --git a/debian/changelog b/debian/changelog
index e4fbbbdd37f6aaf1e85f0ece8da6b5224fb245a7..068c46e5b0e12eeed24930c592626862ebb3d27e 100644 (file)
--- 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 c4a0c8ae0d31303f02b56efefc73e97e5186b9b6..05bb732aa9afdb3e1a8a663c59c89d1ac793dea7 100644 (file)
--- 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 d388fb4c268242df150c36811b30089a70c5f401..e6df067bf5f4be8c45ef4bae969fbaddd4d2e36d 100644 (file)
--- 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 8086d1a38bfcc8367ffaddedb38f588a8cedb4fd..5e0c5184b56033c078b934af4c19b7d76f4ac6a1 100755 (executable)
--- 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