[Pkg-xfce-commits] r1380 - desktop/trunk/xfce4-terminal/debian

[corsac-guest at alioth.debian.org]

Author: corsac-guest
Date: 2007-10-13 12:51:41 +0000 (Sat, 13 Oct 2007)
New Revision: 1380

Modified:
   desktop/trunk/xfce4-terminal/debian/changelog
   desktop/trunk/xfce4-terminal/debian/rules
Log:
rename Terminal to xfce4-terminal a little more


Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog	2007-10-08 18:30:18 UTC (rev 1379)
+++ desktop/trunk/xfce4-terminal/debian/changelog	2007-10-13 12:51:41 UTC (rev 1380)
@@ -1,3 +1,12 @@
+xfce4-terminal (0.2.6-5) unstable; urgency=low
+
+  * debian/rules: 
+    - transform program name to xfce4-terminal at configure time 
+    - rename Terminal.desktop to xfce4-terminal to avoid conflict with
+      Terminal.app.                                            closes: #446329 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 13 Oct 2007 14:37:00 +0200
+
 xfce4-terminal (0.2.6-4) unstable; urgency=low
   
   (David Paleino)

Modified: desktop/trunk/xfce4-terminal/debian/rules
===================================================================
--- desktop/trunk/xfce4-terminal/debian/rules	2007-10-08 18:30:18 UTC (rev 1379)
+++ desktop/trunk/xfce4-terminal/debian/rules	2007-10-13 12:51:41 UTC (rev 1380)
@@ -7,21 +7,22 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-final --enable-startup-notification
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-final --enable-startup-notification --program-transform-name='s/Terminal/xfce4-terminal/'
 						
 binary-post-install/xfce4-terminal::
 	mkdir debian/xfce4-terminal/usr/share/doc/xfce4-terminal/html/
 	mv debian/xfce4-terminal/usr/share/doc/Terminal/* debian/xfce4-terminal/usr/share/doc/xfce4-terminal/html/
 	rmdir debian/xfce4-terminal/usr/share/doc/Terminal/
-	mv debian/xfce4-terminal/usr/share/man/man1/Terminal.1 debian/xfce4-terminal/usr/share/man/man1/xfce4-terminal.1
+#	mv debian/xfce4-terminal/usr/share/man/man1/Terminal.1 debian/xfce4-terminal/usr/share/man/man1/xfce4-terminal.1
 	cd debian/xfce4-terminal/usr/share/man/man1/ && ln -s xfce4-terminal.1 xfce4-terminal.wrapper.1
-	mv debian/xfce4-terminal/usr/bin/Terminal debian/xfce4-terminal/usr/bin/xfce4-terminal
+#	mv debian/xfce4-terminal/usr/bin/Terminal debian/xfce4-terminal/usr/bin/xfce4-terminal
 	rm debian/xfce4-terminal/usr/bin/terminal
 	install -c -m 0755 debian/xfce4-terminal.wrapper debian/xfce4-terminal/usr/bin/xfce4-terminal.wrapper
-	sed -i 's/for browser in mozilla/for browser in sensible-browser mozilla/' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
-	sed -i 's#doc/Terminal/#doc/xfce4-terminal/html#' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
+#	sed -i 's/for browser in mozilla/for browser in sensible-browser mozilla/' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
+#	sed -i 's#doc/Terminal/#doc/xfce4-terminal/html#' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
 	# .desktop file call to the right binary
-	sed -i 's#Exec=Terminal#Exec=xfce4-terminal#' debian/xfce4-terminal/usr/share/applications/Terminal.desktop
+	mv debian/xfce4-terminal/usr/share/applications/Terminal.desktop debian/xfce4-terminal/usr/share/applications/xfce4-terminal.desktop
+	sed -i 's#Exec=Terminal#Exec=xfce4-terminal#' debian/xfce4-terminal/usr/share/applications/xfce4-terminal.desktop
 	install -m 0644 debian/terminal.xpm debian/xfce4-terminal/usr/share/pixmaps/
 	chrpath -d -k debian/xfce4-terminal/usr/bin/xfce4-terminal