On 17 June 2010 23:34, Torsten Werner <[email protected]> wrote:
> Hi Julien,
Hi,
>
> On Tue, Jun 15, 2010 at 11:19 AM, Julien Wajsberg <[email protected]> wrote:
>> Then an obvious solution would be to rename the symlink to mimic
>> Apache's official distribution.
>
> may you provide a patch for the source package, please?
Actually, here is a patch to the debian tar.gz.
I can't provide directly a patch because the problem lies in debian's
specific files (links and some patches).
I tested these changes on both the project which caused problems and a
project which worked perfectly before, and both works now.
Cheers,
--
Julien
diff -ur debian-old//debian/maven2.links debian/debian/maven2.links
--- debian-old//debian/maven2.links 2010-05-16 13:15:04.000000000 +0200
+++ debian/debian/maven2.links 2010-06-22 15:16:17.000000000 +0200
@@ -5,5 +5,5 @@
/usr/bin/mvn /usr/share/maven2/bin/mvn
/usr/bin/mvnDebug /usr/share/maven2/bin/mvnDebug
-/usr/share/java/classworlds.jar usr/share/maven2/boot/classworlds.jar
+/usr/share/java/classworlds.jar usr/share/maven2/boot/classworlds-1.1.jar
diff -ur debian-old//debian/patches/mvn-cmd.patch debian/debian/patches/mvn-cmd.patch
--- debian-old//debian/patches/mvn-cmd.patch 2010-05-16 13:15:03.000000000 +0200
+++ debian/debian/patches/mvn-cmd.patch 2010-06-22 15:16:33.000000000 +0200
@@ -81,12 +81,3 @@
fi
fi
-@@ -156,7 +227,7 @@
-
- exec "$JAVACMD" \
- $MAVEN_OPTS \
-- -classpath "${M2_HOME}"/boot/classworlds-*.jar \
-+ -classpath "${M2_HOME}"/boot/classworlds.jar \
- "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
- "-Dmaven.home=${M2_HOME}" \
- ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
diff -ur debian-old//debian/patches/mvnDebug-cmd.patch debian/debian/patches/mvnDebug-cmd.patch
--- debian-old//debian/patches/mvnDebug-cmd.patch 2010-05-16 13:15:03.000000000 +0200
+++ debian/debian/patches/mvnDebug-cmd.patch 2010-06-22 15:16:48.000000000 +0200
@@ -90,14 +90,3 @@
fi
fi
-@@ -161,9 +232,8 @@
- exec "$JAVACMD" \
- $MAVEN_OPTS \
- $MAVEN_DEBUG_OPTS \
-- -classpath "${M2_HOME}"/boot/classworlds-*.jar \
-+ -classpath "${M2_HOME}"/boot/classworlds.jar \
- "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
- "-Dmaven.home=${M2_HOME}" \
- ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
-
--
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers>. Please
use
[email protected] for discussions and questions.
