[pkg-java] r12365 - trunk/libcommons-cli-java/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-08 19:13:30 +0000 (Sat, 08 May 2010)
New Revision: 12365

Modified:
   trunk/libcommons-cli-java/debian/build.properties
   trunk/libcommons-cli-java/debian/changelog
   trunk/libcommons-cli-java/debian/control
Log:
* Team upload.
* Merge changes from Ubuntu:
  - debian/ant.properties: Build java2 compatible code.
* Remove Arnaud and Paul from Uploaders list.
* Merge with Debian; remaining changes:
  - debian/ant.properties: Build java2 compatible code.
* 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
* debian/ant.properties: Build java2 compatible code.
* 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

Modified: trunk/libcommons-cli-java/debian/build.properties
===================================================================
--- trunk/libcommons-cli-java/debian/build.properties	2010-05-08 18:53:59 UTC (rev 12364)
+++ trunk/libcommons-cli-java/debian/build.properties	2010-05-08 19:13:30 UTC (rev 12365)
@@ -3,4 +3,5 @@
 build.testDirectory=src/test
 build.directory=target
 maven.test.skip=true
-
+ant.build.javac.target=1.4
+ant.build.javac.source=1.4

Modified: trunk/libcommons-cli-java/debian/changelog
===================================================================
--- trunk/libcommons-cli-java/debian/changelog	2010-05-08 18:53:59 UTC (rev 12364)
+++ trunk/libcommons-cli-java/debian/changelog	2010-05-08 19:13:30 UTC (rev 12365)
@@ -1,3 +1,19 @@
+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.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 21:12:28 +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 +47,30 @@
 
  -- 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.

Modified: trunk/libcommons-cli-java/debian/control
===================================================================
--- trunk/libcommons-cli-java/debian/control	2010-05-08 18:53:59 UTC (rev 12364)
+++ trunk/libcommons-cli-java/debian/control	2010-05-08 19:13:30 UTC (rev 12365)
@@ -2,8 +2,7 @@
 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