[Pkg-xfce-commits] r2965 - desktop/trunk/xfce4-appfinder/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2009-03-16 07:02:07 +0000 (Mon, 16 Mar 2009)
New Revision: 2965

Modified:
   desktop/trunk/xfce4-appfinder/debian/changelog
   desktop/trunk/xfce4-appfinder/debian/compat
   desktop/trunk/xfce4-appfinder/debian/control
   desktop/trunk/xfce4-appfinder/debian/rules
Log:
* Upload to unstable.
* debian/control:
  - update standards version to 3.8.1.
  - update build-dep on debhelper to 7.
* debian/rules:
  - use dh_installman -a
  - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
  - replace dh_clean -k by dh_prep
* debian/compat bumped to 7.

Modified: desktop/trunk/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/changelog	2009-03-16 06:40:48 UTC (rev 2964)
+++ desktop/trunk/xfce4-appfinder/debian/changelog	2009-03-16 07:02:07 UTC (rev 2965)
@@ -1,3 +1,17 @@
+xfce4-appfinder (4.6.0-2) UNRELEASED; urgency=low
+
+  * Upload to unstable.
+  * debian/control:
+    - update standards version to 3.8.1.
+    - update build-dep on debhelper to 7.
+  * debian/rules:
+    - use dh_installman -a
+    - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+    - replace dh_clean -k by dh_prep
+  * debian/compat bumped to 7.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 16 Mar 2009 07:43:37 +0100
+
 xfce4-appfinder (4.6.0-1) experimental; urgency=low
 
   [ Xfce 4.6 Alpha “Pinkie”]                                                    

Modified: desktop/trunk/xfce4-appfinder/debian/compat
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/compat	2009-03-16 06:40:48 UTC (rev 2964)
+++ desktop/trunk/xfce4-appfinder/debian/compat	2009-03-16 07:02:07 UTC (rev 2965)
@@ -1 +1 @@
-4
+7

Modified: desktop/trunk/xfce4-appfinder/debian/control
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/control	2009-03-16 06:40:48 UTC (rev 2964)
+++ desktop/trunk/xfce4-appfinder/debian/control	2009-03-16 07:02:07 UTC (rev 2965)
@@ -3,10 +3,10 @@
 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 (>= 4.0.0), libxfcegui4-dev (>= 4.6.0), libxft-dev,
+Build-Depends: debhelper (>= 7), libxfcegui4-dev (>= 4.6.0), libxft-dev,
  libxml-parser-perl, libxfce4menu-0.1-dev, libgtk2.0-dev, libxfconf-0-dev,
  libthunar-vfs-1-dev (>= 1.0.0), intltool
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-appfinder/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-appfinder/

Modified: desktop/trunk/xfce4-appfinder/debian/rules
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/rules	2009-03-16 06:40:48 UTC (rev 2964)
+++ desktop/trunk/xfce4-appfinder/debian/rules	2009-03-16 07:02:07 UTC (rev 2965)
@@ -6,6 +6,7 @@
 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)))
@@ -16,8 +17,7 @@
 
 config.status: configure
 	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --enable-final
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --enable-final
 
 
 build: build-stamp
@@ -40,15 +40,13 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-appfinder
 
 	# install manual page
-	install -d $(CURDIR)/debian/xfce4-appfinder/usr/share/man/man1
-	install -c -m 644 $(CURDIR)/debian/xfce4-appfinder.1 \
-		$(CURDIR)/debian/xfce4-appfinder/usr/share/man/man1/
+	dh_installman debian/xfce4-appfinder.1
 
 	# install menu pixmap
 	install -d $(CURDIR)/debian/xfce4-appfinder/usr/share/pixmaps