[med-svn] r5920 - in trunk/packages/figtree/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Mon Feb 7 11:12:29 UTC 2011
Author: tille
Date: 2011-02-07 11:12:23 +0000 (Mon, 07 Feb 2011)
New Revision: 5920
Added:
trunk/packages/figtree/trunk/debian/README.source
trunk/packages/figtree/trunk/debian/patches/
trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch
trunk/packages/figtree/trunk/debian/patches/series
Modified:
trunk/packages/figtree/trunk/debian/changelog
trunk/packages/figtree/trunk/debian/control
trunk/packages/figtree/trunk/debian/get-orig-source
trunk/packages/figtree/trunk/debian/rules
Log:
Leave out unneeded binary jars from source tarball
Added: trunk/packages/figtree/trunk/debian/README.source
===================================================================
--- trunk/packages/figtree/trunk/debian/README.source (rev 0)
+++ trunk/packages/figtree/trunk/debian/README.source 2011-02-07 11:12:23 UTC (rev 5920)
@@ -0,0 +1,16 @@
+The FigTree source is provided in SVN and the script
+ debian/get-orig-source
+is intended to check out the parts which are needed to create
+the figtree.jat binary.
+
+To avoid unneeded stuff - especially those binary jar files which are
+shipped but not actually needed to build are removed from the trunk
+before creating the orig.tar.gz tarball.
+
+The build.xml has two additional targets
+ figtree-pdf.jar: Commandline tool which outputs PDF to stdout but
+ no real description how to use it
+ figtree.war: No idea how to use this
+These targets are not builded in the Debian package (see patch)
+
+ -- Andreas Tille <tille at debian.org> Mon, 07 Feb 2011 12:02:43 +0100
Modified: trunk/packages/figtree/trunk/debian/changelog
===================================================================
--- trunk/packages/figtree/trunk/debian/changelog 2011-02-07 07:35:49 UTC (rev 5919)
+++ trunk/packages/figtree/trunk/debian/changelog 2011-02-07 11:12:23 UTC (rev 5920)
@@ -2,4 +2,4 @@
* Initial release (Closes: #????)
- -- Andreas Tille <tille at debian.org> Thu, 03 Feb 2011 23:48:18 +0100
+ -- Andreas Tille <tille at debian.org> Mon, 07 Feb 2011 12:02:43 +0100
Modified: trunk/packages/figtree/trunk/debian/control
===================================================================
--- trunk/packages/figtree/trunk/debian/control 2011-02-07 07:35:49 UTC (rev 5919)
+++ trunk/packages/figtree/trunk/debian/control 2011-02-07 11:12:23 UTC (rev 5920)
@@ -4,7 +4,7 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7.1), openjdk-6-jdk, ant
+Build-Depends: debhelper (>= 7.1), openjdk-6-jdk, ant, quilt (>= 0.47)
Standards-Version: 3.9.1
Homepage: http://tree.bio.ed.ac.uk/software/figtree/
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/figtree/trunk
Modified: trunk/packages/figtree/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/figtree/trunk/debian/get-orig-source 2011-02-07 07:35:49 UTC (rev 5919)
+++ trunk/packages/figtree/trunk/debian/get-orig-source 2011-02-07 11:12:23 UTC (rev 5920)
@@ -23,17 +23,31 @@
# FIXME: Replace this by mv once the script is sufficiently tested
cp -a trunk ${PKG}-${VERSION}
+cd ${PKG}-${VERSION}
# remove .svn dirs taht do not belong into upstream tarball
-find ${PKG}-${VERSION} -type d -name .svn -exec rm -rf \{\} \; 2>/dev/null
+find . -type d -name .svn -exec rm -rf \{\} \; 2>/dev/null
# fix some broken permissions
for ext in icns jar java jnilib pdf png psd pdf tif ; do
- find ${PKG}-${VERSION} -type f -name "*.${ext}" -exec chmod 644 \{\} \;
+ find . -type f -name "*.${ext}" -exec chmod 644 \{\} \;
done
# remove unneeded OSes
-rm -rf ${PKG}-${VERSION}/release/Mac ${PKG}-${VERSION}/release/Windows
+rm -rf release/Mac release/Windows
+# remove jars which are provided as binaries but are not directly needed to build FigTree
+for jar in lib/jwt/commons-fileupload-1.2.1.jar \
+ lib/jwt/commons-io-1.4.jar \
+ lib/libquaqua.jnilib \
+ lib/jdom.jar \
+ lib/swing-layout.jar \
+ lib/quaqua-filechooser-only.jar \
+ lib/quaqua-colorchooser-only.jar \
+ ; do
+ rm -f $jar
+done
+
+cd ..
GZIP="--best --no-name" tar -czf "$PKG"_"$VERSION".orig.tar.gz "$PKG"-"$VERSION"
rm -rf "$PKG"-"$VERSION"
Added: trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch (rev 0)
+++ trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch 2011-02-07 11:12:23 UTC (rev 5920)
@@ -0,0 +1,43 @@
+Author: Andreas Tille <tille at debian.org>
+Date: Mon, 07 Feb 2011 12:02:43 +0100
+Description: Do not build targets figtree-pdf.jar and figtree.war
+
+--- figtree-1.3.1.orig/build.xml
++++ figtree-1.3.1/build.xml
+@@ -59,36 +59,6 @@
+ </manifest>
+ </jar>
+
+- <jar jarfile="${dist}/figtree-pdf.jar">
+- <zipgroupfileset dir="${lib}" includes="jebl.jar"/>
+- <zipgroupfileset dir="${lib}" includes="jam.jar"/>
+- <zipgroupfileset dir="${lib}" includes="iText.jar"/>
+- <fileset dir="${build}" includes="**/*.class,**/*.properties,**/*.png,**/*.gif"/>
+- <manifest>
+- <attribute name="Built-By" value="${user.name}"/>
+- <attribute name="Main-Class" value="figtree.application.FigTreePDF"/>
+- </manifest>
+- </jar>
+-
+- <war destfile="${dist}/figtree.war"
+- webxml="WebRoot/WEB-INF/web.xml">
+- <fileset dir="WebRoot"/>
+- <lib dir="${lib}/jwt">
+- <include name="commons-fileupload-1.2.1.jar" />
+- <include name="commons-io-1.4.jar" />
+- <include name="jwt-3.1.6.jar" />
+- </lib>
+- <lib dir="${lib}">
+- <include name="freehep.jar" />
+- <include name="iText.jar" />
+- <include name="jam.jar" />
+- <include name="jdom.jar" />
+- <include name="jebl.jar" />
+- </lib>
+- <classes dir="${build}"/>
+- </war>
+-
+-
+ </target>
+
+ <property name="version" value="1.3.1" />
Added: trunk/packages/figtree/trunk/debian/patches/series
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/series (rev 0)
+++ trunk/packages/figtree/trunk/debian/patches/series 2011-02-07 11:12:23 UTC (rev 5920)
@@ -0,0 +1 @@
+build_figtree_gui_only.patch
Modified: trunk/packages/figtree/trunk/debian/rules
===================================================================
--- trunk/packages/figtree/trunk/debian/rules 2011-02-07 07:35:49 UTC (rev 5919)
+++ trunk/packages/figtree/trunk/debian/rules 2011-02-07 11:12:23 UTC (rev 5920)
@@ -9,7 +9,7 @@
pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
%:
- dh $@
+ dh $@ --with quilt
override_dh_auto_clean:
rm -rf dist
More information about the debian-med-commit
mailing list