[Pkg-xfce-commits] r4030 - in desktop/trunk/xfce4-utils/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Sat May 22 03:32:49 UTC 2010 

Author: corsac
Date: 2010-05-22 15:32:43 +0000 (Sat, 22 May 2010)
New Revision: 4030

Added:
   desktop/trunk/xfce4-utils/debian/docs
   desktop/trunk/xfce4-utils/debian/manpages
   desktop/trunk/xfce4-utils/debian/patches/04_debianize-scripts.patch
Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/control
   desktop/trunk/xfce4-utils/debian/rules
Log:
  - update debhelper build dep for overrides.
* debian/rules:
  - switch to tiny debhelper 7 rules.
* debian/manpages: install manpages for scripts from dh_installman.
* debian/docs: install docs from dh_installdocs.
* debian/patches:
  - 04_debianize-scripts added, add iceweasel to browser list, use Thunar
    instead of xftree as filemanager.

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2010-05-22 15:19:10 UTC (rev 4029)
+++ desktop/trunk/xfce4-utils/debian/changelog	2010-05-22 15:32:43 UTC (rev 4030)
@@ -8,9 +8,17 @@
   * debian/control:
     - update standards version to 3.8.4.
     - add ${misc:Depends} to Depends. 
+    - update debhelper build dep for overrides.
   * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - switch to tiny debhelper 7 rules.
+  * debian/manpages: install manpages for scripts from dh_installman.
+  * debian/docs: install docs from dh_installdocs.
+  * debian/patches:
+    - 04_debianize-scripts added, add iceweasel to browser list, use Thunar
+      instead of xftree as filemanager.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 16:14:35 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 17:31:09 +0200
 
 xfce4-utils (4.6.1-2) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control	2010-05-22 15:19:10 UTC (rev 4029)
+++ desktop/trunk/xfce4-utils/debian/control	2010-05-22 15:32:43 UTC (rev 4030)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 7), libxfce4util-dev (>= 4.6.0),
+Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.6.0),
  libxfcegui4-dev (>= 4.6.0), chrpath, intltool, 
   libgtk2.0-dev (>= 2.10.0)
 Standards-Version: 3.8.4

Added: desktop/trunk/xfce4-utils/debian/docs
===================================================================
--- desktop/trunk/xfce4-utils/debian/docs	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/docs	2010-05-22 15:32:43 UTC (rev 4030)
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README

Added: desktop/trunk/xfce4-utils/debian/manpages
===================================================================
--- desktop/trunk/xfce4-utils/debian/manpages	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/manpages	2010-05-22 15:32:43 UTC (rev 4030)
@@ -0,0 +1,4 @@
+debian/xfterm4.1
+debian/xfce4-utils.1
+debian/startxfce4.1
+debian/xfbrowser4.1

Added: desktop/trunk/xfce4-utils/debian/patches/04_debianize-scripts.patch
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/04_debianize-scripts.patch	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/patches/04_debianize-scripts.patch	2010-05-22 15:32:43 UTC (rev 4030)
@@ -0,0 +1,26 @@
+diff --git a/scripts/xfbrowser4.in b/scripts/xfbrowser4.in
+index a55f44a..77f81fb 100644
+--- a/scripts/xfbrowser4.in
++++ b/scripts/xfbrowser4.in
+@@ -2,7 +2,7 @@
+ 
+ if [ "x$BROWSER" = "x" ]
+ then
+-  for b in exo-open @BROWSER_DEFAULT@ firefox epiphany galeon mozilla konqueror dillo
++  for b in exo-open @BROWSER_DEFAULT@ iceweasel firefox epiphany galeon mozilla konqueror dillo
+   do
+     if which "$b" > /dev/null 2>&1
+     then
+diff --git a/scripts/xfmountdev4 b/scripts/xfmountdev4
+index 937db34..6ef97ef 100644
+--- a/scripts/xfmountdev4
++++ b/scripts/xfmountdev4
+@@ -38,7 +38,7 @@ fi
+ # seems clearer to me -- Jasper
+ if [ "x$FILEMAN" = "x" ]
+ then
+-  FILEMAN=xftree4
++  FILEMAN=thunar
+ fi
+ 
+ if [ "x$1" = "x" ]; then

Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules	2010-05-22 15:19:10 UTC (rev 4029)
+++ desktop/trunk/xfce4-utils/debian/rules	2010-05-22 15:32:43 UTC (rev 4030)
@@ -12,89 +12,21 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+override_dh_auto_configure:
+	dh_auto_configure -- --with-vendor-info=Debian --with-x \
+		--with-browser=midori --libexecdir=\$${prefix}/lib
 	
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr  --libexecdir=\$${prefix}/lib --sysconfdir=/etc  --with-browser=sensible-browser --enable-final --with-vendor-info=Debian --with-x 
 
-build: build-stamp
-build-stamp: config.status
-
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-
-	dh_testdir
-	dh_testroot
-	
-	-rm -f configure-stamp build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=`pwd`/debian/xfce4-utils
-
-	install -d `pwd`/debian/xfce4-utils/usr/share/man/man1/
-	install `pwd`/debian/xfterm4.1 `pwd`/debian/xfce4-utils/usr/share/man/man1/xfterm4.1
-	install `pwd`/debian/xfce4-utils.1 `pwd`/debian/xfce4-utils/usr/share/man/man1/xfce4-utils.1
-	install `pwd`/debian/startxfce4.1 `pwd`/debian/xfce4-utils/usr/share/man/man1/startxfce4.1
-	install `pwd`/debian/xfbrowser4.1 `pwd`/debian/xfce4-utils/usr/share/man/man1/xfbrowser4.1
-
-	perl -i -pe 's/FILEMAN=xftree4/FILEMAN=thunar/' `pwd`/debian/xfce4-utils/usr/bin/xfmountdev4
-
-	perl -i -pe 's/firefox/iceweasel/g' `pwd`/debian/xfce4-utils/usr/bin/xfbrowser4
-
-	# temp fix before upstream fix it for #427918
-	perl -i -pe 's/XDG_DATA_DIRS="usr/XDG_DATA_DIRS="\/usr/' `pwd`/debian/xfce4-utils/usr/bin/startxfce4
-	
+override_dh_install:
 	rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.la
 	rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.a
 
-	dh_lintian
-
 	install -m 644 `pwd`/debian/Debian \
 		`pwd`/debian/xfce4-utils/usr/share/xfce4/
 
 	chrpath -d -k `pwd`/debian/xfce4-utils/usr/bin/xfrun4 \
 		`pwd`/debian/xfce4-utils/usr/bin/xfce4-about
-
-binary-indep: build install
-
-binary-arch: build install
-
-	dh_testdir
-	dh_testroot
-	
-	dh_installdocs README AUTHORS NEWS
-	dh_installmenu
-
-	dh_link
-	
-	dh_installchangelogs ChangeLog
-	dh_strip
-
-	dh_compress
-
-	# file permissions
-	dh_fixperms
 	chmod +x `pwd`/debian/xfce4-utils/etc/xdg/xfce4/xinitrc
 
-	dh_installdeb
-	dh_shlibdeps
-	
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh $@

More information about the Pkg-xfce-commits mailing list