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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-05-22 18:07:22 +0000 (Sat, 22 May 2010)
New Revision: 4047

Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/control
   desktop/trunk/xfdesktop4/debian/docs
   desktop/trunk/xfdesktop4/debian/rules
Log:
  - use << instead of <
  - build-depends on debhelper >= 7.0.50~ for overrides
* debian/rules: switch to rules.tiny + overrides.

Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2010-05-22 17:45:47 UTC (rev 4046)
+++ desktop/trunk/xfdesktop4/debian/changelog	2010-05-22 18:07:22 UTC (rev 4047)
@@ -13,7 +13,9 @@
     - add myself to Uploaders
     - bump Standards-Version to 3.8.4
     - add ${misc:Depends} to dependencies
-    - use << instead of <.
+    - use << instead of <
+    - build-depends on debhelper >= 7.0.50~ for overrides
+  * debian/rules: switch to rules.tiny + overrides.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 21 Apr 2009 08:17:49 +0200
 

Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control	2010-05-22 17:45:47 UTC (rev 4046)
+++ desktop/trunk/xfdesktop4/debian/control	2010-05-22 18:07:22 UTC (rev 4047)
@@ -4,7 +4,7 @@
 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>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.10.1), libxft-dev,
+Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.1), libxft-dev,
  libxml2-dev, xfce4-panel-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), 
  libthunar-vfs-1-dev (>= 1.0.0), chrpath, libwnck-dev, libxfconf-0-dev, 
  libglade2-dev, libxfce4menu-0.1-dev, intltool, libdbus-glib-1-dev

Modified: desktop/trunk/xfdesktop4/debian/docs
===================================================================
--- desktop/trunk/xfdesktop4/debian/docs	2010-05-22 17:45:47 UTC (rev 4046)
+++ desktop/trunk/xfdesktop4/debian/docs	2010-05-22 18:07:22 UTC (rev 4047)
@@ -1 +1,4 @@
+README
+TODO
+NEWS
 doc/README.kiosk

Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules	2010-05-22 17:45:47 UTC (rev 4046)
+++ desktop/trunk/xfdesktop4/debian/rules	2010-05-22 18:07:22 UTC (rev 4047)
@@ -1,95 +1,40 @@
 #!/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 --mandir=/usr/share/man --disable-rpath --libexecdir=\$${prefix}/lib --enable-final --enable-thunarx --enable-exo --enable-desktop-menu-dir-monitor
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-rpath --libexecdir=\$${prefix}/lib \
+		--enable-final --enable-thunarx --enable-exo --enable-desktop-menu-dir-monitor
 
-build: build-stamp
-build-stamp: config.status
-
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs 
-	dh_lintian
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
+override_dh_install:
 	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.la
 	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.a
-
-
-
+	
 	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/* \
 		$(CURDIR)/debian/tmp/usr/lib/xfce4/*/*
-
-binary-indep: build install
-
-binary-arch: build install
 	
-	dh_testdir
-	dh_testroot
-
-  # rename the generic terminal file
+	# rename the generic terminal file
 	mv $(CURDIR)/debian/tmp/usr/share/applications/xfce4-terminal.desktop \
 		$(CURDIR)/debian/tmp/usr/share/applications/xfce4-term.desktop
 	sed -i 's/xfce4-terminal/xfce4-term/' \
 		$(CURDIR)/debian/tmp/etc/xdg/menus/xfce-applications.menu
-  
-	dh_installdocs README TODO NEWS
-	dh_installmenu
-	dh_installman -a
 	
-	dh_installchangelogs ChangeLog
-
 	dh_install --sourcedir=debian/tmp --fail-missing
 	# why oh why is this necessary?
-	rm -rf $(CURDIR)/debian/xfdesktop4-data/usr/share/man
+#	rm -rf $(CURDIR)/debian/xfdesktop4-data/usr/share/man
 
+override_dh_link:
 	rm -rf $(CURDIR)/debian/xfdesktop4/usr/share/doc/xfdesktop4
 	ln -s xfdesktop4-data $(CURDIR)/debian/xfdesktop4/usr/share/doc/xfdesktop4
 	dh_link
-	
+
+override_dh_strip:
 	dh_strip --dbg-package=xfdesktop4-dbg
-	dh_compress
-	
-	dh_fixperms
-	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 $@