Author: tille Date: 2011-02-20 22:53:18 +0000 (Sun, 20 Feb 2011) New Revision: 6038
Added: trunk/packages/figtree/trunk/debian/patches/__add_maven_pom_xml.patch trunk/packages/figtree/trunk/debian/patches/__fix_classpath.patch Removed: trunk/packages/figtree/trunk/debian/patches/add_maven_pom_xml.patch trunk/packages/figtree/trunk/debian/patches/fix_classpath.patch Modified: trunk/packages/figtree/trunk/debian/get-orig-source trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch Log: Fix classpath for itext5; rename patches which are unused for the moment Modified: trunk/packages/figtree/trunk/debian/get-orig-source =================================================================== --- trunk/packages/figtree/trunk/debian/get-orig-source 2011-02-20 17:22:20 UTC (rev 6037) +++ trunk/packages/figtree/trunk/debian/get-orig-source 2011-02-20 22:53:18 UTC (rev 6038) @@ -20,7 +20,7 @@ mkdir -p tarballs cd tarballs -svn checkout http://figtree.googlecode.com/svn/trunk/ +svn export http://figtree.googlecode.com/svn/trunk/ # FIXME: Replace this by mv once the script is sufficiently tested cp -a trunk ${PKG}-${VERSION} Added: trunk/packages/figtree/trunk/debian/patches/__add_maven_pom_xml.patch =================================================================== --- trunk/packages/figtree/trunk/debian/patches/__add_maven_pom_xml.patch (rev 0) +++ trunk/packages/figtree/trunk/debian/patches/__add_maven_pom_xml.patch 2011-02-20 22:53:18 UTC (rev 6038) @@ -0,0 +1,87 @@ +--- /dev/null ++++ figtree-1.3.1/pom.xml +@@ -0,0 +1,84 @@ ++<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> ++ <parent> ++ <artifactId>global</artifactId> ++ <groupId>figtree</groupId> ++ <version>1</version> ++ </parent> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>figtree</groupId> ++ <artifactId>figtree</artifactId> ++ <version>1.3.1</version> ++ <name>FigTree</name> ++ <description>Graphical phylogenetic tree viewer</description> ++ <repositories> ++ <repository> ++ <id>figtree-maven</id> ++ <name>Maven FigTree</name> ++ <url>http://tree.bio.ed.ac.uk/software/figtree/</url> ++ </repository> ++ </repositories> ++ <dependencies> ++ <dependency> ++ <groupId>org.freehep</groupId> ++ <artifactId>freehep-graphics2d</artifactId> ++ <version>2.0.3</version> ++ </dependency> ++ <dependency> ++ <groupId>org.freehep</groupId> ++ <artifactId>freehep-graphicsio</artifactId> ++ <version>2.0.3</version> ++ </dependency> ++ <dependency> ++ <groupId>org.freehep</groupId> ++ <artifactId>freehep-swing</artifactId> ++ <version>2.0.3</version> ++ </dependency> ++ <dependency> ++ <groupId>org.freehep</groupId> ++ <artifactId>freehep-util</artifactId> ++ <version>2.0.3</version> ++ </dependency> ++ <dependency> ++ <groupId>org.freehep</groupId> ++ <artifactId>freehep-wbxml</artifactId> ++ <version>2.0.3</version> ++ </dependency> ++ <dependency> ++ <groupId>org.freehep</groupId> ++ <artifactId>freehep-xml</artifactId> ++ <version>2.0.3</version> ++ </dependency> ++ </dependencies> ++ <build> ++ <plugins> ++ <plugin> ++ <artifactId>maven-surefire-plugin</artifactId> ++ <configuration> ++ <excludes> ++ <exclude>**/ExportTest.java</exclude> ++ </excludes> ++ </configuration> ++ </plugin> ++ <plugin> ++ <groupId>org.codehaus.mojo</groupId> ++ <artifactId>exec-maven-plugin</artifactId> ++ <version>1.0.2</version> ++ <executions> ++ <execution> ++ <goals> ++ <goal>java</goal> ++ </goals> ++ </execution> ++ </executions> ++ <configuration> ++ <mainClass>org.freehep.util.export.test.ExportFileTypeTest</mainClass> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> ++ ++ <scm> ++ <connection>scm:svn:svn://svn.freehep.org/svn/freehep/tags/freehep-export-2.1.1</connection> ++ <developerConnection>scm:svn:svn://svn.freehep.org/svn/freehep/tags/freehep-export-2.1.1</developerConnection> ++ </scm> ++</project> Added: trunk/packages/figtree/trunk/debian/patches/__fix_classpath.patch =================================================================== --- trunk/packages/figtree/trunk/debian/patches/__fix_classpath.patch (rev 0) +++ trunk/packages/figtree/trunk/debian/patches/__fix_classpath.patch 2011-02-20 22:53:18 UTC (rev 6038) @@ -0,0 +1,24 @@ +--- figtree-1.3.1.orig/.classpath ++++ figtree-1.3.1/.classpath +@@ -1,17 +1,11 @@ + <?xml version="1.0" encoding="UTF-8"?> + <classpath> + <classpathentry kind="src" path="src"/> +- <classpathentry kind="lib" path="lib/freehep.jar"/> ++ <classpathentry kind="lib" path="/usr/share/java/freehep-graphics2d.jar"/> ++ <classpathentry kind="lib" path="/usr/share/java/freehep-graphicsio.jar"/> + <classpathentry kind="lib" path="lib/iText.jar"/> +- <classpathentry kind="lib" path="lib/jam.jar"/> +- <classpathentry kind="lib" path="lib/jdom.jar"/> +- <classpathentry kind="lib" path="lib/jebl.jar"/> +- <classpathentry kind="lib" path="lib/swing-layout.jar"/> ++ <classpathentry kind="lib" path="/usr/share/java//jam.jar"/> ++ <classpathentry kind="lib" path="/usr/share/java//jebl.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +- <classpathentry kind="lib" path="lib/quaqua.jar"/> +- <classpathentry kind="lib" path="lib/jwt/commons-fileupload-1.2.1.jar"/> +- <classpathentry kind="lib" path="lib/jwt/commons-io-1.4.jar"/> +- <classpathentry kind="lib" path="lib/jwt/servlet-api-2.5-6.0.2.jar"/> +- <classpathentry kind="lib" path="lib/jwt/jwt-3.1.7pre1.jar"/> + <classpathentry kind="output" path="bin"/> + </classpath> Deleted: trunk/packages/figtree/trunk/debian/patches/add_maven_pom_xml.patch =================================================================== --- trunk/packages/figtree/trunk/debian/patches/add_maven_pom_xml.patch 2011-02-20 17:22:20 UTC (rev 6037) +++ trunk/packages/figtree/trunk/debian/patches/add_maven_pom_xml.patch 2011-02-20 22:53:18 UTC (rev 6038) @@ -1,87 +0,0 @@ ---- /dev/null -+++ figtree-1.3.1/pom.xml -@@ -0,0 +1,84 @@ -+<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> -+ <parent> -+ <artifactId>global</artifactId> -+ <groupId>figtree</groupId> -+ <version>1</version> -+ </parent> -+ <modelVersion>4.0.0</modelVersion> -+ <groupId>figtree</groupId> -+ <artifactId>figtree</artifactId> -+ <version>1.3.1</version> -+ <name>FigTree</name> -+ <description>Graphical phylogenetic tree viewer</description> -+ <repositories> -+ <repository> -+ <id>figtree-maven</id> -+ <name>Maven FigTree</name> -+ <url>http://tree.bio.ed.ac.uk/software/figtree/</url> -+ </repository> -+ </repositories> -+ <dependencies> -+ <dependency> -+ <groupId>org.freehep</groupId> -+ <artifactId>freehep-graphics2d</artifactId> -+ <version>2.0.3</version> -+ </dependency> -+ <dependency> -+ <groupId>org.freehep</groupId> -+ <artifactId>freehep-graphicsio</artifactId> -+ <version>2.0.3</version> -+ </dependency> -+ <dependency> -+ <groupId>org.freehep</groupId> -+ <artifactId>freehep-swing</artifactId> -+ <version>2.0.3</version> -+ </dependency> -+ <dependency> -+ <groupId>org.freehep</groupId> -+ <artifactId>freehep-util</artifactId> -+ <version>2.0.3</version> -+ </dependency> -+ <dependency> -+ <groupId>org.freehep</groupId> -+ <artifactId>freehep-wbxml</artifactId> -+ <version>2.0.3</version> -+ </dependency> -+ <dependency> -+ <groupId>org.freehep</groupId> -+ <artifactId>freehep-xml</artifactId> -+ <version>2.0.3</version> -+ </dependency> -+ </dependencies> -+ <build> -+ <plugins> -+ <plugin> -+ <artifactId>maven-surefire-plugin</artifactId> -+ <configuration> -+ <excludes> -+ <exclude>**/ExportTest.java</exclude> -+ </excludes> -+ </configuration> -+ </plugin> -+ <plugin> -+ <groupId>org.codehaus.mojo</groupId> -+ <artifactId>exec-maven-plugin</artifactId> -+ <version>1.0.2</version> -+ <executions> -+ <execution> -+ <goals> -+ <goal>java</goal> -+ </goals> -+ </execution> -+ </executions> -+ <configuration> -+ <mainClass>org.freehep.util.export.test.ExportFileTypeTest</mainClass> -+ </configuration> -+ </plugin> -+ </plugins> -+ </build> -+ -+ <scm> -+ <connection>scm:svn:svn://svn.freehep.org/svn/freehep/tags/freehep-export-2.1.1</connection> -+ <developerConnection>scm:svn:svn://svn.freehep.org/svn/freehep/tags/freehep-export-2.1.1</developerConnection> -+ </scm> -+</project> Deleted: trunk/packages/figtree/trunk/debian/patches/fix_classpath.patch =================================================================== --- trunk/packages/figtree/trunk/debian/patches/fix_classpath.patch 2011-02-20 17:22:20 UTC (rev 6037) +++ trunk/packages/figtree/trunk/debian/patches/fix_classpath.patch 2011-02-20 22:53:18 UTC (rev 6038) @@ -1,24 +0,0 @@ ---- figtree-1.3.1.orig/.classpath -+++ figtree-1.3.1/.classpath -@@ -1,17 +1,11 @@ - <?xml version="1.0" encoding="UTF-8"?> - <classpath> - <classpathentry kind="src" path="src"/> -- <classpathentry kind="lib" path="lib/freehep.jar"/> -+ <classpathentry kind="lib" path="/usr/share/java/freehep-graphics2d.jar"/> -+ <classpathentry kind="lib" path="/usr/share/java/freehep-graphicsio.jar"/> - <classpathentry kind="lib" path="lib/iText.jar"/> -- <classpathentry kind="lib" path="lib/jam.jar"/> -- <classpathentry kind="lib" path="lib/jdom.jar"/> -- <classpathentry kind="lib" path="lib/jebl.jar"/> -- <classpathentry kind="lib" path="lib/swing-layout.jar"/> -+ <classpathentry kind="lib" path="/usr/share/java//jam.jar"/> -+ <classpathentry kind="lib" path="/usr/share/java//jebl.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> -- <classpathentry kind="lib" path="lib/quaqua.jar"/> -- <classpathentry kind="lib" path="lib/jwt/commons-fileupload-1.2.1.jar"/> -- <classpathentry kind="lib" path="lib/jwt/commons-io-1.4.jar"/> -- <classpathentry kind="lib" path="lib/jwt/servlet-api-2.5-6.0.2.jar"/> -- <classpathentry kind="lib" path="lib/jwt/jwt-3.1.7pre1.jar"/> - <classpathentry kind="output" path="bin"/> - </classpath> Modified: trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch =================================================================== --- trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch 2011-02-20 17:22:20 UTC (rev 6037) +++ trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch 2011-02-20 22:53:18 UTC (rev 6038) @@ -17,7 +17,7 @@ <!-- Compile the java code from ${src} into ${build} --> <javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}" - classpath="${lib}/jebl.jar:${lib}/jam.jar:${lib}/freehep.jar:${lib}/iText.jar:${lib}/quaqua.jar:${lib}/jwt/servlet-api-2.5-6.0.2.jar:${lib}/jwt/jwt-3.1.7pre1.jar"> -+ classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-graphicsio-pdf.jar:${deblib}/freehep-graphicsio-ps.jar:${deblib}/freehep-graphicsio-emf.jar:${deblib}/freehep-graphicsio-swf.jar:${deblib}/freehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${lib}/iText.jar"> ++ classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-graphicsio-pdf.jar:${deblib}/freehep-graphicsio-ps.jar:${deblib}/freehep-graphicsio-emf.jar:${deblib}/freehep-graphicsio-swf.jar:${deblib}/freehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${deblib}/itext5.jar"> <include name="figtree/**"/> </javac> <copy todir="${build}" verbose="true"> _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
