[Pkg-xfce-commits] r5276 - in goodies/trunk/xfce4-hdaps: . debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-02 19:33:01 +0000 (Sat, 02 Apr 2011)
New Revision: 5276

Modified:
   goodies/trunk/xfce4-hdaps/
   goodies/trunk/xfce4-hdaps/debian/changelog
   goodies/trunk/xfce4-hdaps/debian/control
   goodies/trunk/xfce4-hdaps/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-hdaps
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-hdaps:4981-5273

Modified: goodies/trunk/xfce4-hdaps/debian/changelog
===================================================================
--- goodies/trunk/xfce4-hdaps/debian/changelog	2011-04-02 19:32:37 UTC (rev 5275)
+++ goodies/trunk/xfce4-hdaps/debian/changelog	2011-04-02 19:33:01 UTC (rev 5276)
@@ -1,13 +1,26 @@
-xfce4-hdaps (0.0.5-3) UNRELEASED; urgency=low
+xfce4-hdaps (0.0.7-1) experimental; urgency=low
 
+  [ Evgeni Golov ]
   * debian/control:
     + Only recommend hdapsd on i386, amd64 and powerpc.
-    + Bump Standards-Version to 3.8.1.
     + Update my e-mail address.
   * Fix Vcs-* fields, they were missing 'trunk' in the path.
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 20 Apr 2009 18:33:36 +0200
+  [ Yves-Alexis Perez ]
+  * Upload to unstable.
+  * New upstream release.
+  * debian/rules:
+    - switch to tiny rules from dh 7.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS>
+  * debian/control:
+    - add build-dep on hardening-includes. 
+    - update build-deps for Xfce 4.8. 
+    - update standards version to 3.9.1.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 14:57:54 +0100
+
 xfce4-hdaps (0.0.5-2) unstable; urgency=low
 
   * Re-upload with the missing modifications.

Modified: goodies/trunk/xfce4-hdaps/debian/control
===================================================================
--- goodies/trunk/xfce4-hdaps/debian/control	2011-04-02 19:32:37 UTC (rev 5275)
+++ goodies/trunk/xfce4-hdaps/debian/control	2011-04-02 19:33:01 UTC (rev 5276)
@@ -1,13 +1,13 @@
 Source: xfce4-hdaps
-Section: utils
+Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, 
  Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 7), intltool, libxfce4util-dev, libxfcegui4-dev, 
- xfce4-panel-dev
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7), intltool, libxfce4util-dev, libxfce4ui-1-dev, 
+ xfce4-panel-dev (>= 4.8.0), hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://michael.orlitzky.com/code/xfce4-hdaps.php
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-hdaps/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-hdaps/

Modified: goodies/trunk/xfce4-hdaps/debian/rules
===================================================================
--- goodies/trunk/xfce4-hdaps/debian/rules	2011-04-02 19:32:37 UTC (rev 5275)
+++ goodies/trunk/xfce4-hdaps/debian/rules	2011-04-02 19:33:01 UTC (rev 5276)
@@ -1,29 +1,13 @@
 #!/usr/bin/make -f
 
-build: build-stamp
-build-stamp:
-	dh build --before dh_auto_configure
-	dh_auto_configure -- --libexec=/usr/lib LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
-	# Don't run tests for now, they fail but the plugin works fine.
-	dh build --before dh_auto_test
-	dh build --after dh_auto_test
-	touch $@
+include /usr/share/hardening-includes/hardening.make
 
-clean:
-	dh clean
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+#CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed #$(HARDENING_LDFLAGS)
 
-install: build
-	dh install
-	# upstream installs ${prefix}/share/locale, but has no translations yet
-	# lintian says "package-contains-empty-directory", so let's remove it
-	find $(CURDIR)/debian/xfce4-hdaps -type d -empty -delete
+export CFLAGS LDFLAGS
 
-binary-arch: install
-	dh binary-arch
-
-binary-indep: install
-	dh binary-indep
-
-binary: binary-arch binary-indep
-
-.PHONY: build clean install binary binary-arch binary-indep
+%:
+	dh $@