[libjettison-java] 09/34: * 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
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Apr 20 15:37:43 BST 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libjettison-java.
commit 252f63af4c04627bb598e9e87dae7a52570de04c
Author: Torsten Werner <twerner at debian.org>
Date: Sat May 8 15:49:51 2010 +0000
* 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
---
debian/build.xml | 2 +-
debian/changelog | 22 ++++++++++++++++++++++
debian/control | 8 ++++----
debian/rules | 2 +-
debian/source/format | 1 +
5 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/debian/build.xml b/debian/build.xml
index 4be14e1..6286dd1 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -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">
diff --git a/debian/changelog b/debian/changelog
index 740cc3f..89c18df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/control b/debian/control
index c092e93..e061d70 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,15 @@ Priority: optional
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
diff --git a/debian/rules b/debian/rules
index efdd079..e48c6f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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::
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/libjettison-java.git
More information about the pkg-java-commits
mailing list