[jasmin-sable] 02/08: Refreshed the patches

[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 39387447daf8a9e342c2ad35350ae283c1d67941
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Mar 29 18:14:17 2016 +0200

    Refreshed the patches
---
 debian/changelog                         |  4 +++-
 debian/patches/01-ant-settings.diff      | 17 -----------------
 debian/patches/04-fix-field-support.diff |  7 +++----
 debian/patches/series                    |  1 -
 debian/rules                             |  2 +-
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7851f5a..325a495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-jasmin-sable (2.4.0-6) UNRELEASED; urgency=medium
+jasmin-sable (2.5.0-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Refreshed the patches
   * Standards-Version updated to 3.9.7 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/patches/01-ant-settings.diff b/debian/patches/01-ant-settings.diff
deleted file mode 100644
index 1559b57..0000000
--- a/debian/patches/01-ant-settings.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-
-  * Use cup.jar from Debian's "cup" package.
-
- -- Chris Lamb <chris at chris-lamb.co.uk>  Sun, 10 Feb 2008 16:19:10 +0000
-
-diff -urNad jasmin-sable-2.2.4.orig/ant.settings jasmin-sable-2.2.4/ant.settings
---- jasmin-sable-2.2.4.orig/ant.settings	2008-02-10 16:18:16.000000000 +0000
-+++ jasmin-sable-2.2.4/ant.settings	2008-02-10 16:18:31.000000000 +0000
-@@ -1,6 +1,6 @@
- ## Location of Java Cup classes jar file to link Jasmin against
- # either classes dir or jar - note polyglot comes with cup-classes
--java_cup.jar=../polyglot/lib/java_cup.jar
-+java_cup.jar=/usr/share/java/cup.jar
- 
- # Location in which to generate Jasmin release tarballs
- release.loc=lib
-
diff --git a/debian/patches/04-fix-field-support.diff b/debian/patches/04-fix-field-support.diff
index 6afd8f1..0d2dd30 100644
--- a/debian/patches/04-fix-field-support.diff
+++ b/debian/patches/04-fix-field-support.diff
@@ -3,10 +3,9 @@
 
  -- Chris Lamb <lamby at debian.org>  Thu, 30 Jul 2009 15:28:41 +0200
 
-diff -urNad /tmp/bp-build/jasmin-sable.orig/src/jasmin/parser.cup /tmp/bp-build/jasmin-sable/src/jasmin/parser.cup
---- jasmin-sable.orig/src/jasmin/parser.cup	2009-07-30 15:18:09.000000000 +0200
-+++ jasmin-sable/src/jasmin/parser.cup	2009-07-30 15:18:41.000000000 +0200
-@@ -298,22 +298,22 @@
+--- a/src/jasmin/parser.cup
++++ b/src/jasmin/parser.cup
+@@ -297,22 +297,22 @@
  field_item ::= field_spec field_attrs | field_spec;
  
  field_spec ::=
diff --git a/debian/patches/series b/debian/patches/series
index 5e2524b..4920206 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-ant-settings.diff
 02-jasmin-executable.diff
 03-cup-0-11-support.diff
 04-fix-field-support.diff
diff --git a/debian/rules b/debian/rules
index 13c251b..9f9fef9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ endif
 
 override_dh_auto_build:
 	mkdir -p classes
-	ant build_parser jasmin-jar
+	ant -Djava_cup.jar=/usr/share/java/cup.jar build_parser jasmin-jar
 
 override_dh_auto_clean:
 	ant clean

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