[pkg-java] r12300 - in trunk/libjoda-time-java/debian: . source

[Torsten Werner]

Author: twerner
Date: 2010-05-04 20:32:13 +0000 (Tue, 04 May 2010)
New Revision: 12300

Added:
   trunk/libjoda-time-java/debian/source/
   trunk/libjoda-time-java/debian/source/format
Modified:
   trunk/libjoda-time-java/debian/changelog
   trunk/libjoda-time-java/debian/control
   trunk/libjoda-time-java/debian/rules
Log:
* Merge changes from Ubuntu version 1.6-2ubuntu1.
* Switch to source format 3.0.
* Update Standards-Version: 3.8.4.
* debian/control, debian/rules: Build with default-jdk
* Other debian/control fixes:
   - Runtime depend on default-jre-headless | java2-runtime-headless
   - Set section to "java"
   - Remove useless ${shlibs:Depends} from Depends, package has no binaries

Modified: trunk/libjoda-time-java/debian/changelog
===================================================================
--- trunk/libjoda-time-java/debian/changelog	2010-05-04 20:22:56 UTC (rev 12299)
+++ trunk/libjoda-time-java/debian/changelog	2010-05-04 20:32:13 UTC (rev 12300)
@@ -1,3 +1,21 @@
+libjoda-time-java (1.6-3) karmic; urgency=low
+
+  * Merge changes from Ubuntu version 1.6-2ubuntu1.
+  * Switch to source format 3.0.
+  * Update Standards-Version: 3.8.4.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 04 May 2010 22:31:09 +0200
+
+libjoda-time-java (1.6-2ubuntu1) karmic; urgency=low
+
+  * debian/control, debian/rules: Build with default-jdk
+  * Other debian/control fixes:
+     - Runtime depend on default-jre-headless | java2-runtime-headless
+     - Set section to "java"
+     - Remove useless ${shlibs:Depends} from Depends, package has no binaries
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 11 Aug 2009 11:41:44 +0200
+
 libjoda-time-java (1.6-2) unstable; urgency=low
 
   * upload to unstable

Modified: trunk/libjoda-time-java/debian/control
===================================================================
--- trunk/libjoda-time-java/debian/control	2010-05-04 20:22:56 UTC (rev 12299)
+++ trunk/libjoda-time-java/debian/control	2010-05-04 20:32:13 UTC (rev 12300)
@@ -1,19 +1,18 @@
 Source: libjoda-time-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev, junit
-Standards-Version: 3.8.0
+Build-Depends-Indep: default-jdk, ant, junit
+Standards-Version: 3.8.4
 Homepage: http://joda-time.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjoda-time-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjoda-time-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjoda-time-java/
 
 Package: libjoda-time-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends},
- java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
 Description: Java date and time API
  Joda-Time provides a quality replacement for the Java date and time
  classes. The design allows for multiple calendar systems, while still

Modified: trunk/libjoda-time-java/debian/rules
===================================================================
--- trunk/libjoda-time-java/debian/rules	2010-05-04 20:22:56 UTC (rev 12299)
+++ trunk/libjoda-time-java/debian/rules	2010-05-04 20:32:13 UTC (rev 12300)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-gcj
+JAVA_HOME 		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_JARS                := junit
 

Added: trunk/libjoda-time-java/debian/source/format
===================================================================
--- trunk/libjoda-time-java/debian/source/format	                        (rev 0)
+++ trunk/libjoda-time-java/debian/source/format	2010-05-04 20:32:13 UTC (rev 12300)
@@ -0,0 +1 @@
+3.0 (quilt)