[pkg-java] r15807 - trunk/commons-daemon/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-03-02 18:41:04 +0000 (Fri, 02 Mar 2012)
New Revision: 15807

Modified:
   trunk/commons-daemon/debian/changelog
   trunk/commons-daemon/debian/control
   trunk/commons-daemon/debian/copyright
   trunk/commons-daemon/debian/rules
Log:
* New upstream release.
* d/control: Bump Standards-Version to 3.9.3: no changes needed.
* d/rules: Enable hardening build with dpkg-buildflags.
* d/rules: Remove old code to workaround bug in debhelper.
* Fix "Updating the commons-daemon Uploaders list" Remove Michael Koch
  from Uploaders list (Closes: #654006). Thanks Michael!
* d/copyright: Use copyright-format 1.0.

Modified: trunk/commons-daemon/debian/changelog
===================================================================
--- trunk/commons-daemon/debian/changelog	2012-03-02 05:35:10 UTC (rev 15806)
+++ trunk/commons-daemon/debian/changelog	2012-03-02 18:41:04 UTC (rev 15807)
@@ -1,3 +1,15 @@
+commons-daemon (1.0.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * d/control: Bump Standards-Version to 3.9.3: no changes needed.
+  * d/rules: Enable hardening build with dpkg-buildflags.
+  * d/rules: Remove old code to workaround bug in debhelper.
+  * Fix "Updating the commons-daemon Uploaders list" Remove Michael Koch
+    from Uploaders list (Closes: #654006). Thanks Michael!
+  * d/copyright: Use copyright-format 1.0.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 02 Mar 2012 19:37:23 +0100
+
 commons-daemon (1.0.8-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/commons-daemon/debian/control
===================================================================
--- trunk/commons-daemon/debian/control	2012-03-02 05:35:10 UTC (rev 15806)
+++ trunk/commons-daemon/debian/control	2012-03-02 18:41:04 UTC (rev 15807)
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 7.0.50~), autoconf, autotools-dev, default-jdk,
  xsltproc, docbook-xsl, ant, libcap-dev [linux-any], maven-repo-helper
 Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://commons.apache.org/daemon/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/commons-daemon/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-daemon/

Modified: trunk/commons-daemon/debian/copyright
===================================================================
--- trunk/commons-daemon/debian/copyright	2012-03-02 05:35:10 UTC (rev 15806)
+++ trunk/commons-daemon/debian/copyright	2012-03-02 18:41:04 UTC (rev 15807)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Commons Daemon
 Upstream-Contact: <http://commons.apache.org/daemon>
 Source: http://www.apache.org/dist/commons/daemon/source/
@@ -6,7 +6,7 @@
 Files: *
 Copyright: Copyright (C) 1999-2011 The Apache Software Foundation.
 License: Apache-2.0
-Comment:
+Comment: 
  Upstream authors: Bill Barker, Jean-Frederic Clere, Mladen Turk,
  Remy Maucherat, Pier Fumagalli, Yoav Shapira.
 
@@ -19,3 +19,4 @@
 License: Apache-2.0
   A complete copy of the Apache License, Version 2.0, can be found in
   /usr/share/common-licenses/Apache-2.0 on Debian Systems.
+

Modified: trunk/commons-daemon/debian/rules
===================================================================
--- trunk/commons-daemon/debian/rules	2012-03-02 05:35:10 UTC (rev 15806)
+++ trunk/commons-daemon/debian/rules	2012-03-02 18:41:04 UTC (rev 15807)
@@ -1,12 +1,5 @@
 #!/usr/bin/make -f
 
-CFLAGS = -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 JAVA_HOME	:= /usr/lib/jvm/default-java
 ANT_ARGS	:= -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
 
@@ -19,24 +12,15 @@
 
 NATIVE_SRC	:= src/native/unix
 
-# Keep that here as dh7 doesn't handle a configure script inside a subdirectory
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-	confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
 %:
 	dh $@ --sourcedirectory=$(NATIVE_SRC) --buildsystem=autoconf --with autotools_dev
 
 override_dh_auto_configure:
-	(cd $(NATIVE_SRC); autoconf; ./configure $(confflags) CFLAGS="$(CFLAGS)" --with-java=$(JAVA_HOME))
+	dh_auto_configure -- --with-java=$(JAVA_HOME) $(shell dpkg-buildflags --export=configure)
 
 override_dh_auto_build:
 	JAVA_HOME=$(JAVA_HOME) ant $(ANT_ARGS)
-	dh_auto_build --sourcedirectory=$(NATIVE_SRC)
+	dh_auto_build
 	$(XSLTPROC) $(MAN_STYLESHEET) $(NATIVE_SRC)/man/jsvc.1.xml
 
 override_dh_auto_clean: