[pkg-java] r7799 - in trunk/jflex/debian: . patches

[doko at alioth.debian.org]

Author: doko
Date: 2009-01-09 10:47:09 +0000 (Fri, 09 Jan 2009)
New Revision: 7799

Modified:
   trunk/jflex/debian/changelog
   trunk/jflex/debian/control
   trunk/jflex/debian/patches/03_build_xml_target.patch
   trunk/jflex/debian/rules
Log:
  * New upstream (bug fix) release.
  * Build-depend on default-jdk, depend on default-jre-headless.
  * debian/patches/03_build_xml_target.patch: Update.


Modified: trunk/jflex/debian/changelog
===================================================================
--- trunk/jflex/debian/changelog	2009-01-08 17:45:11 UTC (rev 7798)
+++ trunk/jflex/debian/changelog	2009-01-09 10:47:09 UTC (rev 7799)
@@ -1,5 +1,11 @@
-jflex (1.4.1-4) UNRELEASED; urgency=low
+jflex (1.4.2-1) unstable; urgency=low
 
+  [Matthias Klose]
+  * New upstream (bug fix) release.
+  * Build-depend on default-jdk, depend on default-jre-headless.
+  * debian/patches/03_build_xml_target.patch: Update.
+
+  [Paul Cager]
   * Added watch file.
   * Added symlink from ant's lib directory
     (Closes: #388371 - JFlexTask cannot be found).
@@ -13,7 +19,7 @@
   * debian/copyright
     + Removed lintian warnings about file format.
 
- -- Paul Cager <paul-debian at home.paulcager.org>  Sat, 19 Jul 2008 15:07:38 +0000
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 09 Jan 2009 11:20:59 +0100
 
 jflex (1.4.1-3) unstable; urgency=low
 

Modified: trunk/jflex/debian/control
===================================================================
--- trunk/jflex/debian/control	2009-01-08 17:45:11 UTC (rev 7798)
+++ trunk/jflex/debian/control	2009-01-09 10:47:09 UTC (rev 7799)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Paul Cager <paul-debian at home.paulcager.org>
 Build-Depends: debhelper (>= 4.2.30), cdbs, ant
-Build-Depends-Indep: java-gcj-compat-dev, junit
+Build-Depends-Indep: default-jdk, junit
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jflex
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jflex
@@ -12,7 +12,7 @@
 
 Package: jflex
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime | java2-runtime
 Enhances: ant-optional
 Description: lexical analyzer generator for Java
  It is also a rewrite of the very useful tool JLex which was developed 

Modified: trunk/jflex/debian/patches/03_build_xml_target.patch
===================================================================
--- trunk/jflex/debian/patches/03_build_xml_target.patch	2009-01-08 17:45:11 UTC (rev 7798)
+++ trunk/jflex/debian/patches/03_build_xml_target.patch	2009-01-09 10:47:09 UTC (rev 7799)
@@ -1,11 +1,13 @@
---- jflex/src/build.xml.orig	2006-01-16 11:38:18.000000000 +0100
-+++ jflex/src/build.xml	2006-01-16 11:40:24.000000000 +0100
-@@ -59,7 +59,7 @@
+--- jflex/src/build.xml~	2009-01-09 10:32:36.000000000 +0000
++++ jflex/src/build.xml	2009-01-09 10:34:58.000000000 +0000
+@@ -64,8 +64,8 @@
            description="compile all classes">
      <javac srcdir="." 
             destdir="../lib" 
 -           target="1.1"
-+           target="1.3" source="1.3"
-            classpath="."
+-    	     source="1.2"
++           target="1.3"
++           source="1.3"
+            classpath=".:${junit.jar}"
             debug="on" />
    </target>

Modified: trunk/jflex/debian/rules
===================================================================
--- trunk/jflex/debian/rules	2009-01-08 17:45:11 UTC (rev 7798)
+++ trunk/jflex/debian/rules	2009-01-09 10:47:09 UTC (rev 7799)
@@ -7,7 +7,7 @@
 
 export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit