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

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-03-02 21:09:37 +0000 (Fri, 02 Mar 2012)
New Revision: 15811

Modified:
   trunk/commons-daemon/debian/changelog
   trunk/commons-daemon/debian/control
   trunk/commons-daemon/debian/copyright
   trunk/commons-daemon/debian/rules
Log:
* d/control: Really drop Michael from Uploaders list.
* d/rules: Run autoconf before configure (because patches are applied
  to apsupport.m4).
* d/control: Wrap-and-sort fields. 

Modified: trunk/commons-daemon/debian/changelog
===================================================================
--- trunk/commons-daemon/debian/changelog	2012-03-02 18:56:03 UTC (rev 15810)
+++ trunk/commons-daemon/debian/changelog	2012-03-02 21:09:37 UTC (rev 15811)
@@ -1,3 +1,12 @@
+commons-daemon (1.0.10-2) unstable; urgency=low
+
+  * d/control: Really drop Michael from Uploaders list.
+  * d/rules: Run autoconf before configure (because patches are applied
+    to apsupport.m4).
+  * d/control: Wrap-and-sort fields. 
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 02 Mar 2012 22:07:21 +0100
+
 commons-daemon (1.0.10-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/commons-daemon/debian/control
===================================================================
--- trunk/commons-daemon/debian/control	2012-03-02 18:56:03 UTC (rev 15810)
+++ trunk/commons-daemon/debian/control	2012-03-02 21:09:37 UTC (rev 15811)
@@ -2,10 +2,17 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Marcus Better <marcus at better.se>,
- Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), autoconf, autotools-dev, default-jdk,
- xsltproc, docbook-xsl, ant, libcap-dev [linux-any], maven-repo-helper
+Uploaders: Marcus Better <marcus at better.se>,
+           Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: ant,
+               autoconf,
+               autotools-dev,
+               debhelper (>= 7.0.50~),
+               default-jdk,
+               docbook-xsl,
+               libcap-dev [linux-any],
+               maven-repo-helper,
+               xsltproc
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.3
 Homepage: http://commons.apache.org/daemon/
@@ -30,7 +37,7 @@
 Package: jsvc
 Section: utils
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libcommons-daemon-java
+Depends: libcommons-daemon-java, ${misc:Depends}, ${shlibs:Depends}
 Recommends: default-jre-headless | java2-runtime-headless
 Description: wrapper to launch Java applications as daemons
  This is the native application for launching Java applications

Modified: trunk/commons-daemon/debian/copyright
===================================================================
--- trunk/commons-daemon/debian/copyright	2012-03-02 18:56:03 UTC (rev 15810)
+++ trunk/commons-daemon/debian/copyright	2012-03-02 21:09:37 UTC (rev 15811)
@@ -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,4 +19,3 @@
 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 18:56:03 UTC (rev 15810)
+++ trunk/commons-daemon/debian/rules	2012-03-02 21:09:37 UTC (rev 15811)
@@ -16,6 +16,7 @@
 	dh $@ --sourcedirectory=$(NATIVE_SRC) --buildsystem=autoconf --with autotools_dev
 
 override_dh_auto_configure:
+	(cd $(NATIVE_SRC); autoconf)
 	dh_auto_configure -- --with-java=$(JAVA_HOME) $(shell dpkg-buildflags --export=configure)
 
 override_dh_auto_build: