This is an automated email from the git hooks/post-receive script. stuart pushed a commit to branch master in repository latexdraw.
commit 9710f5653e37ce3a407b9ab66a1f53065041d8f9 Author: Stuart Prescott <[email protected]> Date: Wed Jul 11 23:25:24 2007 +0000 [svn-inject] Applying Debian modifications to trunk --- META-INF/MANIFEST.MF | 8 +- build.xml | 256 +++++++++++++++++++------------------ debian/changelog | 6 + debian/compat | 1 + debian/control | 22 ++++ debian/copyright | 20 +++ debian/dirs | 4 + debian/docs | 2 + debian/install | 6 + debian/latexdraw.1 | 38 ++++++ debian/latexdraw.desktop | 10 ++ debian/latexdraw.manpages | 1 + debian/latexdraw.menu | 7 + debian/latexdraw.mime | 1 + debian/latexdraw.sharedmimeinfo | 7 + debian/rules | 75 +++++++++++ debian/watch | 4 + debian/x-latexdraw-project.desktop | 7 + latexdraw | 25 ++++ 19 files changed, 372 insertions(+), 128 deletions(-) diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 4ee800d..3d91273 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.6.5 -Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.) - +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.6.5 +Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.) + diff --git a/build.xml b/build.xml index 2600f18..cd57b48 100644 --- a/build.xml +++ b/build.xml @@ -1,124 +1,132 @@ -<?xml version="1.0"?> -<project name="Template Buildfile" default="jar" basedir="."> - <property name="dir.out" value="out"/> - <property name="dir.data" value="out/data"/> - <property name="dir.report" value="out/report"/> - <property name="dir.doc" location="doc"/> - <property name="jar.junit" value="/opt/eclipse/plugins/org.junit4_4.3.1/junit.jar"/> - - <!-- Creates the output directories --> - <target name="prepare"> - <mkdir dir="${dir.out}"/> - <mkdir dir="${dir.report}"/> - <mkdir dir="${dir.data}/.cache"/> - <mkdir dir="${dir.data}/templates"/> - </target> - - <target name="junit" description="Launches the junit tests." depends="junit check"> - <junit printsummary="on" fork="false" haltonfailure="false" - failureproperty="tests.failed" showoutput="true"> - <formatter type="xml"/> - - <classpath> - <pathelement location="" /> - <pathelement path="" /> - <pathelement path="${java.class.path}" /> - </classpath> - - <test name="junit.test.TestLatexDraw" haltonfailure="no" outfile="${dir.report}/TEST1"> - <formatter type="xml"/> - </test> - </junit> - - <junitreport todir="${dir.report}" > - <fileset dir="${dir.report}"> - <include name="TEST*.xml"/> - </fileset> - <report format="frames" todir="${dir.report}"/> - </junitreport> - - <fail if="tests.failed"></fail> - </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"> - <fileset dir = ""> - <include name="**/*.java"/> - <exclude name="**/*Test*"/> - </fileset> - </javadoc> - </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"/> - </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="net.sourceforge.jiu.jar lib/net.sourceforge.jiu.jar - net.sourceforge.WmfView.jar lib/net.sourceforge.WmfView.jar org.jibble.epsgraphics.jar - com.sun.java lib/org.jibble.epsgraphics.jar txt ./ cache .cache/ templates .templates/ help help/ - "/> - </manifest> - - <!-- Filters the files --> - <fileset dir="" - includes="latexDraw/**/*.class ; res/**/* ; lang/**/*" - excludes="latexDraw/**/*.java"/> - </jar> - </target> - - - <target name="junit check"> - <available property="junit.present" classname="junit.framework.TestCase" /> - </target> - - <target name="zip src" depends="jar"> - <zip destfile="${dir.out}/LaTeXDraw1.9.3_src.zip" compress="true"> - <fileset dir="" - includes="**/*" excludes="site/ ; Todo.txt ; graphisme/ ; out/"/> - </zip> - </target> - - <target name="launch firefox"> - <!-- launch a web browser to view the results --> - <exec executable="firefox" os="Linux"> - <arg value="/home/arno/latexdraw/LaTeXDraw Maintenance/out/report/index.html"/> - </exec> - </target> - -</project> - - - - - - - - - - +<?xml version="1.0"?> +<project name="Template Buildfile" default="jar" basedir="."> + <property name="dir.out" value="out"/> + <property name="dir.data" value="out/data"/> + <property name="dir.report" value="out/report"/> + <property name="dir.doc" location="doc"/> + <property name="jar.junit" value="/opt/eclipse/plugins/org.junit4_4.3.1/junit.jar"/> + + <path id="classpathlib"> + <fileset dir="${lib.dir}" includes="**/*.jar"/> + </path> + + <!-- Creates the output directories --> + <target name="prepare"> + <mkdir dir="${dir.out}"/> + <mkdir dir="${dir.report}"/> + <mkdir dir="${dir.data}/.cache"/> + <mkdir dir="${dir.data}/templates"/> + </target> + + <target name="compile"> + <javac srcdir="latexDraw" destdir="" classpathref="classpathlib" debug="on" /> + </target> + + <target name="junit" description="Launches the junit tests." depends="junit check"> + <junit printsummary="on" fork="false" haltonfailure="false" + failureproperty="tests.failed" showoutput="true"> + <formatter type="xml"/> + + <classpath> + <pathelement location="" /> + <pathelement path="" /> + <pathelement path="${java.class.path}" /> + </classpath> + + <test name="junit.test.TestLatexDraw" haltonfailure="no" outfile="${dir.report}/TEST1"> + <formatter type="xml"/> + </test> + </junit> + + <junitreport todir="${dir.report}" > + <fileset dir="${dir.report}"> + <include name="TEST*.xml"/> + </fileset> + <report format="frames" todir="${dir.report}"/> + </junitreport> + + <fail if="tests.failed"></fail> + </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"> + <fileset dir = ""> + <include name="**/*.java"/> + <exclude name="**/*Test*"/> + </fileset> + </javadoc> + </target> + + + + <!-- Creates the jar --> + <target name="jar" description="Generates latexdraw.jar" depends="compile"> + <!-- 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"/> + </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="net.sourceforge.jiu.jar lib/net.sourceforge.jiu.jar + net.sourceforge.WmfView.jar lib/net.sourceforge.WmfView.jar org.jibble.epsgraphics.jar + com.sun.java lib/org.jibble.epsgraphics.jar txt ./ cache .cache/ templates .templates/ help help/ + "/> + </manifest> + + <!-- Filters the files --> + <fileset dir="" + includes="latexDraw/**/*.class ; res/**/* ; lang/**/*" + excludes="latexDraw/**/*.java"/> + </jar> + </target> + + + <target name="junit check"> + <available property="junit.present" classname="junit.framework.TestCase" /> + </target> + + <target name="zip src" depends="jar"> + <zip destfile="${dir.out}/LaTeXDraw1.9.3_src.zip" compress="true"> + <fileset dir="" + includes="**/*" excludes="site/ ; Todo.txt ; graphisme/ ; out/"/> + </zip> + </target> + + <target name="launch firefox"> + <!-- launch a web browser to view the results --> + <exec executable="firefox" os="Linux"> + <arg value="/home/arno/latexdraw/LaTeXDraw Maintenance/out/report/index.html"/> + </exec> + </target> + +</project> + + + + + + + + + + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..4006f87 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +latexdraw (1.9.3-1) unstable; urgency=low + + * Initial release (Closes: #54321) + + -- Stuart Prescott <[email protected]> Tue, 3 July 2007 00:14:04 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..3d6f53c --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: latexdraw +Section: contrib/graphics +Priority: optional +Maintainer: Stuart Prescott <[email protected]> +Build-Depends: debhelper (>= 5) +Build-Depends-Indep: sun-java6-jdk, ant, imagemagick, libjiu-java, libepsgraphics-java, libwmfview-java +Standards-Version: 3.7.2 + +Package: latexdraw +Architecture: all +Depends: sun-java6-jre, libjiu-java, libepsgraphics-java, libwmfview-java +Recommends: msttcorefonts, texlive-pstricks +Description: vector drawing program for LaTeX using PSTricks + LaTeXDraw is a free PSTricks code generator or PSTricks editor for LaTeX. + It has the usual drawing tools (lines, rectangles, circles, Bezier curves) + and can resize, rotate, move and join objects using vector transformations. + Figures can be exported as PSTricks code, eps, jpg, bmp, png, ppm. + . + PSTricks in an extension of LaTeX which allows the creation of drawings, + diagrams and graphs in 2D or 3D. + . + Homepage: http://latexdraw.sourceforge.net/ diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..d72f62c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,20 @@ +This package was debianized by Stuart Prescott <[email protected]> on +Wed, 11 Apr 2007 18:14:04 +0100. + +It was downloaded from http://latexdraw.sourceforge.net/ + +The compiled java (*.class) and archives (*.jar) were stripped +from the downloaded file to create the 'orig' source package. + + +Upstream Author: [email protected] + +Copyright: Arnaud BLOUIN, 2005-2007 + +License: GPLv2 or later + + + +The Debian packaging is (C) 2007, Stuart Prescott <[email protected]> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..739493f --- /dev/null +++ b/debian/dirs @@ -0,0 +1,4 @@ +usr/share/java +usr/bin +usr/share/man/man1 +usr/share/latexdraw diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..15f3458 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +debian/copyright +help diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..34fccfe --- /dev/null +++ b/debian/install @@ -0,0 +1,6 @@ +out/data/LaTeXDraw.jar usr/share/java +latexdraw usr/bin +templates usr/share/latexdraw/ +out/*.xpm usr/share/pixmaps +debian/latexdraw.desktop usr/share/applications +debian/x-latexdraw-project.desktop usr/share/mimelnk/application diff --git a/debian/latexdraw.1 b/debian/latexdraw.1 new file mode 100644 index 0000000..f70579a --- /dev/null +++ b/debian/latexdraw.1 @@ -0,0 +1,38 @@ +.TH LATEXDRAW 1 "April 23, 2007" +.SH NAME +latexdraw \- vector drawing program for LaTeX using PSTricks + +.SH SYNOPSIS +.B latexdraw +.RI file + +.SH DESCRIPTION +.B latexdraw +is a vector drawing program for LaTeX using PSTricks +.PP + +.SH OPTIONS +At present, +.B latexdraw +accepts no command line options other than (optionally) the name of +a file to open. + +.SH FILES +\fI /usr/share/latexdraw/templates/\fR - system-wide template repository +.br +\fI $HOME/.latexdraw/templates/\fR - user's template repository +.br +\fI $HOME/.latexdraw/preferences\fR - user settings +.br +\fI $HOME/.latexdraw/cache\fR - cached templates +.br + +.SH AUTHOR +.B latexdraw +was written by Arnaud BLOUIN. +.PP +More details can be found at +http://latexdraw.sourceforge.net/ +.PP +This manual page was written by Stuart Prescott <[email protected]>, +for the Debian project (but may be used by others). diff --git a/debian/latexdraw.desktop b/debian/latexdraw.desktop new file mode 100644 index 0000000..caf9065 --- /dev/null +++ b/debian/latexdraw.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=LaTeXDraw +Comment=Graphical editor for PSTricks +Exec=latexdraw %f +Icon=/usr/share/pixmaps/latexdraw32.xpm +Terminal=false +Type=Application +Categories=Application;Graphics; +MimeType=application/x-latexdraw-project diff --git a/debian/latexdraw.manpages b/debian/latexdraw.manpages new file mode 100644 index 0000000..1f3a792 --- /dev/null +++ b/debian/latexdraw.manpages @@ -0,0 +1 @@ +debian/latexdraw.1 diff --git a/debian/latexdraw.menu b/debian/latexdraw.menu new file mode 100644 index 0000000..77a35e7 --- /dev/null +++ b/debian/latexdraw.menu @@ -0,0 +1,7 @@ +?package(latexdraw):needs="x11" \ +section="Apps/Graphics" \ +title="LaTeXDraw" \ +command="/usr/bin/latexdraw" \ +icon="/usr/share/pixmaps/latexdraw32.xpm" \ +icon32x32="/usr/share/pixmaps/latexdraw32.xpm" \ +icon16x16="/usr/share/pixmaps/latexdraw16.xpm" diff --git a/debian/latexdraw.mime b/debian/latexdraw.mime new file mode 100644 index 0000000..22a56b1 --- /dev/null +++ b/debian/latexdraw.mime @@ -0,0 +1 @@ +application/x-latexdraw-project; /usr/bin/latexdraw %s; edit=/usr/bin/latexdraw %s; description="LaTeXDraw project"; nametemplate=%s.ldp; test=test -n "$DISPLAY" diff --git a/debian/latexdraw.sharedmimeinfo b/debian/latexdraw.sharedmimeinfo new file mode 100644 index 0000000..fd2c04a --- /dev/null +++ b/debian/latexdraw.sharedmimeinfo @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info" > + <mime-type type="application/x-latexdraw-project"> + <comment xml:lang="en">LaTeXDraw project</comment> + <glob pattern="*.ldp"/> + </mime-type> +</mime-info> diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..267334e --- /dev/null +++ b/debian/rules @@ -0,0 +1,75 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +# Package version for generating a versioned jar file +VERSION=1.9.3 + +# Thanks to the tuxguitar maintainers for this bit of wizardry: +JAVA_HOME ?= $(shell echo \ + `( t=/usr/lib/jvm/java-6-sun && test -d $$t && echo $$t ) \ + || ( t=/usr/lib/jvm/java-1.5.0-sun && test -d $$t && echo $$t )` \ + ) + +# Must export a JAVA_HOME to make sure that the correct compiler +# is used by ant. +export JAVA_HOME + + +configure: configure-stamp +configure-stamp: + dh_testdir + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + ant -DVERSION=$(VERSION) -Dlib.dir=/usr/share/java + convert -geometry 32x32 res/LaTeXDrawIcon.png out/latexdraw32.xpm + convert -geometry 16x16 res/LaTeXDrawIcon.png out/latexdraw16.xpm + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + find . -name \*.jar -exec rm -f {} \; + find . -name \*.class -exec rm -f {} \; + rm -rf out/* out/.cache + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + +# Build architecture-dependent files here. +binary-arch: build install + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installdirs -a + + dh_installchangelogs + dh_installdocs + dh_install + dh_installmenu + dh_installmime + dh_desktop + dh_installman + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..66ff3ba --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +# Compulsory line, this is a version 3 file +version=3 + +http://sf.net/latexdraw/LaTeXDraw(.*)_src\.zip diff --git a/debian/x-latexdraw-project.desktop b/debian/x-latexdraw-project.desktop new file mode 100644 index 0000000..2381f51 --- /dev/null +++ b/debian/x-latexdraw-project.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Comment=LaTeXDraw Project +Icon=/usr/share/pixmaps/latexdraw32.xpm +Type=MimeType +MimeType=application/x-latexdraw-project +Patterns=*.ldp diff --git a/latexdraw b/latexdraw new file mode 100644 index 0000000..f96230a --- /dev/null +++ b/latexdraw @@ -0,0 +1,25 @@ +#!/bin/sh + +# latexdraw wrapper script +# code for java detection borrowed 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 + 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

