[pkg-java] r5645 - trunk/javacc/debian/patches
paulcager-guest at alioth.debian.org
paulcager-guest at alioth.debian.org
Thu Feb 7 22:26:25 UTC 2008
Author: paulcager-guest
Date: 2008-02-07 22:26:25 +0000 (Thu, 07 Feb 2008)
New Revision: 5645
Added:
trunk/javacc/debian/patches/executables.patch
trunk/javacc/debian/patches/javacctarget.patch
Removed:
trunk/javacc/debian/patches/00list
trunk/javacc/debian/patches/executables.dpatch
trunk/javacc/debian/patches/javacctarget.dpatch
Log:
Convert dpatches to simple-patch-system names
Deleted: trunk/javacc/debian/patches/00list
===================================================================
--- trunk/javacc/debian/patches/00list 2008-02-07 15:30:45 UTC (rev 5644)
+++ trunk/javacc/debian/patches/00list 2008-02-07 22:26:25 UTC (rev 5645)
@@ -1,2 +0,0 @@
-executables.dpatch
-javacctarget.dpatch
Deleted: trunk/javacc/debian/patches/executables.dpatch
===================================================================
--- trunk/javacc/debian/patches/executables.dpatch 2008-02-07 15:30:45 UTC (rev 5644)
+++ trunk/javacc/debian/patches/executables.dpatch 2008-02-07 22:26:25 UTC (rev 5645)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## executables.dpatch by Paul Cager <paul-debian at home.paulcager.org>
-##
-## DP: Change executables to look for Jar in /usr/share/java
-
- at DPATCH@
-diff -urNad javacc_4.0+cvs20070207~/bin/javacc javacc_4.0+cvs20070207/bin/javacc
---- javacc_4.0+cvs20070207~/bin/javacc 2005-04-30 08:08:06.000000000 +0100
-+++ javacc_4.0+cvs20070207/bin/javacc 2007-02-28 22:36:33.000000000 +0000
-@@ -1,9 +1,5 @@
- #!/bin/sh
--JAR="`dirname $0`/lib/javacc.jar"
--
--case "`uname`" in
-- CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
--esac
-+JAR=/usr/share/java/javacc.jar
-
- java -classpath "$JAR" javacc "$@"
-
-diff -urNad javacc_4.0+cvs20070207~/bin/jjdoc javacc_4.0+cvs20070207/bin/jjdoc
---- javacc_4.0+cvs20070207~/bin/jjdoc 2005-04-30 08:08:07.000000000 +0100
-+++ javacc_4.0+cvs20070207/bin/jjdoc 2007-02-28 22:36:50.000000000 +0000
-@@ -1,9 +1,5 @@
- #!/bin/sh
--JAR="`dirname $0`/lib/javacc.jar"
--
--case "`uname`" in
-- CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
--esac
-+JAR=/usr/share/java/javacc.jar
-
- java -classpath "$JAR" jjdoc "$@"
-
-diff -urNad javacc_4.0+cvs20070207~/bin/jjtree javacc_4.0+cvs20070207/bin/jjtree
---- javacc_4.0+cvs20070207~/bin/jjtree 2005-04-30 08:08:07.000000000 +0100
-+++ javacc_4.0+cvs20070207/bin/jjtree 2007-02-28 22:36:59.000000000 +0000
-@@ -1,9 +1,5 @@
- #!/bin/sh
--JAR="`dirname $0`/lib/javacc.jar"
--
--case "`uname`" in
-- CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
--esac
-+JAR=/usr/share/java/javacc.jar
-
- java -classpath "$JAR" jjtree "$@"
-
Copied: trunk/javacc/debian/patches/executables.patch (from rev 5644, trunk/javacc/debian/patches/executables.dpatch)
===================================================================
--- trunk/javacc/debian/patches/executables.patch (rev 0)
+++ trunk/javacc/debian/patches/executables.patch 2008-02-07 22:26:25 UTC (rev 5645)
@@ -0,0 +1,42 @@
+diff -urNad javacc_4.0+cvs20070207~/bin/javacc javacc_4.0+cvs20070207/bin/javacc
+--- javacc_4.0+cvs20070207~/bin/javacc 2005-04-30 08:08:06.000000000 +0100
++++ javacc_4.0+cvs20070207/bin/javacc 2007-02-28 22:36:33.000000000 +0000
+@@ -1,9 +1,5 @@
+ #!/bin/sh
+-JAR="`dirname $0`/lib/javacc.jar"
+-
+-case "`uname`" in
+- CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
+-esac
++JAR=/usr/share/java/javacc.jar
+
+ java -classpath "$JAR" javacc "$@"
+
+diff -urNad javacc_4.0+cvs20070207~/bin/jjdoc javacc_4.0+cvs20070207/bin/jjdoc
+--- javacc_4.0+cvs20070207~/bin/jjdoc 2005-04-30 08:08:07.000000000 +0100
++++ javacc_4.0+cvs20070207/bin/jjdoc 2007-02-28 22:36:50.000000000 +0000
+@@ -1,9 +1,5 @@
+ #!/bin/sh
+-JAR="`dirname $0`/lib/javacc.jar"
+-
+-case "`uname`" in
+- CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
+-esac
++JAR=/usr/share/java/javacc.jar
+
+ java -classpath "$JAR" jjdoc "$@"
+
+diff -urNad javacc_4.0+cvs20070207~/bin/jjtree javacc_4.0+cvs20070207/bin/jjtree
+--- javacc_4.0+cvs20070207~/bin/jjtree 2005-04-30 08:08:07.000000000 +0100
++++ javacc_4.0+cvs20070207/bin/jjtree 2007-02-28 22:36:59.000000000 +0000
+@@ -1,9 +1,5 @@
+ #!/bin/sh
+-JAR="`dirname $0`/lib/javacc.jar"
+-
+-case "`uname`" in
+- CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
+-esac
++JAR=/usr/share/java/javacc.jar
+
+ java -classpath "$JAR" jjtree "$@"
+
Deleted: trunk/javacc/debian/patches/javacctarget.dpatch
===================================================================
--- trunk/javacc/debian/patches/javacctarget.dpatch 2008-02-07 15:30:45 UTC (rev 5644)
+++ trunk/javacc/debian/patches/javacctarget.dpatch 2008-02-07 22:26:25 UTC (rev 5645)
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## executables.dpatch by Paul Cager <paul-debian at home.paulcager.org>
-##
-## DP: Change javacc task to use target=1.4
-
- at DPATCH@
-diff -urNad javacc_4.0+cvs20070207~/src/org/javacc/parser/build.xml javacc_4.0+cvs20070207/src/org/javacc/parser/build.xml
---- javacc-4.0+cvs20070207.orig/src/org/javacc/parser/build.xml
-+++ javacc-4.0+cvs20070207/src/org/javacc/parser/build.xml
-@@ -53,6 +53,7 @@
- destdir="${javacc.root}/classes"
- debug="${build.compiler.debug}"
- source="1.4"
-+ target="1.4"
- classpath="${javacc.root}/classes:${junit.jar}">
- </javac>
- </target>
Copied: trunk/javacc/debian/patches/javacctarget.patch (from rev 5644, trunk/javacc/debian/patches/javacctarget.dpatch)
===================================================================
--- trunk/javacc/debian/patches/javacctarget.patch (rev 0)
+++ trunk/javacc/debian/patches/javacctarget.patch 2008-02-07 22:26:25 UTC (rev 5645)
@@ -0,0 +1,11 @@
+diff -urNad javacc_4.0+cvs20070207~/src/org/javacc/parser/build.xml javacc_4.0+cvs20070207/src/org/javacc/parser/build.xml
+--- javacc-4.0+cvs20070207.orig/src/org/javacc/parser/build.xml
++++ javacc-4.0+cvs20070207/src/org/javacc/parser/build.xml
+@@ -53,6 +53,7 @@
+ destdir="${javacc.root}/classes"
+ debug="${build.compiler.debug}"
+ source="1.4"
++ target="1.4"
+ classpath="${javacc.root}/classes:${junit.jar}">
+ </javac>
+ </target>
More information about the pkg-java-commits
mailing list