[Pkg-xfce-commits] r4038 - desktop/trunk/xfce4-session/debian

Sat May 22 04:47:29 UTC 2010

Author: corsac
Date: 2010-05-22 16:47:26 +0000 (Sat, 22 May 2010)
New Revision: 4038

Added:
   desktop/trunk/xfce4-session/debian/docs
   desktop/trunk/xfce4-session/debian/manpages
Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/control
   desktop/trunk/xfce4-session/debian/rules
Log:
  - update debhelper build-dep for overrides.
  - switch to debhelper 7 tiny rules. 
  - make intltool ignore c files in .pc quilt dir.

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================

--- desktop/trunk/xfce4-session/debian/changelog	2010-05-22 16:36:51 UTC (rev 4037)
+++ desktop/trunk/xfce4-session/debian/changelog	2010-05-22 16:47:26 UTC (rev 4038)
@@ -11,11 +11,14 @@
     - update standards version to 3.8.4.
     - drop build-dep on quilt.
     - add dep on ${misc:Depends}.
+    - update debhelper build-dep for overrides.
   * Switch to 3.0 (quilt) source format.
   * debian/rules:
     - drop quilt rules.
+    - switch to debhelper 7 tiny rules. 
+    - make intltool ignore c files in .pc quilt dir.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 17:42:32 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 18:45:55 +0200
 
 xfce4-session (4.6.1-1) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control	2010-05-22 16:36:51 UTC (rev 4037)
+++ desktop/trunk/xfce4-session/debian/control	2010-05-22 16:47:26 UTC (rev 4038)
@@ -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), libx11-dev, libxml-parser-perl, chrpath,
+Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxml-parser-perl, chrpath,
  fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, 
  libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0), libwnck-dev, 
  x11-xserver-utils, libxfconf-0-dev (>= 4.6.0), libglade2-dev, 

Added: desktop/trunk/xfce4-session/debian/docs
===================================================================
--- desktop/trunk/xfce4-session/debian/docs	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/docs	2010-05-22 16:47:26 UTC (rev 4038)
@@ -0,0 +1,6 @@
+BUGS
+NEWS
+README
+TODO
+doc/README.Kiosk
+doc/FAQ

Added: desktop/trunk/xfce4-session/debian/manpages
===================================================================
--- desktop/trunk/xfce4-session/debian/manpages	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/manpages	2010-05-22 16:47:26 UTC (rev 4038)
@@ -0,0 +1,3 @@
+debian/xfce4-autostart-editor.1
+debian/xfce4-tips.1
+debian/xfce4-session-settings.1

Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules	2010-05-22 16:36:51 UTC (rev 4037)
+++ desktop/trunk/xfce4-session/debian/rules	2010-05-22 16:47:26 UTC (rev 4038)
@@ -1,20 +1,5 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-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
@@ -25,73 +10,25 @@
 	INSTALL_PROGRAM += -s
 endif
 
-config.status: configure
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/sbin --enable-final --with-shutdown-style=hal
+override_dh_auto_configure:
+	dh_auto_configure -- --libexecdir=/usr/sbin
+	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
 
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
 
-build: build-stamp
+override_dh_install:
+	rm -f debian/xfce4-session/usr/lib/xfce4/splash/engines/*.la
+	rm -f debian/xfce4-session/usr/lib/*.la
 
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	dh_lintian
-
-	# Add here commands to install the package into debian/xfce4-session.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-session
-	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/splash/engines/*.la
-	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/*.la
-
-	chrpath -d -k `pwd`/debian/xfce4-session/usr/bin/* \
-		`pwd`/debian/xfce4-session/usr/sbin/xfsm-shutdown-helper \
-		`pwd`/debian/xfce4-session/usr/lib/xfce4/splash/engines/*so
+	chrpath -d -k debian/xfce4-session/usr/bin/* \
+		debian/xfce4-session/usr/sbin/xfsm-shutdown-helper \
+		debian/xfce4-session/usr/lib/xfce4/splash/engines/*so
 	
-	cat debian/debian-tips >> `pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips
-	strfile `pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips \
-		`pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips.dat
+	cat debian/debian-tips >> debian/xfce4-session/usr/share/xfce4/tips/tips
+	strfile debian/xfce4-session/usr/share/xfce4/tips/tips \
+		debian/xfce4-session/usr/share/xfce4/tips/tips.dat
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs BUGS NEWS README TODO doc/README.Kiosk doc/FAQ
-	dh_installman debian/xfce4-autostart-editor.1 debian/xfce4-tips.1 \
-    debian/xfce4-session-settings.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps -l`pwd`/debian/xfce4-session/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@


