r246 - in /packages/jeuclid/trunk/debian: README.Debian build.xml changelog control rules
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Sat Aug 16 12:02:04 UTC 2008
Author: sylvestre-guest
Date: Sat Aug 16 12:02:03 2008
New Revision: 246
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=246
Log:
build also jeuclid-cli & jeuclid-fop
Modified:
packages/jeuclid/trunk/debian/README.Debian
packages/jeuclid/trunk/debian/build.xml
packages/jeuclid/trunk/debian/changelog
packages/jeuclid/trunk/debian/control
packages/jeuclid/trunk/debian/rules
Modified: packages/jeuclid/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/README.Debian?rev=246&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/README.Debian (original)
+++ packages/jeuclid/trunk/debian/README.Debian Sat Aug 16 12:02:03 2008
@@ -7,13 +7,10 @@
I provided patches in order to update both of these dependencies.
-Please note that mathviewer is not yet compiled:
-it needs the AppleJavaExtensions library to be built.
-http://developer.apple.com/samplecode/AppleJavaExtensions/
-"This is a pluggable jar of stub classes representing the new Apple eAWT and eIO APIs for Java 1.4 on Mac OS X. The purpose of these stubs is to allow for compilation of eAWT- or eIO-referencing code on platforms other than Mac OS X."
-Two choices:
-* we add this useless library to Debian
-* we patch the code to remove this dep
-
+mathviewer has a dependency over the library AppleJavaExtensions:
+http://developer.apple.com/samplecode/AppleJavaExtensions/index.html
+Obviously, this dependency is useless for Debian. Therefore, I added empty
+class which are faking AppleJavaExtensions for the build time.
+An other solution could be to patch massively jeuclid-mathviewer.
-- Sylvestre Ledru <sylvestre.ledru at inria.fr>
Modified: packages/jeuclid/trunk/debian/build.xml
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/build.xml?rev=246&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/build.xml (original)
+++ packages/jeuclid/trunk/debian/build.xml Sat Aug 16 12:02:03 2008
@@ -96,8 +96,29 @@
</not>
</condition>
<echo message="${xmlgraphics.message}"/>
- </target>
-
+
+ <available property="commonscli.present" classname="org.apache.commons.cli.CommandLine" classpathref="libs-build-classpath"/>
+ <condition property="commonscli.message" value="commons-cli Support PRESENT">
+ <equals arg1="${commonscli.present}" arg2="true"/>
+ </condition>
+ <condition property="commonscli.message" value="commons-cli Support NOT Present">
+ <not>
+ <equals arg1="${commonscli.present}" arg2="true"/>
+ </not>
+ </condition>
+ <echo message="${commonscli.message}"/>
+
+ <available property="commonslang.present" classname="org.apache.commons.lang.StringUtils" classpathref="libs-build-classpath"/>
+ <condition property="commonslang.message" value="commons-lang Support PRESENT">
+ <equals arg1="${commonslang.present}" arg2="true"/>
+ </condition>
+ <condition property="commonslang.message" value="commons-lang Support NOT Present">
+ <not>
+ <equals arg1="${commonslang.present}" arg2="true"/>
+ </not>
+ </condition>
+ <echo message="${commonslang.message}"/>
+</target>
<target name="compile-core" depends="init" description="Compile the core code">
<property name="package.name" value="jeuclid-core" />
@@ -136,6 +157,40 @@
<fileset dir="${package.name.mathviewer}/src/main/resources"/>
</copy>
<jar jarfile="${build.directory}/${package.name.mathviewer}.jar" basedir="${full.build.output}"/>
+ </target>
+
+ <target name="compile-cli" depends="init, compile-core" description="Compile the jeuclid cli">
+ <property name="package.name.cli" value="jeuclid-cli" />
+ <property name="full.build.output" value="${package.name.cli}/${build.output}" />
+
+ <mkdir dir="${full.build.output}"/>
+ <javac destdir="${full.build.output}" debug="true" deprecation="true" optimize="false">
+ <src>
+ <pathelement location="${package.name.cli}/src/main/java"/>
+
+ </src>
+ <classpath refid="libs-build-classpath"/>
+ </javac>
+ <jar jarfile="${build.directory}/${package.name.cli}.jar" basedir="${full.build.output}"/>
+ </target>
+
+
+ <target name="compile-fop" depends="init, compile-core" description="Compile the jeuclid fop">
+ <property name="package.name.fop" value="jeuclid-fop" />
+ <property name="full.build.output" value="${package.name.fop}/${build.output}" />
+
+ <mkdir dir="${full.build.output}"/>
+ <javac destdir="${full.build.output}" debug="true" deprecation="true" optimize="false">
+ <src>
+ <pathelement location="${package.name.fop}/src/main/java"/>
+
+ </src>
+ <classpath refid="libs-build-classpath"/>
+ </javac>
+ <copy todir="${full.build.output}">
+ <fileset dir="${package.name.fop}/src/main/resources"/>
+ </copy>
+ <jar jarfile="${build.directory}/${package.name.fop}.jar" basedir="${full.build.output}"/>
</target>
@@ -146,6 +201,8 @@
<delete dir="${build.directory}"/>
<delete dir="jeuclid-core/${build.directory}"/>
<delete dir="jeuclid-mathviewer/${build.directory}"/>
+ <delete dir="jeuclid-cli/${build.directory}"/>
+ <delete dir="jeuclid-fop/${build.directory}"/>
</target>
</project>
Modified: packages/jeuclid/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/changelog?rev=246&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/changelog (original)
+++ packages/jeuclid/trunk/debian/changelog Sat Aug 16 12:02:03 2008
@@ -1,4 +1,4 @@
-jeuclid (3.1.1-1) UNRELEASED; urgency=low
+jeuclid (3.1.2-1) UNRELEASED; urgency=low
* Initial release. (Closes: #490749)
Modified: packages/jeuclid/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/control?rev=246&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/control (original)
+++ packages/jeuclid/trunk/debian/control Sat Aug 16 12:02:03 2008
@@ -5,7 +5,8 @@
Uploaders: Sylvestre Ledru <sylvestre.ledru at inria.fr>
Build-Depends: debhelper (>= 5), autotools-dev, cdbs,
default-jdk-builddep, ant, junit, libxmlgraphics-commons-java (>= 1.3.0),
- libcommons-logging-java, libbatik-java (>= 1.7)
+ libcommons-logging-java, libbatik-java (>= 1.7), libcommons-cli-java,
+ libcommons-lang-java, fop (>= 0.95)
Standards-Version: 3.8.0
Homepage: http://jeuclid.sourceforge.net
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/jeuclib/trunk
@@ -41,3 +42,33 @@
.
This package contains the Swing MathViewer application.
+
+Package: jeuclid-cli
+Architecture: all
+Depends: java-gcj-compat | java1-runtime | java2-runtime,
+ libjeuclid-core-java, libcommons-cli-java, libcommons-lang-java
+Description: A complete MathML rendering solution
+ JEuclid is a complete MathML rendering solution, consisting of:
+ * A MathViewer application
+ * Command line converters from MathML to other formats
+ * An ant task for automated conversion
+ * Display components for AWT and Swing
+ * A component for Apache Cocoon
+ .
+ @TODO This package contains the client application.
+
+
+Package: libjeuclid-fop-java
+Architecture: all
+Depends: java-gcj-compat | java1-runtime | java2-runtime,
+ libjeuclid-core-java, fop (>= 0.95)
+Description: A complete MathML rendering solution
+ JEuclid is a complete MathML rendering solution, consisting of:
+ * A MathViewer application
+ * Command line converters from MathML to other formats
+ * An ant task for automated conversion
+ * Display components for AWT and Swing
+ * A component for Apache Cocoon
+ .
+ @TODO This package contains the fop stuff
+
Modified: packages/jeuclid/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/rules?rev=246&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/rules (original)
+++ packages/jeuclid/trunk/debian/rules Sat Aug 16 12:02:03 2008
@@ -6,8 +6,8 @@
JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun/
DEB_ANT_BUILDFILE := $(CURDIR)/debian/build.xml
-DEB_JARS := ant-nodeps junit
-DEB_ANT_BUILD_TARGET := compile-core compile-mathviewer
+DEB_JARS := ant-nodeps junit commons-lang commons-cli fop
+DEB_ANT_BUILD_TARGET := compile-core compile-mathviewer compile-cli compile-fop
DEB_ANT_CLEAN_TARGET := clean
install/libjeuclid-core-java::
@@ -18,6 +18,14 @@
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
+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
+
+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
+ ln -s jeuclid-fop-${DEB_UPSTREAM_VERSION}.jar debian/libjeuclid-fop-java/usr/share/java/jeuclid-fop.jar
+
get-orig-source:
-uscan --upstream-version 0 --rename
More information about the debian-science-commits
mailing list