[latexdraw] 72/147: * convert build system to quilt
Stuart Prescott
stuart at debian.org
Thu Nov 24 23:53:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
stuart pushed a commit to branch master
in repository latexdraw.
commit 00dedd296192b4561fb78a5864743106058bdd75
Author: Stuart Prescott <stuart at debian.org>
Date: Sun May 3 22:50:37 2009 +0000
* convert build system to quilt
---
build.xml | 16 +++-----
debian/changelog | 6 +++
debian/control | 2 +-
debian/patches/build_system.patch | 44 ++++++++++++++++++++++
.../patches/disable_update_available_check.patch | 12 ++++++
debian/patches/latexdraw_shell_script.patch | 33 ++++++++++++++++
debian/patches/series | 3 ++
debian/rules | 6 ++-
latexDraw/ui/LaTeXDrawFrame.java | 2 +-
latexdraw | 29 --------------
10 files changed, 110 insertions(+), 43 deletions(-)
diff --git a/build.xml b/build.xml
index e1cc345..afd5238 100644
--- a/build.xml
+++ b/build.xml
@@ -16,14 +16,6 @@
<mkdir dir="${dir.out}/${release.name}"/>
</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>
-
<target name="junit" description="Launches the junit tests." depends="junit check, prepare">
<junit printsummary="on" fork="false" haltonfailure="false"
failureproperty="tests.failed" showoutput="true">
@@ -68,6 +60,10 @@
<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>
@@ -84,12 +80,12 @@
<!-- Creates the manifest -->
<manifest>
<attribute name="Main-Class" value="latexDraw.ui.LaTeXDraw"/>
- <attribute name="Class-Path" value="net.sourceforge.jiu.jar net.sourceforge.jlibeps.jar txt cache .cache/ templates .templates/ help /usr/share/doc/latexdraw/"/>
+ <attribute name="Class-Path" value="lib/net.sourceforge.jiu.jar lib/jlibeps.jar ./ help/"/>
</manifest>
<!-- Filters the files -->
<fileset dir=""
- includes="latexDraw/**/*.class ; res/**/* ; lang/**/* ; release_note.txt ; license.txt"
+ includes="latexDraw/**/*.class ; res/**/* ; lang/**/*"
excludes="latexDraw/**/*.java ; latexDraw/installer/* ; latexDraw/ui/listeners/InstallerListener.*"/>
</jar>
</target>
diff --git a/debian/changelog b/debian/changelog
index 300cc92..dc6aa7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+latexdraw (2.0.2+1-2) unstable; urgency=low
+
+ * Convert packaging to quilt.
+
+ -- Stuart Prescott <stuart+debian at nanonanonano.net> Sun, 03 May 2009 23:49:35 +0100
+
latexdraw (2.0.2+1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 9fa0c71..d9f58a5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: latexdraw
Section: graphics
Priority: optional
Maintainer: Stuart Prescott <stuart+debian at nanonanonano.net>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt
Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk,
ant,
imagemagick,
diff --git a/debian/patches/build_system.patch b/debian/patches/build_system.patch
new file mode 100644
index 0000000..c592523
--- /dev/null
+++ b/debian/patches/build_system.patch
@@ -0,0 +1,44 @@
+Alter build system to make use of external libraries rather than bundling them into jar file.
+--- trunk.orig/build.xml
++++ trunk/build.xml
+@@ -16,6 +16,14 @@
+ <mkdir dir="${dir.out}/${release.name}"/>
+ </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>
++
+ <target name="junit" description="Launches the junit tests." depends="junit check, prepare">
+ <junit printsummary="on" fork="false" haltonfailure="false"
+ failureproperty="tests.failed" showoutput="true">
+@@ -60,10 +68,6 @@
+ <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>
+@@ -80,12 +84,12 @@
+ <!-- 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 txt cache .cache/ templates .templates/ help /usr/share/doc/latexdraw/"/>
+ </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>
diff --git a/debian/patches/disable_update_available_check.patch b/debian/patches/disable_update_available_check.patch
new file mode 100644
index 0000000..67c60b6
--- /dev/null
+++ b/debian/patches/disable_update_available_check.patch
@@ -0,0 +1,12 @@
+Disable LaTeXDraw's built-in update notifier that checks to see if a new version is available.
+--- trunk.orig/latexDraw/ui/LaTeXDrawFrame.java
++++ trunk/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/latexdraw_shell_script.patch b/debian/patches/latexdraw_shell_script.patch
new file mode 100644
index 0000000..32b9732
--- /dev/null
+++ b/debian/patches/latexdraw_shell_script.patch
@@ -0,0 +1,33 @@
+Create a script for /usr/bin/latexdraw with a sensible JRE (regardless of how the alternatives have been set).
+--- /dev/null
++++ trunk/latexdraw
+@@ -0,0 +1,29 @@
++#!/bin/sh
++
++# latexdraw wrapper script
++
++# Find an appropriate java runtime environment as we can't rely on
++# the alternatives setting in /usr/bin/java to provide the appropriate
++# version of java even if the package is installed.
++# (detection code adapted from tuxguitar)
++if [ -z $JAVA_HOME ]
++then
++ #t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
++ t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
++ t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t
++ JAVA=${JAVA_HOME}/jre/bin/java
++fi
++
++export JAVA=${JAVA:=java}
++
++if [ ! -d $HOME/.latexdraw ]
++then
++ mkdir -p $HOME/.latexdraw
++fi
++
++if [ ! -f $HOME/.latexdraw/.preferences ]
++then
++ touch $HOME/.latexdraw/.preferences
++fi
++
++exec $JAVA -jar /usr/share/java/LaTeXDraw.jar "$@"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d561542
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+latexdraw_shell_script.patch
+disable_update_available_check.patch
+build_system.patch
diff --git a/debian/rules b/debian/rules
index f86575a..e0246b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
# If the user has not explicitly set JAVA_HOME, export sensible value
# to make sure that the correct compiler is used by ant.
# Prefer openjdk-6
@@ -16,7 +18,7 @@ export JAVA_HOME
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
ant -Dlib.dir=/usr/share/java compile
ant -Dlib.dir=/usr/share/java jar
@@ -24,7 +26,7 @@ build-stamp:
convert -geometry 16x16 res/LaTeXDrawIcon.png out/latexdraw16.xpm
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
diff --git a/latexDraw/ui/LaTeXDrawFrame.java b/latexDraw/ui/LaTeXDrawFrame.java
index 9dd27fd..6c76e60 100644
--- a/latexDraw/ui/LaTeXDrawFrame.java
+++ b/latexDraw/ui/LaTeXDrawFrame.java
@@ -68,7 +68,7 @@ public final class LaTeXDrawFrame extends JFrame implements ActionListener, Item
public final static String VERSION_STABILITY = ""; //$NON-NLS-1$
/** To change if update is needed or not. */
- public static final boolean WITH_UPDATE = false;
+ public static final boolean WITH_UPDATE = true;
public static final Insets INSET_BUTTON = new Insets(1,1,1,1);
diff --git a/latexdraw b/latexdraw
deleted file mode 100644
index 27bc930..0000000
--- a/latexdraw
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# latexdraw wrapper script
-
-# Find an appropriate java runtime environment as we can't rely on
-# the alternatives setting in /usr/bin/java to provide the appropriate
-# version of java even if the package is installed.
-# (detection code adapted from tuxguitar)
-if [ -z $JAVA_HOME ]
-then
- #t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
- t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
- t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t
- JAVA=${JAVA_HOME}/jre/bin/java
-fi
-
-export JAVA=${JAVA:=java}
-
-if [ ! -d $HOME/.latexdraw ]
-then
- mkdir -p $HOME/.latexdraw
-fi
-
-if [ ! -f $HOME/.latexdraw/.preferences ]
-then
- touch $HOME/.latexdraw/.preferences
-fi
-
-exec $JAVA -jar /usr/share/java/LaTeXDraw.jar "$@"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/latexdraw.git
More information about the pkg-java-commits
mailing list