[jasmin-sable] 03/78: Incorporate patches from Debian diff.

[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 2a197c21f86f6ac24127f81d99bb8570fce3c665
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Feb 8 08:46:43 2008 +0000

    Incorporate patches from Debian diff.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
---
 debian/changelog                |  6 ++++++
 debian/patches/01-compile.diff  | 12 ++++++++++++
 debian/patches/02-makefile.diff | 40 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  2 ++
 4 files changed, 60 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9a80667..f26d43a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jasmin-sable (1.2-3) unstable; urgency=low
+
+  * Move patches from Debian .diff.gz to quilt.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk>  Fri, 08 Feb 2008 08:45:38 +0000
+
 jasmin-sable (1.2-2) unstable; urgency=low
 
   * Larning to read bugreports with comprehension. Added 'fastjar' to
diff --git a/debian/patches/01-compile.diff b/debian/patches/01-compile.diff
new file mode 100644
index 0000000..92f34da
--- /dev/null
+++ b/debian/patches/01-compile.diff
@@ -0,0 +1,12 @@
+--- jasmin-sable-1.2.orig/lib/jas/src/compile.sh
++++ jasmin-sable-1.2/lib/jas/src/compile.sh
+@@ -41,7 +41,7 @@
+ echo "Compiling autogenerator..."
+ (cd scm/autogen; ${JAVAC} -d . autogen.java; cp autogen.class ..)
+ echo "Creating scm/jas interface..."
+-(cd scm; ${JAVA} -cp .:${CLASSPATH} autogen; cp autogen.class ${TARGET})
++(cd scm; ${JAVA} -cp .:${CLASSPATH}:autogen autogen; cp autogen.class ${TARGET})
+ 
+ # Compile scm package
+ 
+
diff --git a/debian/patches/02-makefile.diff b/debian/patches/02-makefile.diff
new file mode 100644
index 0000000..6702406
--- /dev/null
+++ b/debian/patches/02-makefile.diff
@@ -0,0 +1,40 @@
+--- jasmin-sable-1.2.orig/Makefile
++++ jasmin-sable-1.2/Makefile
+@@ -0,0 +1,37 @@
++# Helper makefile by Grzegorz B. Prokopski <gadek at debian.org>
++# Written for Debian package, available under FSF's LGPL conditions
++
++all: compile
++
++
++clean:
++	rm -f ./compile-stamp ./jasmin-sable.jar
++	find ./classes -name \*.class |xargs rm -f
++	find ./lib/cup/classes -name \*.class |xargs rm -f
++	find ./lib/jas/classes -name \*.class |xargs rm -f
++	find ./lib/jas/src/scm -name \*.class |xargs rm -f
++	rm -f ./src/jasmin/parser.java ./src/jasmin/sym.java
++
++compile: compile-stamp
++
++compile-stamp:
++	./bin/compile_all.sh
++	fastjar -c -f ./jasmin-sable.jar -C classes .
++	touch ./compile-stamp
++
++install: compile-stamp
++	@(if [ "X$$PREFIX" == "X" ]; then \
++	  echo 'use something like: make install PREFIX=/usr/local [ DEST=/tmp/usr ]'; \
++	else \
++	  if [ "X$$DEST" == "X" ]; then DEST=$$PREFIX; fi; \
++	  echo installing jasmin for $PREFIX in $$DEST  : bin/jasmin, share/java/jasmin-sable.jar ;\
++	  set -e; \
++	  mkdir -p $$DEST/share/java $$DEST/bin $$DEST/share/doc/jasmin-sable/examples; \
++	  cp ./examples/* $$DEST/share/doc/jasmin-sable/examples; \
++	  cp -f ./jasmin-sable.jar $$DEST/share/java/jasmin-sable.jar; \
++	  echo '#! /bin/sh' >$$DEST/bin/jasmin; \
++	  echo -n "exec java -cp $$PREFIX/share/java/jasmin-sable.jar jasmin.Main " >>$$DEST/bin/jasmin; \
++	  echo '$$*' >>$$DEST/bin/jasmin; \
++	  chmod +x $$DEST/bin/jasmin; \
++	  echo "jasmin is now installed no your system"; \
++	fi)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6676629
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-compile.diff
+02-makefile.diff

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