[pkg-java] r7764 - trunk/libjson-java/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2009-01-01 00:05:00 +0000 (Thu, 01 Jan 2009)
New Revision: 7764

Modified:
   trunk/libjson-java/debian/build.xml
   trunk/libjson-java/debian/changelog
   trunk/libjson-java/debian/control
   trunk/libjson-java/debian/orig-tar.sh
   trunk/libjson-java/debian/rules
Log:
* New upstream release
* Switch to default-jdk/-jre-headless.
* Disable compiler warnings.

Modified: trunk/libjson-java/debian/build.xml
===================================================================
--- trunk/libjson-java/debian/build.xml	2008-12-31 23:45:52 UTC (rev 7763)
+++ trunk/libjson-java/debian/build.xml	2009-01-01 00:05:00 UTC (rev 7764)
@@ -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.5" nowarn="true"/>
   </target>
 
   <target name="jar" description="o Create the jar" depends="compile">

Modified: trunk/libjson-java/debian/changelog
===================================================================
--- trunk/libjson-java/debian/changelog	2008-12-31 23:45:52 UTC (rev 7763)
+++ trunk/libjson-java/debian/changelog	2009-01-01 00:05:00 UTC (rev 7764)
@@ -1,3 +1,11 @@
+libjson-java (2.2.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Switch to default-jdk/-jre-headless.
+  * Disable compiler warnings.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 01 Jan 2009 01:03:10 +0100
+
 libjson-java (2.2.2-3) unstable; urgency=low
 
   * debian/control: add libcommons-lang-java, libcommons-beanutils-java,

Modified: trunk/libjson-java/debian/control
===================================================================
--- trunk/libjson-java/debian/control	2008-12-31 23:45:52 UTC (rev 7763)
+++ trunk/libjson-java/debian/control	2009-01-01 00:05:00 UTC (rev 7764)
@@ -4,10 +4,9 @@
 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: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev, groovy,
- libcommons-lang-java, liboro-java, libcommons-beanutils-java,
- libcommons-logging-java, libcommons-collections3-java, libezmorph-java,
- libxom-java, junit
+Build-Depends-Indep: ant, default-jdk, groovy, libcommons-lang-java, liboro-java,
+ libcommons-beanutils-java, libcommons-logging-java, libcommons-collections3-java,
+ libezmorph-java, libxom-java, junit
 Standards-Version: 3.8.0
 Homepage: http://json-lib.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjson-java
@@ -15,10 +14,9 @@
 
 Package: libjson-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime,
- libcommons-lang-java, libcommons-beanutils-java,
- libcommons-logging-java, libcommons-collections3-java,
- libezmorph-java
+Depends: default-jre-headless | java2-runtime, groovy, libcommons-lang-java,
+ liboro-java, libcommons-beanutils-java, libcommons-logging-java,
+ libcommons-collections3-java, libezmorph-java, libxom-java
 Description: library for transforming Java objects and XML to JSON and back again
  JSON-lib is a java library for transforming beans, maps, collections,
  java arrays and XML to JSON and back again to beans and DynaBeans.

Modified: trunk/libjson-java/debian/orig-tar.sh
===================================================================
--- trunk/libjson-java/debian/orig-tar.sh	2008-12-31 23:45:52 UTC (rev 7763)
+++ trunk/libjson-java/debian/orig-tar.sh	2009-01-01 00:05:00 UTC (rev 7764)
@@ -6,7 +6,7 @@
 
 # clean up the upstream tarball
 mkdir $DIR
-(cd $DIR && jar -x -f ../$3)
+(cd $DIR && jar xf ../$3)
 tar -c -z -f $TAR $DIR
 rm -rf $DIR $3
 
@@ -16,5 +16,3 @@
     mv $TAR $origDir
     echo "moved $TAR to $origDir"
 fi
-
-exit 0

Modified: trunk/libjson-java/debian/rules
===================================================================
--- trunk/libjson-java/debian/rules	2008-12-31 23:45:52 UTC (rev 7763)
+++ trunk/libjson-java/debian/rules	2009-01-01 00:05:00 UTC (rev 7764)
@@ -3,13 +3,16 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-gcj
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_JARS             := groovy commons-lang oro commons-beanutils commons-logging commons-collections3 ezmorph xom junit
+JAVA_HOME         := /usr/lib/jvm/default-java
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_JARS          := groovy commons-lang oro commons-beanutils commons-logging \
+  commons-collections3 ezmorph xom junit
 
 install/libjson-java:: 
-	install -m644 -D json-lib.jar $(DEB_DESTDIR)/usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -plibjson-java /usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/json-lib.jar
+	install -m644 -D json-lib.jar \
+	  $(DEB_DESTDIR)/usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -plibjson-java /usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar \
+	  /usr/share/java/json-lib.jar
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename	
+	uscan --force-download --rename