Author: alteholz Date: 2013-04-27 10:13:44 +0000 (Sat, 27 Apr 2013) New Revision: 13430
Removed: trunk/packages/treeview/trunk/README.status trunk/packages/treeview/trunk/debian/treeview.links Modified: trunk/packages/treeview/trunk/debian/README.Debian trunk/packages/treeview/trunk/debian/changelog trunk/packages/treeview/trunk/debian/copyright trunk/packages/treeview/trunk/debian/get-orig-source trunk/packages/treeview/trunk/debian/patches/classpath.patch trunk/packages/treeview/trunk/debian/rules trunk/packages/treeview/trunk/debian/treeview.docs Log: final version Deleted: trunk/packages/treeview/trunk/README.status =================================================================== --- trunk/packages/treeview/trunk/README.status 2013-04-26 13:36:33 UTC (rev 13429) +++ trunk/packages/treeview/trunk/README.status 2013-04-27 10:13:44 UTC (rev 13430) @@ -1,6 +0,0 @@ ---- -Format: 1 -Status: draft -Comment: > - Work on this project was started by Steffen M�ller but has stalled. - Feel free to take it over. Modified: trunk/packages/treeview/trunk/debian/README.Debian =================================================================== --- trunk/packages/treeview/trunk/debian/README.Debian 2013-04-26 13:36:33 UTC (rev 13429) +++ trunk/packages/treeview/trunk/debian/README.Debian 2013-04-27 10:13:44 UTC (rev 13430) @@ -1,6 +1,16 @@ treeview for Debian ------------------- -I need help with the correct specification of the dependency to non-free Java 1.4. +The following files have been removed as it seems that +they are not needed for a Debian package: - -- Steffen Moeller <moel...@pzr.uni-rostock.de>, Wed, 7 Apr 2004 22:02:54 +0200 +# Debian version is used +lib/nanoxml-2.2.2.jar +# not needed for build +src/edu/stanford/genetics/treeview/plugin/dendroview/dendroview.jar +# only needed for os X +compile_lib/jarbundler-1.8.1.jar +compile_lib/xercesImpl.jar +compile_lib/xml-apis.jar +# only needed for windows +windows-installer.tar.gz Modified: trunk/packages/treeview/trunk/debian/changelog =================================================================== --- trunk/packages/treeview/trunk/debian/changelog 2013-04-26 13:36:33 UTC (rev 13429) +++ trunk/packages/treeview/trunk/debian/changelog 2013-04-27 10:13:44 UTC (rev 13430) @@ -1,13 +1,6 @@ -treeview (1.1.6.2+dfsg-1) UNRELEASED; urgency=low +treeview (1.1.6.2+dfsg-1) unstable; urgency=low * Initial release (Closes: #243771) - * TODO: ITP #243771 has to be reopened in case of upload - * TODO: debian/upstream - * TODO: debian/copyright - * TODO: exception - * 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 [ Thorsten Alteholz ] * debian/watch: watch file added @@ -25,7 +18,7 @@ * debian/source/format: 3.0 (quilt) * Added myself to Uploaders - -- Thorsten Alteholz <deb...@alteholz.de> Mon, 23 Jan 2012 18:00:00 +0100 + -- Thorsten Alteholz <deb...@alteholz.de> Fri, 26 Apr 2013 18:00:00 +0200 treeview (1.0.5-0.3) UNRELEASED; urgency=low Modified: trunk/packages/treeview/trunk/debian/copyright =================================================================== --- trunk/packages/treeview/trunk/debian/copyright 2013-04-26 13:36:33 UTC (rev 13429) +++ trunk/packages/treeview/trunk/debian/copyright 2013-04-27 10:13:44 UTC (rev 13430) @@ -3,8 +3,86 @@ Source: http://treeview.sourceforge.net/ Files: * -Copyright: Alok Saldanha <a...@caltech.edu> +Copyright: 2001-2003 Alok Saldanha <a...@caltech.edu> License: GPL-2 + +Files: src/LinkedView.java +Copyright: 2001-2003 Alok Saldanha <a...@caltech.edu> + 2013 Alex Segal, Lawrence Berkeley Lab +License: GPL-2 + +Files: src/edu/* +Copyright: 2001-2003 Alok Saldanha <a...@caltech.edu> + 2013 Alex Segal, Lawrence Berkeley Lab +License: GPL-2 + +Files: edu/stanford/genetics/treeview/NatField.java +Copyright: 1997 Rob Arthan, Lemma 1 Ltd. + 2001-2003 Alok Saldanha <a...@caltech.edu> + 2013 Alex Segal, Lawrence Berkeley Lab +License: GPL-2 + +Files: com/gurge/amd/Quantize.java +Copyright: 2000 Adam Doppelt, E. I. du Pont de Nemours and Company +License: ImageMagick + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files ("ImageMagick"), + to deal in ImageMagick without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of ImageMagick, and to permit persons to whom the + ImageMagick is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of ImageMagick. + . + The software is provided "as is", without warranty of any kind, express or + implied, including but not limited to the warranties of merchantability, + fitness for a particular purpose and noninfringement. In no event shall + E. I. du Pont de Nemours and Company be liable for any claim, damages or + other liability, whether in an action of contract, tort or otherwise, + arising from, out of or in connection with ImageMagick or the use or other + dealings in ImageMagick. + . + Except as contained in this notice, the name of the E. I. du Pont de + Nemours and Company shall not be used in advertising or otherwise to + promote the sale, use or other dealings in ImageMagick without prior + written authorization from the E. I. du Pont de Nemours and Company. + +Files: edu/stanford/genetics/treeview/QSortAlgorithm.java +Copyright: 1994-1995 James Gosling, Sun Microsystems, Inc. +License: SUN + Permission to use, copy, modify, and distribute this software + and its documentation for NON-COMMERCIAL or COMMERCIAL purposes and + without fee is hereby granted. + Please refer to the file http://java.sun.com/copy_trademarks.html + for further important copyright and trademark information and to + http://java.sun.com/licensing.html for further important licensing + information for the Java (tm) Technology. + . + SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF + THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED + TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR + ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR + DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. + . + THIS SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE OR RESALE AS ON-LINE + CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE + PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT + NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE + SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE + SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE + PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES"). SUN + SPECIFICALLY DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR + HIGH RISK ACTIVITIES. + + +Files: debian/* +Copyright: 2004 Steffen Moeller <moel...@pzr.uni-rostock.de> + 2013 Thorsten Alteholz <deb...@alteholz.de> +License: GPL-2 + +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. @@ -22,9 +100,3 @@ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. -Files: debian/* -Copyright: 2004 Steffen Moeller <moel...@pzr.uni-rostock.de> - 2013 Thorsten Alteholz <deb...@alteholz.de> -License: GPL-2 - see above - Modified: trunk/packages/treeview/trunk/debian/get-orig-source =================================================================== --- trunk/packages/treeview/trunk/debian/get-orig-source 2013-04-26 13:36:33 UTC (rev 13429) +++ trunk/packages/treeview/trunk/debian/get-orig-source 2013-04-27 10:13:44 UTC (rev 13430) @@ -17,10 +17,7 @@ cd $TARDIR UTAR="${PACKAGE}_${VERSION}.orig.tar.gz" -pwd -ls -l -ls -l .. -echo $UTAR +echo "I: $UTAR" mv ../${UTAR} . tar -xzf ${UTAR} @@ -33,11 +30,11 @@ rm windows-installer.tar.gz rm lib/nanoxml-2.2.2.jar # these jars are only needed for mac osx -#XXX rm compile_lib/jarbundler-1.8.1.jar +rm compile_lib/jarbundler-1.8.1.jar rm compile_lib/xercesImpl.jar rm compile_lib/xml-apis.jar -#ln -s /usr/share/java/xml-apis.jar compile_lib/xml-apis.jar -#ln -s /usr/share/java/xercesImpl.jar compile_lib/xercesImpl.jar +# not needed? +rm src/edu/stanford/genetics/treeview/plugin/dendroview/dendroview.jar cd .. rm $UTAR Modified: trunk/packages/treeview/trunk/debian/patches/classpath.patch =================================================================== --- trunk/packages/treeview/trunk/debian/patches/classpath.patch 2013-04-26 13:36:33 UTC (rev 13429) +++ trunk/packages/treeview/trunk/debian/patches/classpath.patch 2013-04-27 10:13:44 UTC (rev 13430) @@ -2,8 +2,8 @@ Author: Thorsten Alteholz <deb...@alteholz.de> Index: treeview_1.1.6.2+dfsg.orig/build.xml =================================================================== ---- treeview_1.1.6.2+dfsg.orig.orig/build.xml 2013-04-25 13:25:43.000000000 +0200 -+++ treeview_1.1.6.2+dfsg.orig/build.xml 2013-04-25 13:44:05.000000000 +0200 +--- treeview_1.1.6.2+dfsg.orig.orig/build.xml 2013-04-26 10:24:51.000000000 +0200 ++++ treeview_1.1.6.2+dfsg.orig/build.xml 2013-04-26 10:45:16.000000000 +0200 @@ -83,6 +83,9 @@ <fileset dir="${app.libs}"> <include name="*.jar"/> @@ -41,7 +41,15 @@ </copy> <move file ="${plugin.dir}" todir="applet"> </move> -@@ -359,7 +362,7 @@ +@@ -342,6 +345,7 @@ + + <!-- some stuff for Mac OSX application bundles... --> + <!-- unfortunately, this only work on max os X right now. --> ++<!-- This is just needed for os X, so no need for Debian + <taskdef name="jarbundler" + classname="net.sourceforge.jarbundler.JarBundler"> + <classpath> +@@ -359,7 +363,7 @@ <jarbundler dir="bundle/TreeView" name="Java TreeView" mainclass="edu.stanford.genetics.treeview.app.LinkedViewApp" @@ -50,3 +58,12 @@ icon="static/images/treeviewIcon.icns" version="1.1.6r2" aboutmenuname="Java TreeView" +@@ -381,7 +385,7 @@ + <delete file="TreeView.jar"/> + + </target> +- ++--> + + + Modified: trunk/packages/treeview/trunk/debian/rules =================================================================== --- trunk/packages/treeview/trunk/debian/rules 2013-04-26 13:36:33 UTC (rev 13429) +++ trunk/packages/treeview/trunk/debian/rules 2013-04-27 10:13:44 UTC (rev 13430) @@ -6,18 +6,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - -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 - - %: dh $@ @@ -28,7 +16,7 @@ dh_auto_build ant jar ant plugins - (cd doc; ls -l; export XSL=/usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl; export FOP=/usr/bin; perl ./createAllDoc.pl) + (cd doc; export XSL=/usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl; export FOP=/usr/bin; perl ./createAllDoc.pl) override_dh_auto_install: find @@ -38,84 +26,6 @@ # dh_clean # ant clean -#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 -# - get-orig-source: ./debian/get-orig-source Modified: trunk/packages/treeview/trunk/debian/treeview.docs =================================================================== --- trunk/packages/treeview/trunk/debian/treeview.docs 2013-04-26 13:36:33 UTC (rev 13429) +++ trunk/packages/treeview/trunk/debian/treeview.docs 2013-04-27 10:13:44 UTC (rev 13430) @@ -1 +1,2 @@ doc/html +appletStatic Deleted: trunk/packages/treeview/trunk/debian/treeview.links =================================================================== --- trunk/packages/treeview/trunk/debian/treeview.links 2013-04-26 13:36:33 UTC (rev 13429) +++ trunk/packages/treeview/trunk/debian/treeview.links 2013-04-27 10:13:44 UTC (rev 13430) @@ -1 +0,0 @@ -usr/share/java/xml-apis.jar usr/share/treeview/lib/xml-apis.jar
_______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
