[Python-apps-commits] r3948 - in packages/phatch/trunk/debian (5 files)

[piotr at users.alioth.debian.org]

    Date: Monday, October 12, 2009 @ 10:35:46
  Author: piotr
Revision: 3948

do the same with menu file

Added:
  packages/phatch/trunk/debian/phatch.lintian
  packages/phatch/trunk/debian/phatch.menu
    (from rev 3941, packages/phatch/trunk/debian/phatch-cli.menu)
Modified:
  packages/phatch/trunk/debian/changelog
  packages/phatch/trunk/debian/rules
Deleted:
  packages/phatch/trunk/debian/phatch-cli.menu

Modified: packages/phatch/trunk/debian/changelog
===================================================================
--- packages/phatch/trunk/debian/changelog	2009-10-12 10:11:09 UTC (rev 3947)
+++ packages/phatch/trunk/debian/changelog	2009-10-12 10:35:46 UTC (rev 3948)
@@ -1,6 +1,9 @@
 phatch (0.2.3-2) unstable; urgency=low
 
-  * phatch.desktop file is now shipped by phatch package (LP: #449210)
+  * phatch.desktop and menu files are now shipped by phatch package
+    (LP: #449210)
+    - add lintian overrides for above changes (phatch depends on phatch-cli so
+      everything is ok)
 
  -- Piotr Ożarowski <piotr at debian.org>  Mon, 12 Oct 2009 11:53:43 +0200
 

Deleted: packages/phatch/trunk/debian/phatch-cli.menu
===================================================================
--- packages/phatch/trunk/debian/phatch-cli.menu	2009-10-12 10:11:09 UTC (rev 3947)
+++ packages/phatch/trunk/debian/phatch-cli.menu	2009-10-12 10:35:46 UTC (rev 3948)
@@ -1,5 +0,0 @@
-?package(phatch-cli):needs="X11"\
- section="Applications/Graphics"\
- title="phatch"\
- description="Photo Batch Processor"\
- command="/usr/bin/phatch"

Added: packages/phatch/trunk/debian/phatch.lintian
===================================================================
--- packages/phatch/trunk/debian/phatch.lintian	                        (rev 0)
+++ packages/phatch/trunk/debian/phatch.lintian	2009-10-12 10:35:46 UTC (rev 3948)
@@ -0,0 +1,3 @@
+phatch: desktop-command-not-in-package /usr/share/applications/phatch.desktop phatch
+phatch: pkg-not-in-package-test phatch-cli /usr/share/menu/phatch
+phatch: menu-command-not-in-package /usr/share/menu/phatch:5 /usr/bin/phatch

Copied: packages/phatch/trunk/debian/phatch.menu (from rev 3941, packages/phatch/trunk/debian/phatch-cli.menu)
===================================================================
--- packages/phatch/trunk/debian/phatch.menu	                        (rev 0)
+++ packages/phatch/trunk/debian/phatch.menu	2009-10-12 10:35:46 UTC (rev 3948)
@@ -0,0 +1,5 @@
+?package(phatch-cli):needs="X11"\
+ section="Applications/Graphics"\
+ title="phatch"\
+ description="Photo Batch Processor"\
+ command="/usr/bin/phatch"

Modified: packages/phatch/trunk/debian/rules
===================================================================
--- packages/phatch/trunk/debian/rules	2009-10-12 10:11:09 UTC (rev 3947)
+++ packages/phatch/trunk/debian/rules	2009-10-12 10:35:46 UTC (rev 3948)
@@ -24,8 +24,7 @@
 	mv $(PKG_C_DIR)/usr/share/phatch/phatch/lib/pyWx $(PKG_P_DIR)/usr/share/phatch/phatch/lib
 	mv $(PKG_C_DIR)/usr/share/applications $(PKG_P_DIR)/usr/share
 	dh_icons
-	echo "phatch: desktop-command-not-in-package /usr/share/applications/phatch.desktop phatch" \
-		>> $(PKG_P_DIR)/usr/share/lintian/overrides/phatch
+	cp $(CURDIR)/debian/phatch.lintian $(PKG_P_DIR)/usr/share/lintian/overrides/phatch
 
 binary-install/phatch-nautilus:: binary-install/phatch-cli
 	mkdir -p $(PKG_N_DIR)/usr/share/phatch/phatch/lib/linux/