[jasmin-sable] 41/78: Support most recent "cup" package (Closes: #538860, 538861)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jasmin-sable.

commit 52a69ce58eb33d57e890a692aeaecd2135feaf52
Author: Chris Lamb <lamby at debian.org>
Date:   Mon Jul 27 19:01:33 2009 +0200

    Support most recent "cup" package (Closes: #538860, 538861)
---
 debian/changelog                        |  7 +++++++
 debian/patches/03-cup-0-11-support.diff | 17 +++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 619600f..ff4cba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jasmin-sable (2.3.0-3) UNRELEASED; urgency=low
+
+  * Support most recent "cup" package (Closes: #538860, #538861)
+    - Add 03-cup-0-11-support.diff to support newest CUP package.
+
+ -- Chris Lamb <lamby at debian.org>  Mon, 27 Jul 2009 18:59:27 +0200
+
 jasmin-sable (2.3.0-2) unstable; urgency=low
 
   * New maintainer email address.
diff --git a/debian/patches/03-cup-0-11-support.diff b/debian/patches/03-cup-0-11-support.diff
new file mode 100644
index 0000000..a041513
--- /dev/null
+++ b/debian/patches/03-cup-0-11-support.diff
@@ -0,0 +1,17 @@
+
+ Don't pass (ClassFile, Scanner) to a (Scanner, SymbolFactory) constructor.
+
+ -- Chris Lamb <lamby at debian.org>  Mon, 27 Jul 2009 18:57:32 +0200
+
+diff -urNad /tmp/bp-build/jasmin-sable-2.3.0.orig/src/jasmin/parser.java /tmp/bp-build/jasmin-sable-2.3.0/src/jasmin/parser.java
+--- jasmin-sable-2.3.0.orig/src/jasmin/parser.java	2009-07-27 18:54:15.000000000 +0200
++++ jasmin-sable-2.3.0/src/jasmin/parser.java	2009-07-27 18:54:35.000000000 +0200
+@@ -616,7 +616,7 @@
+ 	}
+ 
+ 	parser(ClassFile classFile, Scanner scanner) {
+-	    super();
++	    super(scanner);
+ 
+ 	    this.scanner = scanner;
+ 	    this.classFile = classFile;
diff --git a/debian/patches/series b/debian/patches/series
index 50388ea..2298e5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-ant-settings.diff
 02-jasmin-executable.diff
+03-cup-0-11-support.diff

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