[Pkg-xfce-commits] r617 - desktop/trunk/xfce4-panel/debian

[Simon Huggins]

Author: huggie
Date: 2006-05-03 21:27:51 +0000 (Wed, 03 May 2006)
New Revision: 617

Modified:
   desktop/trunk/xfce4-panel/debian/control
   desktop/trunk/xfce4-panel/debian/rules
Log:
Use a sane editor and terminal.
Replace older -utils (we ship some of the same files)


Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control	2006-05-03 19:12:42 UTC (rev 616)
+++ desktop/trunk/xfce4-panel/debian/control	2006-05-03 21:27:51 UTC (rev 617)
@@ -9,7 +9,7 @@
 Package: xfce4-panel
 Architecture: any
 Depends: ${shlibs:Depends}, procps
-Replaces: xfce4 (<< 4.0.0.final-1), xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin
+Replaces: xfce4 (<< 4.0.0.final-1), xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-utils (<< 4.3.90.1-1)
 Conflicts: xfce4 (<< 4.0.0.final-1), xfce4-themes, xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin
 Description: The Xfce4 desktop environment panel
  This is the panel provided by the Xfce4 desktop project.

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2006-05-03 19:12:42 UTC (rev 616)
+++ desktop/trunk/xfce4-panel/debian/rules	2006-05-03 21:27:51 UTC (rev 617)
@@ -51,7 +51,7 @@
 	install -d `pwd`/debian/tmp/usr/share/man/man1
 	install `pwd`/debian/xfce4-panel.1 `pwd`/debian/tmp/usr/share/man/man1
 
-	# perl -i -pe 's/<Command term="0" sn="0">mozilla<\/Command>/<Command term="0" sn="0">sensible-browser<\/Command>/; s/(<Tooltip>.*) ?Mozilla ?(.*)/$$1$$2/i' `pwd`/debian/tmp/etc/xfce4/xfce4rc*
+	perl -i -pe 's/Exec=Terminal/Exec=exo-open --launch TerminalEmulator/; s/Exec=mousepad/Exec=sensible-editor/' `pwd`/debian/tmp/etc/xdg/xfce4/panel/launcher*
 
 	rm -f `pwd`/debian/tmp/usr/lib/xfce4/panel-plugins/*.la
 	rm -f `pwd`/debian/tmp/usr/lib/xfce4/panel-plugins/*.a