[SCM] Packaging for Tile World branch, master, updated. debian/1.3.0-5-7-gceb0c4d

[Peter Pentchev]

The following commit has been merged in the master branch:
commit 9e07c442005336cb91a5ebfd238d9a3d4cf360a0
Author: Peter Pentchev <roam at ringlet.net>
Date:   Fri Feb 11 12:29:05 2011 +0200

    Use #DEBHELPER# in postinst and remove postrm - dh_installmenu does it all.

diff --git a/debian/changelog b/debian/changelog
index aa66f6c..d7d02dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,13 @@ tworld (1.3.0-6) UNRELEASED; urgency=low
     - reorder the packages in the control file so that the "main" tworld
       package comes first
     - add misc:Depends to the tworld-data package, just in case
-    - rename the menu, postinst and postrm files to tworld.*
+    - rename the menu and postinst files to tworld.*
     - add the 03_destdir patch to make the Makefile honor DESTDIR
     - make debian/c4 executable now that its mode will be preserved
+    - replace the update-menus invocation in the postinst script with
+      a #DEBHELPER# token
+    - remove the postrm script since its whole purpose is automagically
+      fulfilled by debhelper autogenerated code
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 10 Feb 2011 22:11:53 +0200
 
diff --git a/debian/tworld.postinst b/debian/tworld.postinst
index 39fd6e1..b45b69b 100644
--- a/debian/tworld.postinst
+++ b/debian/tworld.postinst
@@ -15,6 +15,4 @@ if dpkg --compare-versions "$2" le-nl "1.3.0-5"; then
 	fi
 fi
 
-if [ -x /usr/bin/update-menus ]; then
-	update-menus
-fi
+#DEBHELPER#
diff --git a/debian/tworld.postrm b/debian/tworld.postrm
deleted file mode 100644
index 5893b02..0000000
--- a/debian/tworld.postrm
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-# postrm script for tworld
-# copyright 2006-2008 by Gerfried Fuchs <rhonda at debian.at>
-# Licenced BSD style
-
-if [ -x /usr/bin/update-menus ]; then
-	update-menus
-fi

-- 
Packaging for Tile World