Author: alteholz
Date: 2013-04-22 19:57:07 +0000 (Mon, 22 Apr 2013)
New Revision: 13380
Added:
trunk/packages/treeview/trunk/debian/get-orig-source
trunk/packages/treeview/trunk/debian/patches/
trunk/packages/treeview/trunk/debian/patches/classpath.patch
trunk/packages/treeview/trunk/debian/patches/series
trunk/packages/treeview/trunk/debian/scripts/
trunk/packages/treeview/trunk/debian/scripts/treeview
trunk/packages/treeview/trunk/debian/treeview.install
trunk/packages/treeview/trunk/debian/treeview.links
trunk/packages/treeview/trunk/debian/treeview.manpages
Removed:
trunk/packages/treeview/trunk/debian/treeview
Modified:
trunk/packages/treeview/trunk/debian/changelog
trunk/packages/treeview/trunk/debian/compat
trunk/packages/treeview/trunk/debian/control
trunk/packages/treeview/trunk/debian/copyright
trunk/packages/treeview/trunk/debian/menu
trunk/packages/treeview/trunk/debian/rules
trunk/packages/treeview/trunk/debian/watch
Log:
some progress, not ready yet
Modified: trunk/packages/treeview/trunk/debian/changelog
===================================================================
--- trunk/packages/treeview/trunk/debian/changelog 2013-04-22 14:17:41 UTC
(rev 13379)
+++ trunk/packages/treeview/trunk/debian/changelog 2013-04-22 19:57:07 UTC
(rev 13380)
@@ -1,8 +1,10 @@
-treeview (1.1.6.2-1) UNRELEASED; urgency=low
+treeview (1.1.6.2+dfsg-1) UNRELEASED; urgency=low
* Initial release (Closes: #243771)
- TODO: ITP #243771 has to be reopened in case of upload
- * TODO: remove lintian complaints
+ * TODO: ITP #243771 has to be reopened in case of upload
+ * TODO: take care of plugins
+ * TODO: remove windows stuff
+ * TODO: build docu
* TODO: either package included JAR files separately from source
or list according licenses in debian/copyright (in the
latter case package needs to go to non-free
@@ -10,8 +12,8 @@
[ Thorsten Alteholz ]
* debian/watch: watch file added
* debian/rules: target get-orig-source added
- * debian/control: debhelper 8
- * debian/control: standards version 3.9.2 (no other changes)
+ * debian/control: debhelper 9
+ * debian/control: standards version 3.9.4 (no other changes)
* debian/control: vcs fields added
* debian/control: team maintenance
* new upstream release: 1.1.6.2
@@ -23,7 +25,7 @@
* debian/source/format: 3.0 (quilt)
* Added myself to Uploaders
- -- DMPT <debian-med-packag...@lists.alioth.debian.org> Mon, 23 Jan 2012
18:00:00 +0100
+ -- Thorsten Alteholz <deb...@alteholz.de> Mon, 23 Jan 2012 18:00:00 +0100
treeview (1.0.5-0.3) UNRELEASED; urgency=low
Modified: trunk/packages/treeview/trunk/debian/compat
===================================================================
--- trunk/packages/treeview/trunk/debian/compat 2013-04-22 14:17:41 UTC (rev
13379)
+++ trunk/packages/treeview/trunk/debian/compat 2013-04-22 19:57:07 UTC (rev
13380)
@@ -1 +1 @@
-8
+9
Modified: trunk/packages/treeview/trunk/debian/control
===================================================================
--- trunk/packages/treeview/trunk/debian/control 2013-04-22 14:17:41 UTC
(rev 13379)
+++ trunk/packages/treeview/trunk/debian/control 2013-04-22 19:57:07 UTC
(rev 13380)
@@ -3,16 +3,26 @@
Priority: optional
Maintainer: Debian Med Packaging Team
<debian-med-packag...@lists.alioth.debian.org>
Uploaders: Steffen Moeller <moel...@debian.org>,
- Andreas Tille <ti...@debian.org>
-Build-Depends: debhelper (>= 8), ant, java2-compiler
-Standards-Version: 3.9.2
+ Andreas Tille <ti...@debian.org>,
+ Thorsten Alteholz <deb...@alteholz.de>
+Build-Depends: debhelper (>= 9),
+ ant,
+ default-jdk,
+ libnanoxml2-java,
+ libcommons-configuration-java,
+ libcommons-lang-java
+Standards-Version: 3.9.4
Homepage: http://jtreeview.sourceforge.net
Vcs-Browser:
http://svn.debian.org/wsvn/debian-med/trunk/packages/treeview/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/treeview/trunk/
Package: treeview
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ default-jre,
+ libnanoxml2-java,
+ libcommons-configuration-java,
+ libcommons-lang-java
Recommends: cluster3
Suggests: mapletree, smile
Description: Java re-implementation of Michael Eisen's TreeView
Modified: trunk/packages/treeview/trunk/debian/copyright
===================================================================
--- trunk/packages/treeview/trunk/debian/copyright 2013-04-22 14:17:41 UTC
(rev 13379)
+++ trunk/packages/treeview/trunk/debian/copyright 2013-04-22 19:57:07 UTC
(rev 13380)
@@ -1,26 +1,30 @@
-This package was debianized by Steffen Moeller <moel...@pzr.uni-rostock.de> on
-Wed, 7 Apr 2004 22:02:54 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: treeview
+Source: http://treeview.sourceforge.net/
-It was downloaded from http://treeview.sourceforge.net
+Files: *
+Copyright: Alok Saldanha <a...@caltech.edu>
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-Upstream Author: Alok Saldanha <a...@caltech.edu>
+Files: debian/*
+Copyright: 2004 Steffen Moeller <moel...@pzr.uni-rostock.de>
+ 2013 Thorsten Alteholz <deb...@alteholz.de>
+License: GPL-2
+ see above
-Copyright:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
Added: trunk/packages/treeview/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/treeview/trunk/debian/get-orig-source
(rev 0)
+++ trunk/packages/treeview/trunk/debian/get-orig-source 2013-04-22
19:57:07 UTC (rev 13380)
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# bail out upon error
+set -e
+
+PACKAGE=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
+TARDIR=../tarballs
+
+VERSION=`uscan --rename --verbose --force-download |
+ grep "Newest version on remote site is .* local version is .*" |
+ head -n 1 |
+ sed "s/Newest version on remote site is \([a-z0-9.]\+\),.*/\1/"`
+
+echo "I: remote version $VERSION"
+
+mkdir -p $TARDIR
+cd $TARDIR
+
+UTAR="${PACKAGE}_${VERSION}.orig.tar.gz"
+pwd
+ls -l
+ls -l ..
+echo $UTAR
+mv ../${UTAR} .
+tar -xzf ${UTAR}
+
+mv TreeView-1.1.6r2-src ${PACKAGE}_${VERSION}+dfsg.orig # .orig is requested
by Developers Reference 3.4.4 <C2><A7>6.7.8.2
+
+cd ${PACKAGE}_${VERSION}+dfsg.orig
+# do some magic here
+
+# we do not need windows stuff here
+rm windows-installer.tar.gz
+rm lib/nanoxml-2.2.2.jar
+
+cd ..
+rm $UTAR
+
+GZIP="--best --no-name" tar czf ${PACKAGE}_${VERSION}+dfsg.orig.tar.gz
${PACKAGE}_${VERSION}+dfsg.orig
+
+rm -rf ${PACKAGE}_${VERSION}+dfsg.orig
+
Modified: trunk/packages/treeview/trunk/debian/menu
===================================================================
--- trunk/packages/treeview/trunk/debian/menu 2013-04-22 14:17:41 UTC (rev
13379)
+++ trunk/packages/treeview/trunk/debian/menu 2013-04-22 19:57:07 UTC (rev
13380)
@@ -1 +1 @@
-?package(treeview):needs="X11" section="Apps/Science" title="treeview"
command="/usr/bin/treeview"
+?package(treeview):needs="X11" section="Applications/Science/Biology"
title="treeview" command="/usr/bin/treeview"
Added: trunk/packages/treeview/trunk/debian/patches/classpath.patch
===================================================================
--- trunk/packages/treeview/trunk/debian/patches/classpath.patch
(rev 0)
+++ trunk/packages/treeview/trunk/debian/patches/classpath.patch
2013-04-22 19:57:07 UTC (rev 13380)
@@ -0,0 +1,45 @@
+Description: do not use internal lib
+Author: Thorsten Alteholz <deb...@alteholz.de>
+Index: TreeView-1.1.6r2-src/build.xml
+===================================================================
+--- TreeView-1.1.6r2-src.orig/build.xml 2013-04-22 13:11:09.000000000
+0200
++++ TreeView-1.1.6r2-src/build.xml 2013-04-22 13:16:03.000000000 +0200
+@@ -211,7 +211,7 @@
+ excludes="edu/stanford/genetics/treeview/plugin/**">
+ <manifest>
+ <attribute name="Main-Class" value="LinkedView"/>
+- <attribute name="Class-Path" value=". lib/nanoxml-2.2.2.jar"/>
++ <attribute name="Class-Path" value=".
/usr/share/java/nanoxml.jar"/>
+ </manifest>
+ </jar>
+
+@@ -226,7 +226,7 @@
+
excludes="*coordinates/*,edu/stanford/genetics/treeview/plugin/**,edu/stanford/genetics/treeview/reg/**">
+ <manifest>
+ <attribute name="Main-Class" value="LinkedView"/>
+- <attribute name="Class-Path" value="lib/nanoxml-2.2.2.jar"/>
++ <attribute name="Class-Path"
value="/usr/share/java/nanoxml.jar"/>
+ </manifest>
+ </jar>
+ </target>
+@@ -241,9 +241,11 @@
+ <copy todir="applet">
+ <fileset dir="appletStatic"/>
+ </copy>
++<!-- not needed anymore (XXX)
+ <copy todir="applet">
+ <fileset file="lib/nanoxml-2.2.2.jar"/>
+ </copy>
++-->
+ <move file ="${plugin.dir}" todir="applet">
+ </move>
+ </target>
+@@ -359,7 +361,7 @@
+ <jarbundler dir="bundle/TreeView"
+ name="Java TreeView"
+
mainclass="edu.stanford.genetics.treeview.app.LinkedViewApp"
+- jars="TreeView.jar lib/nanoxml-2.2.2.jar"
++ jars="TreeView.jar"
+
icon="static/images/treeviewIcon.icns"
+
version="1.1.6r2"
+
aboutmenuname="Java TreeView"
Added: trunk/packages/treeview/trunk/debian/patches/series
===================================================================
--- trunk/packages/treeview/trunk/debian/patches/series
(rev 0)
+++ trunk/packages/treeview/trunk/debian/patches/series 2013-04-22 19:57:07 UTC
(rev 13380)
@@ -0,0 +1 @@
+classpath.patch
Modified: trunk/packages/treeview/trunk/debian/rules
===================================================================
--- trunk/packages/treeview/trunk/debian/rules 2013-04-22 14:17:41 UTC (rev
13379)
+++ trunk/packages/treeview/trunk/debian/rules 2013-04-22 19:57:07 UTC (rev
13380)
@@ -7,10 +7,7 @@
#export DH_VERBOSE=1
-
-
-CFLAGS = -Wall -g
-
+CFLAGS += -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
@@ -20,79 +17,103 @@
INSTALL_PROGRAM += -s
endif
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- touch configure-stamp
+%:
+ dh $@
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- ant jar
- #/usr/bin/docbook-to-man debian/treeview.sgml > treeview.1
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- ant clean
-
- find . -type d -name CVS | xargs --no-run-if-empty rm -r
-
- dh_clean treeview.1
-
treeview.1: debian/treeview.sgml
docbook-to-man $< > $@
-install: build treeview.1
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_build: treeview.1
+ dh_auto_build
+ ant jar
- # Add here commands to install the package into debian/treeview.
- mkdir -p $(CURDIR)/debian/treeview/usr/share/treeview/lib || true
- cp TreeView.jar $(CURDIR)/debian/treeview/usr/share/treeview
- cp debian/treeview $(CURDIR)/debian/treeview/usr/bin
- chmod 755 $(CURDIR)/debian/treeview/usr/bin/treeview
- cp lib/*.jar $(CURDIR)/debian/treeview/usr/share/treeview/lib
+override_dh_auto_install:
+ find
+ dh_auto_install
+#override_dh_clean:
+# dh_clean
+# ant clean
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs doc/*
- dh_installmenu
- dh_installman treeview.1
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+#CFLAGS = -Wall -g
+#
+#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+# CFLAGS += -O0
+#else
+# CFLAGS += -O2
+#endif
+#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+# INSTALL_PROGRAM += -s
+#endif
+#
+#configure: configure-stamp
+#configure-stamp:
+# dh_testdir
+# # Add here commands to configure the package.
+#
+# touch configure-stamp
+#
+#
+#build: build-stamp
+#
+#build-stamp: configure-stamp
+# dh_testdir
+#
+# # Add here commands to compile the package.
+# ant jar
+# #/usr/bin/docbook-to-man debian/treeview.sgml > treeview.1
+#
+# touch build-stamp
+#
+#clean:
+# dh_testdir
+# dh_testroot
+# rm -f build-stamp configure-stamp
+#
+# # Add here commands to clean up after the build process.
+# ant clean
+#
+# find . -type d -name CVS | xargs --no-run-if-empty rm -r
+#
+# dh_clean treeview.1
+#
+#treeview.1: debian/treeview.sgml
+# docbook-to-man $< > $@
+#
+#install: build treeview.1
+# dh_testdir
+# dh_testroot
+# dh_clean -k
+# dh_installdirs
+#
+# # Add here commands to install the package into debian/treeview.
+# mkdir -p $(CURDIR)/debian/treeview/usr/share/treeview/lib || true
+# cp TreeView.jar $(CURDIR)/debian/treeview/usr/share/treeview
+# cp debian/treeview $(CURDIR)/debian/treeview/usr/bin
+# chmod 755 $(CURDIR)/debian/treeview/usr/bin/treeview
+# cp lib/*.jar $(CURDIR)/debian/treeview/usr/share/treeview/lib
+#
+#
+## Build architecture-independent files here.
+#binary-indep: build install
+# dh_testdir
+# dh_testroot
+# dh_installchangelogs
+# dh_installdocs doc/*
+# dh_installmenu
+# dh_installman treeview.1
+# dh_link
+# dh_strip
+# dh_compress
+# dh_fixperms
+# dh_installdeb
+# dh_shlibdeps
+# dh_gencontrol
+# dh_md5sums
+# dh_builddeb
+#
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
get-orig-source:
- mkdir -p ../tarballs
- uscan --verbose --force-download --destdir=../tarballs
+ ./debian/get-orig-source
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
Copied: trunk/packages/treeview/trunk/debian/scripts/treeview (from rev 13350,
trunk/packages/treeview/trunk/debian/treeview)
===================================================================
--- trunk/packages/treeview/trunk/debian/scripts/treeview
(rev 0)
+++ trunk/packages/treeview/trunk/debian/scripts/treeview 2013-04-22
19:57:07 UTC (rev 13380)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ -z $JAVA_HOME ]; then
+ java=java
+else
+ java=$JAVA_HOME/bin/java
+fi
+
+if [ -x /usr/share/treeview ]; then
+ if [ -r /usr/share/treeview/TreeView.jar ]; then
+ cd /usr/share/treeview && $java -jar TreeView.jar
+ else
+ echo "Could not find /usr/share/treeview/TreeView.jar"
+ fi
+else
+ echo "Could not find /usr/share/treeview directory."
+fi
Deleted: trunk/packages/treeview/trunk/debian/treeview
===================================================================
--- trunk/packages/treeview/trunk/debian/treeview 2013-04-22 14:17:41 UTC
(rev 13379)
+++ trunk/packages/treeview/trunk/debian/treeview 2013-04-22 19:57:07 UTC
(rev 13380)
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if [ -z $JAVA_HOME ]; then
- java=java
-else
- java=$JAVA_HOME/bin/java
-fi
-
-if [ -x /usr/share/mapletree ]; then
- if [ -r /usr/share/treeview/TreeView.jar ]; then
- cd /usr/share/treeview && $java -jar TreeView.jar
- else
- echo "Could not find /usr/share/treeview/TreeView.jar"
- fi
-else
- echo "Could not find /usr/share/treeview directory."
-fi
Added: trunk/packages/treeview/trunk/debian/treeview.install
===================================================================
--- trunk/packages/treeview/trunk/debian/treeview.install
(rev 0)
+++ trunk/packages/treeview/trunk/debian/treeview.install 2013-04-22
19:57:07 UTC (rev 13380)
@@ -0,0 +1,2 @@
+debian/scripts/treeview usr/bin
+TreeView.jar usr/share/treeview
Added: trunk/packages/treeview/trunk/debian/treeview.links
===================================================================
--- trunk/packages/treeview/trunk/debian/treeview.links
(rev 0)
+++ trunk/packages/treeview/trunk/debian/treeview.links 2013-04-22 19:57:07 UTC
(rev 13380)
@@ -0,0 +1 @@
+usr/share/java/xml-apis.jar usr/share/logol/lib/xml-apis.jar
Added: trunk/packages/treeview/trunk/debian/treeview.manpages
===================================================================
--- trunk/packages/treeview/trunk/debian/treeview.manpages
(rev 0)
+++ trunk/packages/treeview/trunk/debian/treeview.manpages 2013-04-22
19:57:07 UTC (rev 13380)
@@ -0,0 +1 @@
+treeview.1
Modified: trunk/packages/treeview/trunk/debian/watch
===================================================================
--- trunk/packages/treeview/trunk/debian/watch 2013-04-22 14:17:41 UTC (rev
13379)
+++ trunk/packages/treeview/trunk/debian/watch 2013-04-22 19:57:07 UTC (rev
13380)
@@ -1,3 +1,3 @@
version=3
-opts="uversionmangle=s/r/\./" \
+opts=uversionmangle=s/r/\./g,dversionmangle=s/\+dfsg// \
http://sf.net/jtreeview/TreeView-([\d\.]+.*)-src\.tar\.gz
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
