[Pkg-xfce-commits] r1661 - desktop/trunk/xfdesktop4/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-02-27 07:45:55 +0000 (Wed, 27 Feb 2008)
New Revision: 1661

Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/rules
Log:
* debian/rules:
  - install lintian override file.
  - use $(CURDIR) instead of `pwd`.

Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2008-02-27 07:41:55 UTC (rev 1660)
+++ desktop/trunk/xfdesktop4/debian/changelog	2008-02-27 07:45:55 UTC (rev 1661)
@@ -9,9 +9,11 @@
   * debian/copyright: use © sign.
   * debian/xfdesktop4.lintian: add override for calling xfce-setting-show.
   * debian/xfdesktop4.install: install lintian override file in xfdesktop4.
-  * debian/rules: install lintian override file.
+  * debian/rules:
+    - install lintian override file.
+    - use $(CURDIR) instead of `pwd`.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 27 Feb 2008 08:41:23 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 27 Feb 2008 08:42:21 +0100
 
 xfdesktop4 (4.4.2-3) unstable; urgency=low
 

Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules	2008-02-27 07:41:55 UTC (rev 1660)
+++ desktop/trunk/xfdesktop4/debian/rules	2008-02-27 07:45:55 UTC (rev 1661)
@@ -58,20 +58,20 @@
 	dh_clean -k
 	dh_installdirs 
 
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-	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/xfce4/modules/*.la
-	rm -f `pwd`/debian/tmp/usr/lib/xfce4/modules/*.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/xfce4/modules/*.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.a
 
 	# lintian override file
 	install -D -p -o root -g root -m 644 $(CURDIR)/debian/xfdesktop4.lintian \
 	$(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfdesktop4
 
 
-	chrpath -d -k `pwd`/debian/tmp/usr/bin/* \
-		`pwd`/debian/tmp/usr/lib/xfce4/*/*
+	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/* \
+		$(CURDIR)/debian/tmp/usr/lib/xfce4/*/*
 
 binary-indep: build install
 
@@ -81,12 +81,12 @@
 	dh_testroot
 
 	# use correct Debian defaults
-	for f in `pwd`/debian/tmp/etc/xdg/xfce4/desktop/menu.xml*; do \
+	for f in $(CURDIR)/debian/tmp/etc/xdg/xfce4/desktop/menu.xml*; do \
 	   	perl -0777 -i -pe 's/cmd="xfterm4"/cmd="exo-open --launch TerminalEmulator"/; s/cmd="mozilla"/cmd="sensible-browser"/; s/(<include type="system" style="simple" unique="true"\/>)/$$1\n<separator\/>\n<menu name="Debian"><include type="file" src="menudefs.hook" \/><\/menu>\n/; s/xffm/thunar/g' $$f; \
 	done
 
 	# Remove the duplicated copies of XML in the Italian menu files.
-	for f in `pwd`/debian/tmp/etc/xdg/xfce4/desktop/*.xml.it; do \
+	for f in $(CURDIR)/debian/tmp/etc/xdg/xfce4/desktop/*.xml.it; do \
 	   	perl -i -ne 'BEGIN { $$state = 0; } if (/xml version="1.0"/) { $$state++; } if ($$state < 2) { print; }' $$f; \
 	done
 
@@ -98,10 +98,10 @@
 
 	dh_install
 	# why oh why is this necessary?
-	rm -rf `pwd`/debian/xfdesktop4-data/usr/share/man
+	rm -rf $(CURDIR)/debian/xfdesktop4-data/usr/share/man
 
-	rm -rf `pwd`/debian/xfdesktop4/usr/share/doc/xfdesktop4
-	ln -s xfdesktop4-data `pwd`/debian/xfdesktop4/usr/share/doc/xfdesktop4
+	rm -rf $(CURDIR)/debian/xfdesktop4/usr/share/doc/xfdesktop4
+	ln -s xfdesktop4-data $(CURDIR)/debian/xfdesktop4/usr/share/doc/xfdesktop4
 	dh_link
 	
 	dh_strip