r11014 - in /packages/unstable/gtranslator/debian: changelog patches/30_superfluous-underscores-in-desktop-file.patch rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed May 16 14:23:57 2007
New Revision: 11014

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11014
Log:
* Remove desktop/gtranslator.desktop in clean instead of patching it in
  30_superfluous-underscores-in-desktop-file; fixes FTBFS on double build;
  closes: #424395.

Modified:
    packages/unstable/gtranslator/debian/changelog
    packages/unstable/gtranslator/debian/patches/30_superfluous-underscores-in-desktop-file.patch
    packages/unstable/gtranslator/debian/rules

Modified: packages/unstable/gtranslator/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/changelog?rev=11014&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/changelog (original)
+++ packages/unstable/gtranslator/debian/changelog Wed May 16 14:23:57 2007
@@ -1,3 +1,11 @@
+gtranslator (1.1.7-3) UNRELEASED; urgency=low
+
+  * Remove desktop/gtranslator.desktop in clean instead of patching it in
+    30_superfluous-underscores-in-desktop-file; fixes FTBFS on double build;
+    closes: #424395.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 16 May 2007 16:23:27 +0200
+
 gtranslator (1.1.7-2) unstable; urgency=high
 
   * Add a get-orig-source target to retrieve the upstream tarball.

Modified: packages/unstable/gtranslator/debian/patches/30_superfluous-underscores-in-desktop-file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/patches/30_superfluous-underscores-in-desktop-file.patch?rev=11014&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/patches/30_superfluous-underscores-in-desktop-file.patch (original)
+++ packages/unstable/gtranslator/debian/patches/30_superfluous-underscores-in-desktop-file.patch Wed May 16 14:23:57 2007
@@ -1,18 +1,5 @@
 Malone #91862; fixes presence of gtranslator in GNOME menu
 
-diff -Nur gtranslator-1.1.7/data/desktop/gtranslator.desktop gtranslator-1.1.7.new/data/desktop/gtranslator.desktop
---- gtranslator-1.1.7/data/desktop/gtranslator.desktop	2006-11-28 01:13:16.000000000 +0100
-+++ gtranslator-1.1.7.new/data/desktop/gtranslator.desktop	2007-03-13 16:14:23.000000000 +0100
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=gtranslator
--_Comment=The GNOME translation program
-+Name=gtranslator
-+Comment=The GNOME translation program
- Icon=gtranslator.png
- Exec=gtranslator
- Terminal=false
 diff -Nur gtranslator-1.1.7/data/desktop/gtranslator.desktop.in gtranslator-1.1.7.new/data/desktop/gtranslator.desktop.in
 --- gtranslator-1.1.7/data/desktop/gtranslator.desktop.in	2006-10-14 15:50:34.000000000 +0200
 +++ gtranslator-1.1.7.new/data/desktop/gtranslator.desktop.in	2007-03-13 16:14:25.000000000 +0100

Modified: packages/unstable/gtranslator/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/rules?rev=11014&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/rules (original)
+++ packages/unstable/gtranslator/debian/rules Wed May 16 14:23:57 2007
@@ -10,6 +10,10 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+# see Malone #91862; fixes presence of gtranslator in GNOME menu
+clean::
+	rm -f desktop/gtranslator.desktop
+
 clean::
 	rm -f data/mime/gtranslator.keys
 	rm -f help/C/gtranslator-C.omf.out