[pkg-java] r15227 - in trunk/libjibx-java/branch-1.1/debian: . patches source

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-10-22 21:35:36 +0000 (Sat, 22 Oct 2011)
New Revision: 15227

Added:
   trunk/libjibx-java/branch-1.1/debian/source/
   trunk/libjibx-java/branch-1.1/debian/source/format
Modified:
   trunk/libjibx-java/branch-1.1/debian/changelog
   trunk/libjibx-java/branch-1.1/debian/control
   trunk/libjibx-java/branch-1.1/debian/patches/01_build_xml.patch
   trunk/libjibx-java/branch-1.1/debian/patches/series
   trunk/libjibx-java/branch-1.1/debian/rules
Log:
* Team upload.
* Switch to default-jdk. (Closes: #643531).
* Bump Standards-Version to 3.9.2. No changes were required.
* Switch to source format 3.0 (quilt).
* Drop Build-Depends on quilt.


Modified: trunk/libjibx-java/branch-1.1/debian/changelog
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/changelog	2011-10-22 21:17:34 UTC (rev 15226)
+++ trunk/libjibx-java/branch-1.1/debian/changelog	2011-10-22 21:35:36 UTC (rev 15227)
@@ -1,3 +1,13 @@
+libjibx1.1-java (1.1.6a-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #643531).
+  * Bump Standards-Version to 3.9.2. No changes were required.
+  * Switch to source format 3.0 (quilt).
+  * Drop Build-Depends on quilt.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sat, 22 Oct 2011 16:56:58 -0430
+
 libjibx1.1-java (1.1.6a-2) unstable; urgency=low
 
   * Bumped Debian policy to 3.9.1, no changes required.

Modified: trunk/libjibx-java/branch-1.1/debian/control
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/control	2011-10-22 21:17:34 UTC (rev 15226)
+++ trunk/libjibx-java/branch-1.1/debian/control	2011-10-22 21:35:36 UTC (rev 15227)
@@ -5,9 +5,9 @@
 Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>, Michael Koch <konqueror at gmx.de>,
  Steffen Moeller <moeller at debian.org>, Douglas Kirkland <kirkland at canonical.com>
 DM-upload-allowed: yes
-Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant, quilt
+Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), default-jdk, ant
 Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java, libqdox-java, libdom4j-java
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://jibx.sf.net/
 Vcs-svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjibx-java/branch-1.1/
 Vcs-browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjibx-java/branch-1.1/

Modified: trunk/libjibx-java/branch-1.1/debian/patches/01_build_xml.patch
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/patches/01_build_xml.patch	2011-10-22 21:17:34 UTC (rev 15226)
+++ trunk/libjibx-java/branch-1.1/debian/patches/01_build_xml.patch	2011-10-22 21:35:36 UTC (rev 15227)
@@ -1,7 +1,7 @@
 Index: build/build.xml
 ===================================================================
---- build/build.xml.orig	2010-02-02 01:32:15.000000000 +0100
-+++ build/build.xml	2010-02-02 02:02:11.000000000 +0100
+--- a/build/build.xml.orig	2010-02-02 01:32:15.000000000 +0100
++++ b/build/build.xml	2010-02-02 02:02:11.000000000 +0100
 @@ -60,19 +60,22 @@
      <pathelement location="${binddest}"/>
      <pathelement location="${rundest}"/>

Modified: trunk/libjibx-java/branch-1.1/debian/patches/series
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/patches/series	2011-10-22 21:17:34 UTC (rev 15226)
+++ trunk/libjibx-java/branch-1.1/debian/patches/series	2011-10-22 21:35:36 UTC (rev 15227)
@@ -1 +1 @@
-01_build_xml.patch -p0
+01_build_xml.patch

Modified: trunk/libjibx-java/branch-1.1/debian/rules
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/rules	2011-10-22 21:17:34 UTC (rev 15226)
+++ trunk/libjibx-java/branch-1.1/debian/rules	2011-10-22 21:35:36 UTC (rev 15227)
@@ -3,10 +3,10 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 #include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_COMPRESS_EXCLUDE := .class
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j qdox xpp3
 DEB_ANT_BUILD_TARGET := setrelease current devdoc
 DEB_ANT_ARGS         := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION)

Added: trunk/libjibx-java/branch-1.1/debian/source/format
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/source/format	                        (rev 0)
+++ trunk/libjibx-java/branch-1.1/debian/source/format	2011-10-22 21:35:36 UTC (rev 15227)
@@ -0,0 +1 @@
+3.0 (quilt)