[libcommons-cli-java] 16/31: Imported Debian patch 1.2-3

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libcommons-cli-java.

commit 3d2997541c8f1460ec42abb416914f2167c9a67c
Author: Torsten Werner <twerner at debian.org>
Date:   Sat May 8 21:14:11 2010 +0200

    Imported Debian patch 1.2-3
---
 debian/build.properties |  3 ++-
 debian/changelog        | 42 ++++++++++++++++++++++++++++++++++++++++++
 debian/control          |  7 +++----
 debian/source/format    |  1 +
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index 14503e4..e369cea 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -3,4 +3,5 @@ build.sourceDirectory=src/java
 build.testDirectory=src/test
 build.directory=target
 maven.test.skip=true
-
+ant.build.javac.target=1.4
+ant.build.javac.source=1.4
diff --git a/debian/changelog b/debian/changelog
index 5ad1c1d..d4033f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+libcommons-cli-java (1.2-3) unstable; urgency=low
+
+  * Team upload.
+  * Merge changes from Ubuntu:
+    - debian/ant.properties: Build java2 compatible code.
+  * Remove Arnaud and Paul from Uploaders list.
+  * Switch to source format 3.0.
+  * Update Standards-Version: 3.8.4.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 21:14:11 +0200
+
+libcommons-cli-java (1.2-2ubuntu1) lucid; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - debian/ant.properties: Build java2 compatible code.
+
+ -- Matthias Klose <doko at ubuntu.com>  Tue, 27 Oct 2009 15:21:49 +0100
+
 libcommons-cli-java (1.2-2) unstable; urgency=low
 
   * Upload to unstable.
@@ -31,6 +49,30 @@ libcommons-cli-java (1.2-1) experimental; urgency=low
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 02 Jul 2009 11:30:49 +0100
 
+libcommons-cli-java (1.1-3ubuntu3) karmic; urgency=low
+
+  * Pick the following changes from version 1.2-1:
+    - Add the Maven POM to the package,
+    - Add a Build-Depends-Indep dependency on maven-repo-helper
+    - Use mh_installpom and mh_installjar to install the POM and the jar to the
+      Maven repository
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 18 Oct 2009 20:30:27 +0200
+
+libcommons-cli-java (1.1-3ubuntu2) karmic; urgency=low
+
+  * debian/ant.properties: Build java2 compatible code.
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Mon, 24 Aug 2009 11:19:04 +0200
+
+libcommons-cli-java (1.1-3ubuntu1) karmic; urgency=low
+
+  * debian/control: Set libcommons-cli-java runtime dependency on
+    "default-jre-headless | java2-runtime-headless" (LP: #387884)
+  * debian/control, debian/rules: Build-depend on default-jdk
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 16 Jun 2009 15:15:53 +0200
+
 libcommons-cli-java (1.1-3) unstable; urgency=low
 
   * Added build-depends-indep for ant-optional.
diff --git a/debian/control b/debian/control
index 66c8eb3..e56e06e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,12 @@ Source: libcommons-cli-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>,
- Ludovic Claude <ludovic.claude at laposte.net>
+Uploaders: Michael Koch <konqueror at gmx.de>, Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), default-jdk
 Build-Depends-Indep: maven-ant-helper, maven-repo-helper, ant, ant-optional, libcommons-lang-java (>= 2.0), junit
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-cli-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-cli-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-cli-java/
 Homepage: http://commons.apache.org/cli/
 
 Package: libcommons-cli-java
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-cli-java.git