[Pkg-xfce-commits] r4049 - desktop/trunk/xfconf/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-05-22 18:36:24 +0000 (Sat, 22 May 2010)
New Revision: 4049

Added:
   desktop/trunk/xfconf/debian/libxfconf-0-dev.docs
   desktop/trunk/xfconf/debian/xfconf.manpages
Modified:
   desktop/trunk/xfconf/debian/changelog
   desktop/trunk/xfconf/debian/control
   desktop/trunk/xfconf/debian/rules
   desktop/trunk/xfconf/debian/xfconf.install
Log:
* debian/xfconf.install: refreshed.
* debian/xfconf.manpages, debian/libxfconf-0-dev.docs: added.
* debian/control:
  - add myself to Uploaders
  - bump debhelper b-dep to (>= 7.0.50~) for overrides.
* debian/rules:
  - switch to rules.tiny with overrides
  - disable tests, they need dbus.

Modified: desktop/trunk/xfconf/debian/changelog
===================================================================
--- desktop/trunk/xfconf/debian/changelog	2010-05-22 18:18:38 UTC (rev 4048)
+++ desktop/trunk/xfconf/debian/changelog	2010-05-22 18:36:24 UTC (rev 4049)
@@ -10,6 +10,16 @@
     - update standards version to 3.8.4.
   * Switch to 3.0 (quilt) source format.
 
+  [ Lionel Le Folgoc ]
+  * debian/xfconf.install: refreshed.
+  * debian/xfconf.manpages, debian/libxfconf-0-dev.docs: added.
+  * debian/control:
+    - add myself to Uploaders
+    - bump debhelper b-dep to (>= 7.0.50~) for overrides.
+  * debian/rules:
+    - switch to rules.tiny with overrides
+    - disable tests, they need dbus.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 13:18:23 +0200
 
 xfconf (4.6.1-2) unstable; urgency=low

Modified: desktop/trunk/xfconf/debian/control
===================================================================
--- desktop/trunk/xfconf/debian/control	2010-05-22 18:18:38 UTC (rev 4048)
+++ desktop/trunk/xfconf/debian/control	2010-05-22 18:36:24 UTC (rev 4049)
@@ -2,8 +2,10 @@
 Section: xfce
 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>, Michael Casadevall <sonicmctails at gmail.com>
-Build-Depends: debhelper (>= 7.0.13), libxfce4util-dev (>= 4.6.0), 
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.6.0), 
  libdbus-1-dev, libdbus-glib-1-dev, libextutils-pkgconfig-perl,
  libextutils-depends-perl, libglib-perl, intltool
 Standards-Version: 3.8.4

Added: desktop/trunk/xfconf/debian/libxfconf-0-dev.docs
===================================================================
--- desktop/trunk/xfconf/debian/libxfconf-0-dev.docs	                        (rev 0)
+++ desktop/trunk/xfconf/debian/libxfconf-0-dev.docs	2010-05-22 18:36:24 UTC (rev 4049)
@@ -0,0 +1,2 @@
+TODO
+NEWS

Modified: desktop/trunk/xfconf/debian/rules
===================================================================
--- desktop/trunk/xfconf/debian/rules	2010-05-22 18:18:38 UTC (rev 4048)
+++ desktop/trunk/xfconf/debian/rules	2010-05-22 18:36:24 UTC (rev 4049)
@@ -1,77 +1,27 @@
 #!/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)
-
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
 	CFLAGS += -O2
 endif
 
-config.status: configure
-	
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --enable-final --disable-perl-bindings --libexecdir=\$${prefix}/lib
+%:
+	dh $@
 
-build: build-stamp
-build-stamp: config.status
-	
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-final --disable-perl-bindings
 
-clean:
-	
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
+override_dh_auto_test:
 
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_clean
-	dh_installdirs
-	
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
+override_dh_install:
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfconf-0.la
-
-binary-indep: build install
-binary-arch: build install
-	
-	dh_testdir
-	dh_testroot
-	
-	dh_installchangelogs ChangeLog
-	dh_installdocs NEWS TODO
-
-	dh_installman -pxfconf debian/xfconf-query.1
-	
 	dh_install --fail-missing --sourcedir=debian/tmp
+
+override_dh_strip:
 	dh_strip --dbg-package=libxfconf-0-2-dbg
 
-	dh_compress
-	dh_fixperms
-
-	dh_makeshlibs -V 'libxfconf-0-2 (>= 4.6.0)'
-	dh_installdeb
-
+override_dh_shlibdeps:
 	dh_shlibdeps -X debian/xfconf/usr/bin/xfconf-query -- \
     -dRecommends debian/xfconf/usr/bin/xfconf-query -dDepends
-	dh_gencontrol
-	
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

Modified: desktop/trunk/xfconf/debian/xfconf.install
===================================================================
--- desktop/trunk/xfconf/debian/xfconf.install	2010-05-22 18:18:38 UTC (rev 4048)
+++ desktop/trunk/xfconf/debian/xfconf.install	2010-05-22 18:36:24 UTC (rev 4049)
@@ -1,4 +1,4 @@
 usr/share/dbus-1
 usr/share/locale
 usr/bin
-usr/lib/xfconfd
+usr/lib/xfconf/xfconfd

Added: desktop/trunk/xfconf/debian/xfconf.manpages
===================================================================
--- desktop/trunk/xfconf/debian/xfconf.manpages	                        (rev 0)
+++ desktop/trunk/xfconf/debian/xfconf.manpages	2010-05-22 18:36:24 UTC (rev 4049)
@@ -0,0 +1 @@
+debian/xfconf-query.1