[Pkg-xfce-commits] r951 - in desktop/trunk: thunar/debian xfce4-panel/debian xfprint4/debian

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-11-14 13:39:52 +0100 (Tue, 14 Nov 2006)
New Revision: 951

Modified:
   desktop/trunk/thunar/debian/rules
   desktop/trunk/xfce4-panel/debian/rules
   desktop/trunk/xfprint4/debian/rules
Log:
fix rpath issues (filename changes) in thunar and xfce4-panel
fix permissions on icon files in xfprint4


Modified: desktop/trunk/thunar/debian/rules
===================================================================
--- desktop/trunk/thunar/debian/rules	2006-11-14 00:13:36 UTC (rev 950)
+++ desktop/trunk/thunar/debian/rules	2006-11-14 12:39:52 UTC (rev 951)
@@ -17,11 +17,11 @@
 	&& mv Thunar thunar
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*.la 
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la 
-	#chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
-	#	$(CURDIR)/debian/tmp/usr/lib/thunar/thunar-* \
-	#	$(CURDIR)/debian/tmp/usr/lib/libthunar*.so.*0 \
-	#	$(CURDIR)/debian/tmp/usr/lib/thunarx-1/thunar-apr.so \
-	#	$(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
+	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
+		$(CURDIR)/debian/tmp/usr/lib/thunar/thunar-* \
+		$(CURDIR)/debian/tmp/usr/lib/libthunar*.so.*2 \
+		$(CURDIR)/debian/tmp/usr/lib/thunarx-1/thunar-apr.so \
+		$(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
 
 binary-post-install/thunar::
 	dh_installman -pthunar debian/thunar.1 debian/Thunar.1

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2006-11-14 00:13:36 UTC (rev 950)
+++ desktop/trunk/xfce4-panel/debian/rules	2006-11-14 12:39:52 UTC (rev 951)
@@ -65,10 +65,10 @@
 	rm -f $(CURDIR)/debian/tmp/usr/bin/xftaskbar4
 	rm -f $(CURDIR)/debian/tmp/usr/bin/xfce4-iconbox
 
-	#chrpath -d -k `pwd`/debian/tmp/usr/bin/xfce4-panel \
-		#`pwd`/debian/tmp/usr/bin/xfce4-popup-windowlist \
-		#`pwd`/debian/tmp/usr/lib/xfce4/*/* \
-		#`pwd`/debian/tmp/usr/lib/libxfce4panel.so.*0
+	chrpath -d -k `pwd`/debian/tmp/usr/bin/xfce4-panel \
+		`pwd`/debian/tmp/usr/bin/xfce4-popup-windowlist \
+		`pwd`/debian/tmp/usr/lib/xfce4/*/* \
+		`pwd`/debian/tmp/usr/lib/libxfce4panel.so.*1
 
 binary-indep: build install
 binary-arch: build install

Modified: desktop/trunk/xfprint4/debian/rules
===================================================================
--- desktop/trunk/xfprint4/debian/rules	2006-11-14 00:13:36 UTC (rev 950)
+++ desktop/trunk/xfprint4/debian/rules	2006-11-14 12:39:52 UTC (rev 951)
@@ -66,11 +66,11 @@
 
 	#Remove after 4.3.99.2
 	uudecode -o `pwd`/debian/printer.png `pwd`/debian/printer-24x24.png.uu
-	install -D `pwd`/debian/printer.png `pwd`/debian/xfprint4/usr/share/icons/hicolor/24x24/devices/printer.png
+	install -D -m 664 `pwd`/debian/printer.png `pwd`/debian/xfprint4/usr/share/icons/hicolor/24x24/devices/printer.png
 	uudecode -o `pwd`/debian/printer.png `pwd`/debian/printer-48x48.png.uu
-	install -D `pwd`/debian/printer.png `pwd`/debian/xfprint4/usr/share/icons/hicolor/48x48/devices/printer.png
+	install -D -m 664 `pwd`/debian/printer.png `pwd`/debian/xfprint4/usr/share/icons/hicolor/48x48/devices/printer.png
 
-	install -D `pwd`/debian/printer.svg `pwd`/debian/xfprint4/usr/share/icons/hicolor/scalable/devices/printer.svg
+	install -D -m 664 `pwd`/debian/printer.svg `pwd`/debian/xfprint4/usr/share/icons/hicolor/scalable/devices/printer.svg
 
 	sed -i -e 's/Icon=xfprint/Icon=printer/' \
 		$(CURDIR)/debian/xfprint4/usr/share/applications/*.desktop