[Pkg-xfce-commits] r1138 - in desktop/branches: 4.3.99.2/xfce4-panel/debian etch/xfce4-panel/debian

[Emanuele Rocca]

Author: ema
Date: 2007-02-01 23:16:56 +0100 (Thu, 01 Feb 2007)
New Revision: 1138

Modified:
   desktop/branches/4.3.99.2/xfce4-panel/debian/changelog
   desktop/branches/4.3.99.2/xfce4-panel/debian/control
   desktop/branches/4.3.99.2/xfce4-panel/debian/rules
   desktop/branches/etch/xfce4-panel/debian/changelog
   desktop/branches/etch/xfce4-panel/debian/control
   desktop/branches/etch/xfce4-panel/debian/rules
Log:
xfce4-panel 4.3.99.2-2 moved from branch '4.3.99.2' to 'etch'

Modified: desktop/branches/4.3.99.2/xfce4-panel/debian/changelog
===================================================================
--- desktop/branches/4.3.99.2/xfce4-panel/debian/changelog	2007-02-01 09:44:38 UTC (rev 1137)
+++ desktop/branches/4.3.99.2/xfce4-panel/debian/changelog	2007-02-01 22:16:56 UTC (rev 1138)
@@ -1,10 +1,3 @@
-xfce4-panel (4.3.99.2-2) UNRELEASED; urgency=low
-
-  * Use mousepad rather than sensible-editor as the default 
-    text editor.                                            closes: #409140
-
- -- Emanuele Rocca <ema at debian.org>  Thu,  1 Feb 2007 10:35:52 +0100
-
 xfce4-panel (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/4.3.99.2/xfce4-panel/debian/control
===================================================================
--- desktop/branches/4.3.99.2/xfce4-panel/debian/control	2007-02-01 09:44:38 UTC (rev 1137)
+++ desktop/branches/4.3.99.2/xfce4-panel/debian/control	2007-02-01 22:16:56 UTC (rev 1138)
@@ -8,7 +8,7 @@
 
 Package: xfce4-panel
 Architecture: any
-Depends: ${shlibs:Depends}, libexo-0.3-0 (>= 0.3.1.12rc2), mousepad
+Depends: ${shlibs:Depends}, libexo-0.3-0 (>= 0.3.1.12rc2)
 Replaces: xfce4 (<< 4.0.0.final-1), xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-utils (<< 4.3.90.1-1), xfce4-trigger-launcher, xfce4-mcs-plugins (= 4.3.90.2-1)
 Conflicts: xfce4 (<< 4.0.0.final-1), xfce4-themes, xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-trigger-launcher
 Description: The Xfce4 desktop environment panel

Modified: desktop/branches/4.3.99.2/xfce4-panel/debian/rules
===================================================================
--- desktop/branches/4.3.99.2/xfce4-panel/debian/rules	2007-02-01 09:44:38 UTC (rev 1137)
+++ desktop/branches/4.3.99.2/xfce4-panel/debian/rules	2007-02-01 22:16:56 UTC (rev 1138)
@@ -51,8 +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/Exec=Terminal/Exec=exo-open --launch TerminalEmulator/' \
-		`pwd`/debian/tmp/etc/xdg/xfce4/panel/launcher*
+	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

Modified: desktop/branches/etch/xfce4-panel/debian/changelog
===================================================================
--- desktop/branches/etch/xfce4-panel/debian/changelog	2007-02-01 09:44:38 UTC (rev 1137)
+++ desktop/branches/etch/xfce4-panel/debian/changelog	2007-02-01 22:16:56 UTC (rev 1138)
@@ -1,3 +1,10 @@
+xfce4-panel (4.3.99.2-2) unstable; urgency=medium
+
+  * Use mousepad rather than sensible-editor as the default 
+    text editor.                                            closes: #409140
+
+ -- Emanuele Rocca <ema at debian.org>  Thu,  1 Feb 2007 10:35:52 +0100
+
 xfce4-panel (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch/xfce4-panel/debian/control
===================================================================
--- desktop/branches/etch/xfce4-panel/debian/control	2007-02-01 09:44:38 UTC (rev 1137)
+++ desktop/branches/etch/xfce4-panel/debian/control	2007-02-01 22:16:56 UTC (rev 1138)
@@ -8,7 +8,7 @@
 
 Package: xfce4-panel
 Architecture: any
-Depends: ${shlibs:Depends}, libexo-0.3-0 (>= 0.3.1.12rc2)
+Depends: ${shlibs:Depends}, libexo-0.3-0 (>= 0.3.1.12rc2), mousepad
 Replaces: xfce4 (<< 4.0.0.final-1), xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-utils (<< 4.3.90.1-1), xfce4-trigger-launcher, xfce4-mcs-plugins (= 4.3.90.2-1)
 Conflicts: xfce4 (<< 4.0.0.final-1), xfce4-themes, xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-trigger-launcher
 Description: The Xfce4 desktop environment panel

Modified: desktop/branches/etch/xfce4-panel/debian/rules
===================================================================
--- desktop/branches/etch/xfce4-panel/debian/rules	2007-02-01 09:44:38 UTC (rev 1137)
+++ desktop/branches/etch/xfce4-panel/debian/rules	2007-02-01 22:16:56 UTC (rev 1138)
@@ -51,7 +51,8 @@
 	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/Exec=Terminal/Exec=exo-open --launch TerminalEmulator/; s/Exec=mousepad/Exec=sensible-editor/' `pwd`/debian/tmp/etc/xdg/xfce4/panel/launcher*
+	perl -i -pe 's/Exec=Terminal/Exec=exo-open --launch TerminalEmulator/' \
+		`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