[jflex] 14/33: * New upstream (bug fix) release. * Build-depend on default-jdk, depend on default-jre-headless. * debian/patches/03_build_xml_target.patch: Update.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository jflex.

commit 4cdee785d06608f6acce50b7eb2b0902604d801f
Author: Matthias Klose <doko at debian.org>
Date:   Fri Jan 9 10:47:09 2009 +0000

      * New upstream (bug fix) release.
      * Build-depend on default-jdk, depend on default-jre-headless.
      * debian/patches/03_build_xml_target.patch: Update.
---
 debian/changelog                         | 10 ++++++++--
 debian/control                           |  4 ++--
 debian/patches/03_build_xml_target.patch | 12 +++++++-----
 debian/rules                             |  2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb4e92d..ecd2cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 @@ jflex (1.4.1-4) UNRELEASED; urgency=low
   * 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
 
diff --git a/debian/control b/debian/control
index 9908793..a5a951b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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 @@ Homepage: http://www.jflex.de/
 
 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 
diff --git a/debian/patches/03_build_xml_target.patch b/debian/patches/03_build_xml_target.patch
index 91f020e..c36d56c 100644
--- a/debian/patches/03_build_xml_target.patch
+++ b/debian/patches/03_build_xml_target.patch
@@ -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>
diff --git a/debian/rules b/debian/rules
index c8f704e..2620f41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jflex.git