This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mauve.
commit 84ed31d30f305d5850bff0efd6e4db1916def700 Author: Andreas Tille <[email protected]> Date: Thu Apr 30 13:17:32 2015 +0200 Do not reference ext/ dir (where *.jar files formerly resided) at all to let the build will work --- debian/patches/no_ext_dir_at_all.patch | 72 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 73 insertions(+) diff --git a/debian/patches/no_ext_dir_at_all.patch b/debian/patches/no_ext_dir_at_all.patch new file mode 100644 index 0000000..abe5543 --- /dev/null +++ b/debian/patches/no_ext_dir_at_all.patch @@ -0,0 +1,72 @@ +--- a/build.xml ++++ b/build.xml +@@ -29,7 +29,6 @@ + <property name="src" location="src"/> + <property name="build" location="bin"/> + <property name="dist" location="dist"/> +- <property name="ext" location="ext"/> + <property name="deblib" location="/usr/share/java" /> + <property name="support" location="/usr/share/java"/> + +@@ -104,18 +103,6 @@ + </target> + + <target name="jar" depends="rmic"> +- <!-- Make list of external dependencies --> +- <fileset dir="${ext}" id="ext.jars"> +- <include name="**/*.jar"/> +- </fileset> +- <pathconvert pathsep=" " property="ext.path" refid="ext.jars"> +- <mapper> +- <chainedmapper> +- <mapper type="flatten" /> +- <mapper type="glob" from="*.jar" to="ext/*.jar"/> +- </chainedmapper> +- </mapper> +- </pathconvert> + + <!-- Put everything in ${build} into the Mauve.jar file --> + <delete file="Mauve.jar"/> +@@ -126,7 +113,6 @@ + <manifest> + <attribute name="Main-Class" value="org.gel.mauve.gui.Mauve"/> + <attribute name="Built-By" value="${user.name}"/> +- <attribute name="Class-Path" value="${ext.path}" /> + <section name="common"> + <attribute name="Specification-Title" value="Mauve"/> + <attribute name="Specification-Version" value="${version}"/> +@@ -161,14 +147,6 @@ + <signjar jar="mauveApplet.jar" alias="${key.alias}" storepass="${key.password}" keystore="${key.keystore}" /> + </target> + +- <target name="signextjars" depends="checkkeyprops"> +- <signjar alias="${key.alias}" storepass="${key.password}" keystore="${key.keystore}"> +- <fileset dir="./ext"> +- <include name="*.jar" /> +- </fileset> +- </signjar> +- </target> +- + <target name="testdist" depends="signjars"> + <copy todir="C:\htdocs" file="Mauve.jar" /> + <copy todir="C:\htdocs" file="mauveApplet.jar" /> +@@ -205,7 +183,6 @@ + <include name="mauveAligner" /> + <include name="progressiveMauve" /> + </tarfileset> +- <tarfileset dir="${ext}" prefix="/mauve_${release.version}/ext" includes="*.jar" /> + </tar> + </target> + +@@ -238,11 +215,6 @@ + + <target name="asapResources"> + <pathconvert property="asap.resources" pathsep=" "> +- <path> +- <fileset dir="./ext"> +- <include name="*.jar" /> +- </fileset> +- </path> + <mapper> + <chainedmapper> + <mapper type="flatten" /> diff --git a/debian/patches/series b/debian/patches/series index 4e25b6c..296e1c5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ build_xml.patch debian_classes.patch use_JConsole_of_zeus-jscl_properly.patch do_not_use_goose_jar.patch +no_ext_dir_at_all.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mauve.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
