[commons-daemon] 39/52: Imported Debian patch 1.0.10-2
Tony Mancill
tmancill at moszumanska.debian.org
Wed Nov 12 05:31:32 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository commons-daemon.
commit 7e5935249fb0659f20f64a8a754413c9e34aa4b7
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Fri Mar 2 22:07:21 2012 +0100
Imported Debian patch 1.0.10-2
---
debian/changelog | 9 +++++++++
debian/control | 17 ++++++++++++-----
debian/copyright | 3 +--
debian/rules | 1 +
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0d5d38c..508ade7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/control b/debian/control
index 7afc949..3688f8b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,17 @@ Source: commons-daemon
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 @@ Description: library to launch Java applications as daemons
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
diff --git a/debian/copyright b/debian/copyright
index f6092ed..0f328fa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Source: http://www.apache.org/dist/commons/daemon/source/
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
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.
-
diff --git a/debian/rules b/debian/rules
index 7d3dd01..9935209 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ NATIVE_SRC := src/native/unix
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:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-daemon.git
More information about the pkg-java-commits
mailing list