[Pkg-xfce-commits] r7618 - goodies/trunk/xfce4-messenger-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2013-05-25 09:14:31 +0000 (Sat, 25 May 2013)
New Revision: 7618

Modified:
   goodies/trunk/xfce4-messenger-plugin/debian/changelog
   goodies/trunk/xfce4-messenger-plugin/debian/control
   goodies/trunk/xfce4-messenger-plugin/debian/docs
   goodies/trunk/xfce4-messenger-plugin/debian/rules
Log:
* debian/rules:
  - use dh rules.
  - enable all hardening flags.
  - enable parallel build.
  - don't install script Makefiles in doc folder.
* debian/control:
  - update debhelper build-dep to 9.
  - drop version on xfce4-panel-dev, stable has Xfce 4.8.
  - drop cdbs and hardening-includes build-dep, unneeded anymore.
  - update standards version to 3.9.4. 
* debian/docs:
  - install scripts in /u/s/doc.

Modified: goodies/trunk/xfce4-messenger-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-messenger-plugin/debian/changelog	2013-05-25 08:33:48 UTC (rev 7617)
+++ goodies/trunk/xfce4-messenger-plugin/debian/changelog	2013-05-25 09:14:31 UTC (rev 7618)
@@ -1,5 +1,22 @@
-xfce4-messenger-plugin (0.1.0-5) unstable; urgency=low
+xfce4-messenger-plugin (0.1.0-6) UNRELEASED; urgency=low
 
+  * debian/rules:
+    - use dh rules.
+    - enable all hardening flags.
+    - enable parallel build.
+    - don't install script Makefiles in doc folder.
+  * debian/control:
+    - update debhelper build-dep to 9.
+    - drop version on xfce4-panel-dev, stable has Xfce 4.8.
+    - drop cdbs and hardening-includes build-dep, unneeded anymore.
+    - update standards version to 3.9.4. 
+  * debian/docs:
+    - install scripts in /u/s/doc.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 25 May 2013 10:48:27 +0200
+
+xfce4-messenger-plugin (0.1.0-5+b1) unstable; urgency=low
+
   [ Yves-Alexis Perez ]
   * debian/patches:
     - 01_link-with-libxfcegui4 added, link against libxfcegui4 now that

Modified: goodies/trunk/xfce4-messenger-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-messenger-plugin/debian/control	2013-05-25 08:33:48 UTC (rev 7617)
+++ goodies/trunk/xfce4-messenger-plugin/debian/control	2013-05-25 09:14:31 UTC (rev 7618)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, xfce4-panel-dev (>= 4.8.0),
+Build-Depends: debhelper (>= 9), xfce4-panel-dev,
  libdbus-1-dev, libdbus-glib-1-dev, libxt-dev, autotools-dev, libxfcegui4-dev,
- xfce4-dev-tools, libtool, intltool, hardening-includes
-Standards-Version: 3.9.2
+ xfce4-dev-tools, libtool, intltool
+Standards-Version: 3.9.4
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-messenger-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-messenger-plugin/

Modified: goodies/trunk/xfce4-messenger-plugin/debian/docs
===================================================================
--- goodies/trunk/xfce4-messenger-plugin/debian/docs	2013-05-25 08:33:48 UTC (rev 7617)
+++ goodies/trunk/xfce4-messenger-plugin/debian/docs	2013-05-25 09:14:31 UTC (rev 7618)
@@ -1 +1,2 @@
 README
+scripts/

Modified: goodies/trunk/xfce4-messenger-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-messenger-plugin/debian/rules	2013-05-25 08:33:48 UTC (rev 7617)
+++ goodies/trunk/xfce4-messenger-plugin/debian/rules	2013-05-25 09:14:31 UTC (rev 7618)
@@ -1,26 +1,22 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-export CFLAGS LDFLAGS
-
-post-patches::
+override_dh_auto_configure:
 	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure -- --disable-silent-rules
 
-clean::
-	rm -f $$(find -name 'Makefile.in*')
-	rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh
-	rm -f intltool-extract.in intltool-merge.in intltool-update.in ltmain.sh
-	rm -f missing mkinstalldirs
+override_dh_auto_clean:
+	dh_auto_clean
+	xdt-autogen clean
+	rm -f INSTALL
 
-binary-post-install/xfce4-messenger-plugin::
-	cp -r scripts/ debian/`dh_listpackages`/usr/share/doc/`dh_listpackages`/
-	-rm -rf debian/`dh_listpackages`/usr/share/doc/`dh_listpackages`/scripts/Makefile*
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+override_dh_install:
+	dh_install --fail-missing -X .la
+
+override_dh_installdocs:
+	dh_installdocs -X Makefile
+
+%:
+	dh $@ --parallel