[jhighlight] 01/01: Imported Debian patch 1.0-3

Markus Koschany apo at moszumanska.debian.org
Wed Jul 27 14:46:04 UTC 2016


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

apo pushed a commit to branch master
in repository jhighlight.

commit bfd47e2ac8b1dcba3a620cc33cf33b803762539c
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jul 27 16:38:21 2016 +0200

    Imported Debian patch 1.0-3
---
 debian/changelog                 |  7 +++++++
 debian/patches/jflex-1.6.1.patch | 22 ++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 46943e6..3c61425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jhighlight (1.0-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS by adjusting the jflex classname in build.xml.
+
+ -- Markus Koschany <apo at debian.org>  Wed, 27 Jul 2016 16:38:21 +0200
+
 jhighlight (1.0-2) unstable; urgency=medium
 
   * Transition to the Servlet API 3.1
diff --git a/debian/patches/jflex-1.6.1.patch b/debian/patches/jflex-1.6.1.patch
new file mode 100644
index 0000000..9ae8852
--- /dev/null
+++ b/debian/patches/jflex-1.6.1.patch
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 27 Jul 2016 16:36:26 +0200
+Subject: jflex 1.6.1
+
+Fix FTBFS by adjusting the jflex classname
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 37ce83e..94ee170 100644
+--- a/build.xml
++++ b/build.xml
+@@ -36,7 +36,7 @@
+ 		</fileset>
+ 	</path>
+ 
+-	<taskdef classname="JFlex.anttask.JFlexTask" name="jflex" classpathref="lib.classpath"/>
++	<taskdef classname="jflex.anttask.JFlexTask" name="jflex" classpathref="lib.classpath"/>
+ 	
+ 	<!-- =================================================================== -->
+ 	<!-- Initialization target                                               -->
diff --git a/debian/patches/series b/debian/patches/series
index 470ccda..23b5dc7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-generate-highlighter.patch
 02-servlet-3.1-compatibility.patch
+jflex-1.6.1.patch

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



More information about the pkg-java-commits mailing list