[Pkg-xfce-commits] r4001 - in desktop/trunk/libxfce4util/debian: . source

[Yves-Alexis Perez]

Author: corsac
Date: 2010-05-22 10:03:36 +0000 (Sat, 22 May 2010)
New Revision: 4001

Added:
   desktop/trunk/libxfce4util/debian/libxfce4util-dev.docs
   desktop/trunk/libxfce4util/debian/source/
   desktop/trunk/libxfce4util/debian/source/format
Modified:
   desktop/trunk/libxfce4util/debian/changelog
   desktop/trunk/libxfce4util/debian/control
   desktop/trunk/libxfce4util/debian/rules
Log:
  - add build-dep on intltool. 
  - drop quilt and chrpath build-deps.
  - bump debhelper build-deps for overrides.
* debian/rules:
  - switch to debhelper 7.
* switch to 3.0 (quilt) source format.

Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog	2010-05-22 09:11:18 UTC (rev 4000)
+++ desktop/trunk/libxfce4util/debian/changelog	2010-05-22 10:03:36 UTC (rev 4001)
@@ -1,16 +1,20 @@
 libxfce4util (4.6.2-1) UNRELEASED; urgency=low
 
+  [Yves-Alexis Perez]
   * New upstream release.
   * debian/control:
     - bump standards version to 3.8.4.
+    - add build-dep on intltool. 
+    - drop quilt and chrpath build-deps.
+    - bump debhelper build-deps for overrides.
+  * debian/rules:
+    - switch to debhelper 7.
+  * switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 11:09:44 +0200
-
-libxfce4util (4.6.1-3) unstable; urgency=low
-
+  [Stefan Ott]
   * debian/watch edited to track Xfce archive reorganisation.
 
- -- Stefan Ott <stefan at ott.net>  Thu, 11 Mar 2010 19:28:40 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 11:44:42 +0200
 
 libxfce4util (4.6.1-2) unstable; urgency=low
 

Modified: desktop/trunk/libxfce4util/debian/control
===================================================================
--- desktop/trunk/libxfce4util/debian/control	2010-05-22 09:11:18 UTC (rev 4000)
+++ desktop/trunk/libxfce4util/debian/control	2010-05-22 10:03:36 UTC (rev 4001)
@@ -3,7 +3,7 @@
 Section: xfce
 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.0.0), libglib2.0-dev, chrpath, quilt
+Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev, intltool
 Standards-Version: 3.8.4
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfce4util/

Added: desktop/trunk/libxfce4util/debian/libxfce4util-dev.docs
===================================================================
--- desktop/trunk/libxfce4util/debian/libxfce4util-dev.docs	                        (rev 0)
+++ desktop/trunk/libxfce4util/debian/libxfce4util-dev.docs	2010-05-22 10:03:36 UTC (rev 4001)
@@ -0,0 +1,2 @@
+NEWS
+TODO

Modified: desktop/trunk/libxfce4util/debian/rules
===================================================================
--- desktop/trunk/libxfce4util/debian/rules	2010-05-22 09:11:18 UTC (rev 4000)
+++ desktop/trunk/libxfce4util/debian/rules	2010-05-22 10:03:36 UTC (rev 4001)
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -12,79 +7,10 @@
 endif
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch patch-stamp
+override_dh_strip:
+	dh_strip -p libxfce4util4 --dbg-package=libxfce4util4-dbg
+	dh_strip -p libxfce4util-bin --dbg-package=libxfce4util4-dbg
+	dh_strip -s --remaining-packages
 
-unpatch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc patch-stamp
-
-config.status: configure patch-stamp
-	
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --enable-final
-
-build: build-stamp
-build-stamp: config.status
-	
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: unpatch
-	
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
-
-	rm -f `pwd`/debian/tmp/usr/lib/libxfce4util.la
-
-	chrpath -d -k `pwd`/debian/tmp/usr/lib/*.so.* \
-		`pwd`/debian/tmp/usr/sbin/*
-
-binary-indep: build install
-binary-arch: build install
-	
-	dh_testdir
-	dh_testroot
-	
-	dh_installchangelogs ChangeLog
-	dh_installdocs NEWS TODO
-#	dh_installman -p libxfce4util-bin debian/xfce4-kiosk-query.8 
-	dh_installman
-	
-	dh_install --fail-missing --sourcedir=debian/tmp
-	dh_strip --dbg-package=libxfce4util4-dbg
-
-	dh_compress
-	dh_fixperms
-
-	dh_makeshlibs
-	#dh_makeshlibs -V 'libxfce4util4 (>= 4.6.0)'
-	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 $@

Added: desktop/trunk/libxfce4util/debian/source/format
===================================================================
--- desktop/trunk/libxfce4util/debian/source/format	                        (rev 0)
+++ desktop/trunk/libxfce4util/debian/source/format	2010-05-22 10:03:36 UTC (rev 4001)
@@ -0,0 +1 @@
+3.0 (quilt)