[Pkg-xfce-commits] r1835 - desktop/trunk/xfce4-panel/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-04-06 00:21:42 +0000 (Sun, 06 Apr 2008)
New Revision: 1835

Modified:
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/rules
Log:
  - use $(CURDIR) instead of `pwd`.

Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2008-04-06 00:14:20 UTC (rev 1834)
+++ desktop/trunk/xfce4-panel/debian/changelog	2008-04-06 00:21:42 UTC (rev 1835)
@@ -4,8 +4,9 @@
     - don't edit mousepad launcher…
     - and remove it.
     - remove editor launcher item from panel config.            closes: #426164
+    - use $(CURDIR) instead of `pwd`.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Apr 2008 02:13:56 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Apr 2008 02:14:45 +0200
 
 xfce4-panel (4.4.2-3) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2008-04-06 00:14:20 UTC (rev 1834)
+++ desktop/trunk/xfce4-panel/debian/rules	2008-04-06 00:21:42 UTC (rev 1835)
@@ -59,32 +59,32 @@
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-	install -d `pwd`/debian/tmp/usr/share/man/man1
-	install `pwd`/debian/xfce4-panel.1 `pwd`/debian/tmp/usr/share/man/man1
+	install -d $(CURDIR)/debian/tmp/usr/share/man/man1
+	install $(CURDIR)/debian/xfce4-panel.1 $(CURDIR)/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/' $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher*
 	rm -f $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher-8.rc
 	sed -i '/<item name=\"launcher\" id=\"8\"\/>/d' panels.xml
 
-	rm -f `pwd`/debian/tmp/usr/lib/xfce4/panel-plugins/*.la
-	rm -f `pwd`/debian/tmp/usr/lib/xfce4/panel-plugins/*.a
-	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
-	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
-	rm -f `pwd`/debian/tmp/usr/lib/libxfce4panel.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel-plugins/*.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel-plugins/*.a
+	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
+	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4panel.la
 
-	install -D -p -o root -g root -m 644 `pwd`/debian/lintian \
+	install -D -p -o root -g root -m 644 $(CURDIR)/debian/lintian \
 	$(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfce4-panel
 
 	#we don't need no empty files in our packages !
 	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.*1
+	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/xfce4-panel \
+		$(CURDIR)/debian/tmp/usr/bin/xfce4-popup-windowlist \
+		$(CURDIR)/debian/tmp/usr/lib/xfce4/*/* \
+		$(CURDIR)/debian/tmp/usr/lib/libxfce4panel.so.*1
 
 binary-indep: build install
 binary-arch: build install