This is an automated email from the git hooks/post-receive script. stuart pushed a commit to branch master in repository latexdraw.
commit d3fd8419edd695cf119aee40616dd6783918d11d Author: Stuart Prescott <[email protected]> Date: Tue Nov 10 01:18:09 2015 +1100 Refresh patches --- debian/patches/build_system.patch | 116 --------------------- .../patches/disable_update_available_check.patch | 12 --- debian/patches/disable_update_checker.patch | 11 ++ debian/patches/latexdraw_shell_script.patch | 3 +- debian/patches/series | 3 +- 5 files changed, 14 insertions(+), 131 deletions(-) diff --git a/debian/patches/build_system.patch b/debian/patches/build_system.patch deleted file mode 100644 index 2a5062b..0000000 --- a/debian/patches/build_system.patch +++ /dev/null @@ -1,116 +0,0 @@ -Alter build system to make use of external libraries rather than bundling them into jar file. ---- a/build.xml -+++ b/build.xml -@@ -5,9 +5,9 @@ - <property name="dir.report" value="out/report"/> - <property name="dir.doc" location="doc"/> - <property name="release.name" value="LaTeXDraw2.0.8" /> -- -+ - <!-- Creates the output directories --> -- <target name="prepare"> -+ <target name="prepare"> - <mkdir dir="${dir.out}"/> - <mkdir dir="${dir.report}"/> - <mkdir dir="${dir.data}/.cache"/> -@@ -15,7 +15,7 @@ - <mkdir dir="${dir.out}/${release.name}_src"/> - <mkdir dir="${dir.out}/${release.name}"/> - </target> -- -+ - <target name="doc" depends="jar" description="Generation of the documentation."> - <javadoc destdir="${dir.doc}" author="true" version="true" use="true" - notree="false" nonavbar="false" noindex="false" access="private"> -@@ -25,47 +25,50 @@ - </fileset> - </javadoc> - </target> -- -- -- -+ -+ -+ <path id="classpathlib"> -+ <fileset dir="${lib.dir}" includes="**/*.jar"/> -+ </path> -+ -+ <target name="compile"> -+ <javac srcdir="latexDraw" destdir="" classpathref="classpathlib" debug="on" encoding="utf8" target="1.6" source="1.6" /> -+ </target> -+ - <!-- Creates the jar --> - <target name="jar" description="Generates latexdraw.jar"> - <!-- copies the librairies --> - <copy todir="${dir.data}/help/" overwrite="true" failonerror="true"> - <fileset dir="help/" /> - </copy> -- -- <copy todir="${dir.data}/lib/" overwrite="true" failonerror="true"> -- <fileset dir="lib/" /> -- </copy> -- -+ - <copy todir="${dir.out}/" overwrite="true" failonerror="true"> - <fileset dir="" includes="license.txt ; release_note.txt ; readme.txt ; install_vista.vbs ; install_debian_ubuntu"/> - </copy> -- -+ - <copy todir="${dir.data}/.cache" overwrite="true" failonerror="true"> - <fileset dir=".cache/"/> - </copy> -- -+ - <copy todir="${dir.data}/templates" overwrite="true" failonerror="true"> - <fileset dir="templates/"/> - </copy> -- -+ - <jar jarfile="${dir.data}/LaTeXDraw.jar" manifest="META-INF/MANIFEST.MF"> - <!-- Creates the manifest --> - <manifest> - <attribute name="Main-Class" value="latexDraw.ui.LaTeXDraw"/> -- <attribute name="Class-Path" value="lib/net.sourceforge.jiu.jar lib/jlibeps.jar ./ help/"/> -+ <attribute name="Class-Path" value="net.sourceforge.jiu.jar net.sourceforge.jlibeps.jar"/> - </manifest> -- -+ - <!-- Filters the files --> - <fileset dir="" -- includes="latexDraw/**/*.class ; res/**/* ; lang/**/*" -+ includes="latexDraw/**/*.class ; res/**/* ; lang/**/* ; release_note.txt ; license.txt" - excludes="latexDraw/**/*.java ; latexDraw/installer/* ; latexDraw/ui/listeners/InstallerListener.*"/> - </jar> - </target> -- -- -+ -+ - - <target name="zip src" depends="jar"> - <copy todir="out/${release.name}_src"> -@@ -76,16 +79,16 @@ - </zip> - <delete dir="out/${release.name}_src" /> - </target> -- -- -+ -+ - <target name="zip jar" depends="zip src"> - <copy todir="out/${release.name}"> - <fileset dir="out/" includes="data/ ; install_vista.vbs ; *.txt ; *.jar ; install_debian_ubuntu" /> -- </copy> -- <zip destfile="${dir.out}/${release.name}.zip" compress="true"> -- <fileset dir="out/" includes="${release.name}/"/> -+ </copy> -+ <zip destfile="${dir.out}/${release.name}.zip" compress="true"> -+ <fileset dir="out/" includes="${release.name}/"/> - </zip> -- <delete dir="out/${release.name}" /> -- </target> -- -+ <delete dir="out/${release.name}" /> -+ </target> -+ - </project> diff --git a/debian/patches/disable_update_available_check.patch b/debian/patches/disable_update_available_check.patch deleted file mode 100644 index 42beb1c..0000000 --- a/debian/patches/disable_update_available_check.patch +++ /dev/null @@ -1,12 +0,0 @@ -Disable LaTeXDraw's built-in update notifier that checks to see if a new version is available. ---- a/latexDraw/ui/LaTeXDrawFrame.java -+++ b/latexDraw/ui/LaTeXDrawFrame.java -@@ -68,7 +68,7 @@ - public final static String VERSION_STABILITY = ""; //$NON-NLS-1$ - - /** To change if update is needed or not. */ -- public static final boolean WITH_UPDATE = true; -+ public static final boolean WITH_UPDATE = false; - - public static final Insets INSET_BUTTON = new Insets(1,1,1,1); - diff --git a/debian/patches/disable_update_checker.patch b/debian/patches/disable_update_checker.patch new file mode 100644 index 0000000..0b497ab --- /dev/null +++ b/debian/patches/disable_update_checker.patch @@ -0,0 +1,11 @@ +--- a/src/main/net/sf/latexdraw/util/VersionChecker.java ++++ b/src/main/net/sf/latexdraw/util/VersionChecker.java +@@ -49,7 +49,7 @@ + public static final String ID_BUILD = "20141123";//$NON-NLS-1$ + + /** To change if update is needed or not. */ +- public static final boolean WITH_UPDATE = true; ++ public static final boolean WITH_UPDATE = false; + + /** The path of the file containing the news */ + public static final String PATH_MSG = "http://latexdraw.sourceforge.net/news.txt";; //$NON-NLS-1$ diff --git a/debian/patches/latexdraw_shell_script.patch b/debian/patches/latexdraw_shell_script.patch index 53526a2..3a66ae4 100644 --- a/debian/patches/latexdraw_shell_script.patch +++ b/debian/patches/latexdraw_shell_script.patch @@ -1,4 +1,5 @@ -Create a script for /usr/bin/latexdraw with a sensible JRE (regardless of how the alternatives have been set). +Description: Create a script for /usr/bin/latexdraw with a sensible JRE (regardless of how the alternatives have been set). + --- /dev/null +++ b/latexdraw @@ -0,0 +1,20 @@ diff --git a/debian/patches/series b/debian/patches/series index d561542..740c3d3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ latexdraw_shell_script.patch -disable_update_available_check.patch -build_system.patch +disable_update_checker.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/latexdraw.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
