[Pkg-xfce-commits] r2288 - desktop/branches/svn-snapshots/xfdesktop4/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-09-09 20:21:19 +0000 (Tue, 09 Sep 2008)
New Revision: 2288

Modified:
   desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
   desktop/branches/svn-snapshots/xfdesktop4/debian/rules
Log:
rename generic xfce4-terminal.desktop file so it doesnt conflicts with
Terminal.

Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/changelog	2008-09-09 20:12:34 UTC (rev 2287)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/changelog	2008-09-09 20:21:19 UTC (rev 2288)
@@ -10,6 +10,8 @@
     - don't install useless lintian override file
     - fail if dh_install misses files.
     - stop messing with config.{guess,sub}.
+    - rename generic xfce4-terminal.desktop file so it doesnt conflicts with
+      Terminal.
   * debian/lintian: dropped, now useless
   * debian/patches:
     - 01_show-backdrop-by-default dropped due to upstream changes.
@@ -22,7 +24,7 @@
     - add /usr/share/desktop-directories files.
     - add /usr/share/applications files.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Sep 2008 07:23:57 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Sep 2008 22:19:21 +0200
 
 xfdesktop4 (4.4.2-7) unstable; urgency=low
 

Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/rules	2008-09-09 20:12:34 UTC (rev 2287)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/rules	2008-09-09 20:21:19 UTC (rev 2288)
@@ -77,6 +77,9 @@
 	   	perl -0777 -i -pe 's/cmd="xfterm4"/cmd="exo-open --launch TerminalEmulator"/; s/cmd="mozilla"/cmd="sensible-browser"/; s/(<include type="system" style="simple" unique="true"\/>)/$$1\n<separator\/>\n<menu name="Debian"><include type="file" src="menudefs.hook" \/><\/menu>\n/; s/xffm/thunar/g' $$f; \
 	done
 
+  # rename the generic terminal file
+  mv $(CURDIR)/debian/tmp/usr/share/applications/xfce4-terminal.desktop \
+    $(CURDIR)/debian/tmp/usr/share/applications/xfce4-term.desktop
 	# Remove the duplicated copies of XML in the Italian menu files.
 	for f in $(CURDIR)/debian/tmp/etc/xdg/xfce4/desktop/*.xml.it; do \
 	   	perl -i -ne 'BEGIN { $$state = 0; } if (/xml version="1.0"/) { $$state++; } if ($$state < 2) { print; }' $$f; \