[pkg-java] r12360 - in trunk/libjettison-java/debian: . source

[Torsten Werner]

Author: twerner
Date: 2010-05-08 15:49:51 +0000 (Sat, 08 May 2010)
New Revision: 12360

Added:
   trunk/libjettison-java/debian/source/
   trunk/libjettison-java/debian/source/format
Modified:
   trunk/libjettison-java/debian/build.xml
   trunk/libjettison-java/debian/changelog
   trunk/libjettison-java/debian/control
   trunk/libjettison-java/debian/rules
Log:
* Merge changes from Ubuntu.
* Switch to source format 3.0.
* Update Standards-Version: 3.8.4.
* debian/build.xml: Build java2-compatible code to match JRE dependency
* debian/control: Drop java1-runtime-headless ORed dependency
* debian/control: Runtime dependency on -headless JREs (LP: #387884)
* debian/control, debian/rules: Build-depend on default-jdk

Modified: trunk/libjettison-java/debian/build.xml
===================================================================
--- trunk/libjettison-java/debian/build.xml	2010-05-08 15:34:34 UTC (rev 12359)
+++ trunk/libjettison-java/debian/build.xml	2010-05-08 15:49:51 UTC (rev 12360)
@@ -9,7 +9,7 @@
   <target name="compile" description="o Compile the source files">
     <mkdir dir="${class.dir}"/>
     <javac srcdir="${source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" source="1.4" target="1.4"/>
   </target>
 
   <target name="jar" description="o Create the jar" depends="compile">

Modified: trunk/libjettison-java/debian/changelog
===================================================================
--- trunk/libjettison-java/debian/changelog	2010-05-08 15:34:34 UTC (rev 12359)
+++ trunk/libjettison-java/debian/changelog	2010-05-08 15:49:51 UTC (rev 12360)
@@ -1,3 +1,25 @@
+libjettison-java (1.1-2) unstable; urgency=low
+
+  * Merge changes from Ubuntu.
+  * Switch to source format 3.0.
+  * Update Standards-Version: 3.8.4.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 17:48:37 +0200
+
+libjettison-java (1.1-1ubuntu2) karmic; urgency=low
+
+  * debian/build.xml: Build java2-compatible code to match JRE dependency
+  * debian/control: Drop java1-runtime-headless ORed dependency
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 25 Aug 2009 15:08:56 +0200
+
+libjettison-java (1.1-1ubuntu1) karmic; urgency=low
+
+  * debian/control: Runtime dependency on -headless JREs (LP: #387884)
+  * debian/control, debian/rules: Build-depend on default-jdk
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Fri, 03 Jul 2009 15:05:02 +0200
+
 libjettison-java (1.1-1) unstable; urgency=low
 
   * Updated watch file.

Modified: trunk/libjettison-java/debian/control
===================================================================
--- trunk/libjettison-java/debian/control	2010-05-08 15:34:34 UTC (rev 12359)
+++ trunk/libjettison-java/debian/control	2010-05-08 15:49:51 UTC (rev 12360)
@@ -4,15 +4,15 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev
-Standards-Version: 3.8.1
+Build-Depends-Indep: ant, default-jdk
+Standards-Version: 3.8.4
 Homepage: http://jettison.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjettison-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjettison-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjettison-java/
 
 Package: libjettison-java
 Architecture: all
-Depends:  java-gcj-compat | java1-runtime | java2-runtime, ${misc:Depends}
+Depends:  default-jre-headless | java2-runtime-headless, ${misc:Depends}
 Description: collection of StAX parsers and writers for JSON
  Jettison is a collection of StAX parsers (streaming API for XML) and
  writers which read and write JSON (JavaScript Object Notation). This

Modified: trunk/libjettison-java/debian/rules
===================================================================
--- trunk/libjettison-java/debian/rules	2010-05-08 15:34:34 UTC (rev 12359)
+++ trunk/libjettison-java/debian/rules	2010-05-08 15:49:51 UTC (rev 12360)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME         := /usr/lib/jvm/java-gcj
+JAVA_HOME         := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE := debian/build.xml
 
 install/libjettison-java:: 

Added: trunk/libjettison-java/debian/source/format
===================================================================
--- trunk/libjettison-java/debian/source/format	                        (rev 0)
+++ trunk/libjettison-java/debian/source/format	2010-05-08 15:49:51 UTC (rev 12360)
@@ -0,0 +1 @@
+3.0 (quilt)