[Pkg-xfce-commits] r861 - in desktop/trunk: gtk2-engines-xfce/debian xfce4-panel/debian

[Simon Huggins]

Author: huggie
Date: 2006-09-06 19:46:23 +0000 (Wed, 06 Sep 2006)
New Revision: 861

Modified:
   desktop/trunk/gtk2-engines-xfce/debian/control
   desktop/trunk/gtk2-engines-xfce/debian/rules
   desktop/trunk/xfce4-panel/debian/rules
Log:
Fixup chrpath stuff.


Modified: desktop/trunk/gtk2-engines-xfce/debian/control
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/control	2006-09-06 16:10:12 UTC (rev 860)
+++ desktop/trunk/gtk2-engines-xfce/debian/control	2006-09-06 19:46:23 UTC (rev 861)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at corsac.net>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.4.1-3), libx11-dev (> 2:1.0.0-6)
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.4.1-3), libx11-dev (> 2:1.0.0-6), chrpath
 Standards-Version: 3.7.2
 
 Package: gtk2-engines-xfce

Modified: desktop/trunk/gtk2-engines-xfce/debian/rules
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/rules	2006-09-06 16:10:12 UTC (rev 860)
+++ desktop/trunk/gtk2-engines-xfce/debian/rules	2006-09-06 19:46:23 UTC (rev 861)
@@ -56,6 +56,8 @@
 	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.4.0/engines/libxfce.a
 	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.4.0/engines/libxfce.la
 
+	chrpath -d -k `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.4.0/engines/libxfce.so
+
 binary-indep: build install
 
 binary-arch: build install

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2006-09-06 16:10:12 UTC (rev 860)
+++ desktop/trunk/xfce4-panel/debian/rules	2006-09-06 19:46:23 UTC (rev 861)
@@ -61,19 +61,11 @@
 	install -D -p -o root -g root -m 644 `pwd`/debian/lintian \
 	$(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfce4-panel
 
-	mkdir $(CURDIR)/debian/tmp/usr/escape_chrpath
-	mv $(CURDIR)/debian/tmp/usr/bin/xftaskbar4 \
-		$(CURDIR)/debian/tmp/usr/escape_chrpath/
-	mv $(CURDIR)/debian/tmp/usr/bin/xfce4-iconbox \
-		$(CURDIR)/debian/tmp/usr/escape_chrpath/
+	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/* \
-		`pwd`/debian/tmp/usr/lib/xfce4/*/*
-
-	mv $(CURDIR)/debian/tmp/usr/escape_chrpath/* \
-		$(CURDIR)/debian/tmp/usr/bin/
-	rmdir $(CURDIR)/debian/tmp/usr/escape_chrpath
-
 binary-indep: build install
 binary-arch: build install