r35278 - in /packages/jeuclid/trunk/debian: build.xml control jeuclid-cli.dirs jeuclid-cli.sh jeuclid-mathviewer.dirs jeuclid-mathviewer.sh rules

sylvestre-guest at users.alioth.debian.org sylvestre-guest at users.alioth.debian.org
Sat Oct 25 16:25:08 UTC 2008


Author: sylvestre-guest
Date: Sat Oct 25 16:25:07 2008
New Revision: 35278

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35278
Log:
Finalization of jeuclid packages

Added:
    packages/jeuclid/trunk/debian/jeuclid-cli.dirs
    packages/jeuclid/trunk/debian/jeuclid-cli.sh
    packages/jeuclid/trunk/debian/jeuclid-mathviewer.dirs
    packages/jeuclid/trunk/debian/jeuclid-mathviewer.sh
Modified:
    packages/jeuclid/trunk/debian/build.xml
    packages/jeuclid/trunk/debian/control
    packages/jeuclid/trunk/debian/rules

Modified: packages/jeuclid/trunk/debian/build.xml
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/build.xml?rev=35278&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/build.xml (original)
+++ packages/jeuclid/trunk/debian/build.xml Sat Oct 25 16:25:07 2008
@@ -156,7 +156,11 @@
     <copy todir="${full.build.output}">
       <fileset dir="${package.name.mathviewer}/src/main/resources"/>
     </copy>
-    <jar jarfile="${build.directory}/${package.name.mathviewer}.jar" basedir="${full.build.output}"/>
+    <jar jarfile="${build.directory}/${package.name.mathviewer}.jar" basedir="${full.build.output}">
+      <manifest>
+        <attribute name="Main-Class" value="net.sourceforge.jeuclid.app.mathviewer.MathViewer"/>
+      </manifest>
+	</jar>
   </target>
 
   <target name="compile-cli" depends="init, compile-core" description="Compile the jeuclid cli">
@@ -171,7 +175,12 @@
       </src>
       <classpath refid="libs-build-classpath"/>
     </javac>
-    <jar jarfile="${build.directory}/${package.name.cli}.jar" basedir="${full.build.output}"/>
+    <jar jarfile="${build.directory}/${package.name.cli}.jar" basedir="${full.build.output}">
+      <manifest>
+        <attribute name="Main-Class" value="net.sourceforge.jeuclid.app.Mml2xxx"/>
+      </manifest>
+
+	</jar>
   </target>
 
 

Modified: packages/jeuclid/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/control?rev=35278&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/control (original)
+++ packages/jeuclid/trunk/debian/control Sat Oct 25 16:25:07 2008
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5), autotools-dev, cdbs, 
  openjdk-6-jdk, ant, junit, libxmlgraphics-commons-java (>= 1.3.0), 
  libcommons-logging-java, libbatik-java (>= 1.7), libcommons-cli-java, 
- libcommons-lang-java, fop (>= 0.95)
+ libcommons-lang-java, fop (>= 0.95), libcommons-io-java
 Standards-Version: 3.8.0
 Homepage: http://jeuclid.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/jeuclib/trunk
@@ -16,7 +16,7 @@
 Package: libjeuclid-core-java
 Architecture: all
 Depends: java-gcj-compat | java1-runtime | java2-runtime,
- libxmlgraphics-commons-java (>= 1.3.0), libcommons-logging-java, libbatik-java
+ libxmlgraphics-commons-java (>= 1.3.0), libcommons-logging-java, libbatik-java (>= 1.7)
 Description: A complete MathML rendering solution
  JEuclid is a complete MathML rendering solution, consisting of:
   * A MathViewer application
@@ -31,7 +31,7 @@
 Package: jeuclid-mathviewer
 Architecture: all
 Depends: java-gcj-compat | java1-runtime | java2-runtime,
- libjeuclid-core-java
+ libjeuclid-core-java, java-wrappers, libcommons-io-java
 Description: A complete MathML rendering solution
  JEuclid is a complete MathML rendering solution, consisting of:
   * A MathViewer application
@@ -46,7 +46,7 @@
 Package: jeuclid-cli
 Architecture: all
 Depends: java-gcj-compat | java1-runtime | java2-runtime,
- libjeuclid-core-java, libcommons-cli-java, libcommons-lang-java
+ libjeuclid-core-java, libcommons-cli-java, libcommons-lang-java, java-wrappers 
 Description: A complete MathML rendering solution
  JEuclid is a complete MathML rendering solution, consisting of:
   * A MathViewer application
@@ -55,8 +55,8 @@
   * Display components for AWT and Swing
   * A component for Apache Cocoon
  .
- @TODO This package contains the client application.
-
+ This package contains the command line tools.
+ .
 
 Package: libjeuclid-fop-java
 Architecture: all
@@ -70,5 +70,4 @@
   * Display components for AWT and Swing
   * A component for Apache Cocoon
  .
- @TODO This package contains the fop stuff
-
+ This package contains the fop plugin.

Added: packages/jeuclid/trunk/debian/jeuclid-cli.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/jeuclid-cli.dirs?rev=35278&op=file
==============================================================================
--- packages/jeuclid/trunk/debian/jeuclid-cli.dirs (added)
+++ packages/jeuclid/trunk/debian/jeuclid-cli.dirs Sat Oct 25 16:25:07 2008
@@ -1,0 +1,2 @@
+usr/share/java
+usr/bin

Added: packages/jeuclid/trunk/debian/jeuclid-cli.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/jeuclid-cli.sh?rev=35278&op=file
==============================================================================
--- packages/jeuclid/trunk/debian/jeuclid-cli.sh (added)
+++ packages/jeuclid/trunk/debian/jeuclid-cli.sh Sat Oct 25 16:25:07 2008
@@ -1,0 +1,19 @@
+#! /bin/sh
+
+# Shell script wrapper around the jeuclid-cli program,
+# Copyright 2008 by Sylvestre Ledru <sylvestre.ledru at inria.fr>
+#
+# Licensed under the same terms as jeuclid-cli itself, that is under
+# the conditions of the Apache 2 licencee.
+
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+
+# We prefer to use openjdk or Sun's java if available
+find_java_runtime openjdk sun  || find_java_runtime 
+
+find_jars jeuclid-cli commons-cli commons-logging batik-all xmlgraphics-commons
+find_jars commons-io commons-lang
+
+run_java net.sourceforge.jeuclid.app.Mml2xxx "$@"

Added: packages/jeuclid/trunk/debian/jeuclid-mathviewer.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/jeuclid-mathviewer.dirs?rev=35278&op=file
==============================================================================
--- packages/jeuclid/trunk/debian/jeuclid-mathviewer.dirs (added)
+++ packages/jeuclid/trunk/debian/jeuclid-mathviewer.dirs Sat Oct 25 16:25:07 2008
@@ -1,0 +1,2 @@
+usr/share/java
+usr/bin

Added: packages/jeuclid/trunk/debian/jeuclid-mathviewer.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/jeuclid-mathviewer.sh?rev=35278&op=file
==============================================================================
--- packages/jeuclid/trunk/debian/jeuclid-mathviewer.sh (added)
+++ packages/jeuclid/trunk/debian/jeuclid-mathviewer.sh Sat Oct 25 16:25:07 2008
@@ -1,0 +1,19 @@
+#! /bin/sh
+
+# Shell script wrapper around the jeuclid-mathviewer program,
+# Copyright 2008 by Sylvestre Ledru <sylvestre.ledru at inria.fr>
+#
+# Licensed under the same terms as jeuclid-mathviewer itself, that is under
+# the conditions of the Apache 2 licencee.
+
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+
+# We prefer to use openjdk or Sun's java if available
+find_java_runtime openjdk sun  || find_java_runtime 
+
+find_jars jeuclid-cli commons-cli commons-logging batik-all xmlgraphics-commons
+find_jars commons-io
+
+run_java net.sourceforge.jeuclid.app.mathviewer.MathViewer "$@"

Modified: packages/jeuclid/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/rules?rev=35278&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/rules (original)
+++ packages/jeuclid/trunk/debian/rules Sat Oct 25 16:25:07 2008
@@ -16,10 +16,12 @@
 install/jeuclid-mathviewer::
 	install -m 644 -D target/jeuclid-mathviewer.jar debian/jeuclid-mathviewer/usr/share/java/jeuclid-mathviewer-${DEB_UPSTREAM_VERSION}.jar
 	ln -s jeuclid-mathviewer-${DEB_UPSTREAM_VERSION}.jar debian/jeuclid-mathviewer/usr/share/java/jeuclid-mathviewer.jar
+	cp debian/jeuclid-mathviewer.sh debian/jeuclid-mathviewer/usr/bin/jeuclid-mathviewer
 
 install/jeuclid-cli::
 	install -m 644 -D target/jeuclid-cli.jar debian/jeuclid-cli/usr/share/java/jeuclid-cli-${DEB_UPSTREAM_VERSION}.jar
 	ln -s jeuclid-cli-${DEB_UPSTREAM_VERSION}.jar debian/jeuclid-cli/usr/share/java/jeuclid-cli.jar
+	cp debian/jeuclid-cli.sh debian/jeuclid-cli/usr/bin/jeuclid-cli
 
 install/libjeuclid-fop-java::
 	install -m 644 -D target/jeuclid-fop.jar debian/libjeuclid-fop-java/usr/share/java/jeuclid-fop-${DEB_UPSTREAM_VERSION}.jar




More information about the debian-science-commits mailing list