[Pkg-xfce-commits] r3837 - in desktop/trunk/xfce4-terminal/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-02-07 20:14:31 +0000 (Sun, 07 Feb 2010)
New Revision: 3837

Removed:
   desktop/trunk/xfce4-terminal/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch
Modified:
   desktop/trunk/xfce4-terminal/debian/changelog
   desktop/trunk/xfce4-terminal/debian/rules
Log:
* New upstream snapshot.
  - 00_binary-name-fix-xfce4-terminal.1 dropped.
  - adjust configure options to use xfce4-terminal name.
  - drop all unneeded adjustements to names at install time.

Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog	2010-02-07 18:21:39 UTC (rev 3836)
+++ desktop/trunk/xfce4-terminal/debian/changelog	2010-02-07 20:14:31 UTC (rev 3837)
@@ -1,15 +1,16 @@
-xfce4-terminal (0.4.4-1) UNRELEASED; urgency=low
+xfce4-terminal (0.4.4~git-c4f18f1-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream snapshot.
   * debian/control:
     - update standards version to 3.8.4.
     - update homepage. 
   * debian/patches/
-    - 00_binary-name-fix-xfce4-terminal.1 refreshed.
+    - 00_binary-name-fix-xfce4-terminal.1 dropped.
   * debian/rules:
-    - rename manpages to xfce4-terminal.1.
+    - adjust configure options to use xfce4-terminal name.
+    - drop all unneeded adjustements to names at install time.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 01 Feb 2010 19:46:12 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Feb 2010 21:13:40 +0100
 
 xfce4-terminal (0.4.3-1) unstable; urgency=low
 

Deleted: desktop/trunk/xfce4-terminal/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch	2010-02-07 18:21:39 UTC (rev 3836)
+++ desktop/trunk/xfce4-terminal/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch	2010-02-07 20:14:31 UTC (rev 3837)
@@ -1,13 +0,0 @@
-diff --git a/doc/Terminal.1.xml b/doc/Terminal.1.xml
-index f4df5a7..4978f9f 100644
---- a/doc/Terminal.1.xml
-+++ b/doc/Terminal.1.xml
-@@ -47,7 +47,7 @@
-   <refsynopsisdiv id="synopsis">
-     <title>Synopsis</title>
-     <cmdsynopsis>
--      <command>Terminal</command>
-+      <command>xfce4-terminal</command>
-       <arg choice="opt" rep="repeat">OPTION</arg>
-     </cmdsynopsis>
-   </refsynopsisdiv>

Modified: desktop/trunk/xfce4-terminal/debian/rules
===================================================================
--- desktop/trunk/xfce4-terminal/debian/rules	2010-02-07 18:21:39 UTC (rev 3836)
+++ desktop/trunk/xfce4-terminal/debian/rules	2010-02-07 20:14:31 UTC (rev 3837)
@@ -3,26 +3,19 @@
 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 --program-transform-name='s/Terminal/xfce4-terminal/'
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-final --enable-startup-notification --program-transform-name='s/Terminal/xfce4-terminal/' --docdir=\$${prefix}/share/doc/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/
-	rm debian/xfce4-terminal/usr/bin/terminal
 	install -c -m 0755 debian/xfce4-terminal.wrapper debian/xfce4-terminal/usr/bin/xfce4-terminal.wrapper
 
-	#rename manpage
-	find debian/xfce4-terminal/usr/share/man -name 'Terminal*' -exec \
-		rename 's/Terminal/xfce4-terminal/' '{}' \;
+	#.desktop file
+	mv debian/xfce4-terminal/usr/share/applications/Terminal.desktop debian/xfce4-terminal/usr/share/applications/xfce4-terminal.desktop
+
 	cd debian/xfce4-terminal/usr/share/man/man1/ && ln -s xfce4-terminal.1 xfce4-terminal.wrapper.1
 
-	# .desktop file call to the right binary
-	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 pixmap for debian menu
 	install -m 0644 debian/terminal.xpm debian/xfce4-terminal/usr/share/pixmaps/
-	mv debian/xfce4-terminal/usr/lib/xfce4-terminal/xfce4-terminalHelp \
-		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
-	chrpath -d -k debian/xfce4-terminal/usr/bin/xfce4-terminal
 
+	#and finally the chrpath
+	#chrpath -d -k debian/xfce4-terminal/usr/bin/xfce4-terminal
+