--- jas-plotter-2.2.6+dfsg1.orig/debian/control +++ jas-plotter-2.2.6+dfsg1/debian/control @@ -0,0 +1,28 @@ +Source: jas-plotter +Section: java +Priority: optional +Maintainer: Debian Java Maintainers +Uploaders: Giovanni Mascellani , + Gabriele Giacone <1o5g4r8o@gmail.com> +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, quilt +Build-Depends-Indep: libsurefire-java (>= 2.4.3), javahelp2 (>= 2.0.05.ds1-3), junit, + libxerces2-java, libtablelayout-java (>= 20090826) +Standards-Version: 3.8.3 +Vcs-Git: git://git.debian.org/git/pkg-java/freehep/jas-plotter.git +Vcs-Browser: http://git.debian.org/?p=pkg-java/freehep/jas-plotter.git;a=summary +Homepage: http://java.freehep.org/jas-plotter/ + +Package: libjas-plotter-java +Architecture: all +Depends: ${misc:Depends}, ${maven:Depends}, libtablelayout-java, + openjdk-6-jre | java2-runtime +Recommends: ${maven:OptionalDepends} +Description: JAS(2) Plotter graphic library + This library, part of the Java Analysis Studio distribution, is able to + draw various sorts of plots, such as monodimensional and bidimensinal + histograms, scatter plots or function fits. Many aspects of the plots, + such as the color or the style of the lines, can also be interactively + modified via a Swing interface. + . + This library is used in FreeHEP, a collection of Java libraries used + in High Energy Physics. --- jas-plotter-2.2.6+dfsg1.orig/debian/compat +++ jas-plotter-2.2.6+dfsg1/debian/compat @@ -0,0 +1 @@ +7 --- jas-plotter-2.2.6+dfsg1.orig/debian/maven.rules +++ jas-plotter-2.2.6+dfsg1/debian/maven.rules @@ -0,0 +1 @@ +junit junit jar s/.*/3.x/ * --- jas-plotter-2.2.6+dfsg1.orig/debian/gbp.conf +++ jas-plotter-2.2.6+dfsg1/debian/gbp.conf @@ -0,0 +1,7 @@ + +[DEFAULT] +cleaner = fakeroot debian/rules clean +upstream-branch = upstream +debian-branch = build +pristine-tar = True + --- jas-plotter-2.2.6+dfsg1.orig/debian/copyright +++ jas-plotter-2.2.6+dfsg1/debian/copyright @@ -0,0 +1,47 @@ +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: JAS(2) Plotter +Maintainer: The FreeHEP team +Source: http://java.freehep.org/jas-plotter + +Files: * +Copyright: 2000-2007, CERN, Geneva, Switzerland + 2000-2007, SLAC, Stanford, California, U.S.A. + 2000-2007, University of California Santa Cruz, U.S.A. +License: LGPL-2.1+ + On Debian GNU/Linux system you can find the complete text of the + LGPL-2.1 license in '/usr/share/common-licenses/LGPL-2.1' + No license files are included in upstream tarball but copyright holders + list is available at + + and adopted license at + +Files: src/main/java/jas/util/encoder/GifEncoder.java, \ + src/main/java/jas/util/encoder/ImageEncoder.java +Copyright: 1996-1998, Jef Poskanzer +License: other + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +Files: debian/* +Copyright: 2010, Giovanni Mascellani + 2010, Gabriele Giacone <1o5g4r8o@gmail.com> +License: GPL-3+ + On Debian GNU/Linux system you can find the complete text of the + GPL-3 license in '/usr/share/common-licenses/GPL-3' --- jas-plotter-2.2.6+dfsg1.orig/debian/rules +++ jas-plotter-2.2.6+dfsg1/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +-include /usr/share/topgit/tg2quilt.mk + +JAVA_HOME := /usr/lib/jvm/default-java + --- jas-plotter-2.2.6+dfsg1.orig/debian/maven.properties +++ jas-plotter-2.2.6+dfsg1/debian/maven.properties @@ -0,0 +1 @@ +maven.test.skip=true --- jas-plotter-2.2.6+dfsg1.orig/debian/README.source +++ jas-plotter-2.2.6+dfsg1/debian/README.source @@ -0,0 +1,39 @@ +Information about jas-plotter +------------------------------ + +DEBIANIZATION + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. + + +QUILT + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. Please see: + + /usr/share/doc/quilt/README.source + +for more information on how to apply the patches, modify patches, or +remove a patch. + + +REPACKAGING + +The original tarball for this package has been modified, because it +included some code with problematic copyright status. The following +files and directories were deleted: + * src/main/java/tablelayout (not DFSG compliant); + * src/main/java/jas/util/layout/PnutsLayout.java (SPL license, not + GPL compatible and hardly DFSG compliant); + * src/main/java/jas/util/xml/XMLCharacterProperties.java (Apache 1.1 + license, not GPL compatible). + +The removed code wasn't needed, or it was simply replaceable. See +quilt patches for replacing code. + --- jas-plotter-2.2.6+dfsg1.orig/debian/watch +++ jas-plotter-2.2.6+dfsg1/debian/watch @@ -0,0 +1,2 @@ +# Watch file missing, because upstream releases are available only via +# SVN, but uscan is unable to read in a SVN repository. --- jas-plotter-2.2.6+dfsg1.orig/debian/changelog +++ jas-plotter-2.2.6+dfsg1/debian/changelog @@ -0,0 +1,5 @@ +jas-plotter (2.2.6+dfsg1-1) unstable; urgency=low + + * Initial release (Closes: #558344) + + -- Giovanni Mascellani Sun, 24 Jan 2010 17:51:40 +0100 --- jas-plotter-2.2.6+dfsg1.orig/debian/libjas-plotter-java.poms +++ jas-plotter-2.2.6+dfsg1/debian/libjas-plotter-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent --- jas-plotter-2.2.6+dfsg1.orig/debian/patches/series +++ jas-plotter-2.2.6+dfsg1/debian/patches/series @@ -0,0 +1,3 @@ +patch/XMLCharacterProperties.java.diff -p1 +patch/pom.xml.diff -p1 +patch/tablelayout.diff -p1 --- jas-plotter-2.2.6+dfsg1.orig/debian/patches/patch/tablelayout.diff +++ jas-plotter-2.2.6+dfsg1/debian/patches/patch/tablelayout.diff @@ -0,0 +1,27 @@ +From: Gabriele Giacone <1o5g4r8o@gmail.com> +Subject: [PATCH] patch/tablelayout + +To compile against Debian libtablelayout-java under +/usr/share/java/tablelayout.jar + +Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com> + +--- + src/main/java/jas/hist/JASHistPropertyDialog.java | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/main/java/jas/hist/JASHistPropertyDialog.java b/src/main/java/jas/hist/JASHistPropertyDialog.java +index 2d05d8a..9a9f250 100644 +--- a/src/main/java/jas/hist/JASHistPropertyDialog.java ++++ b/src/main/java/jas/hist/JASHistPropertyDialog.java +@@ -46,7 +46,7 @@ import javax.swing.event.ChangeEvent; + import javax.swing.event.ChangeListener; + import javax.swing.event.ListSelectionEvent; + import javax.swing.event.ListSelectionListener; +-import tablelayout.TableLayout; ++import org.debian.tablelayout.TableLayout; + + + public final class JASHistPropertyDialog extends PropertyDialog +-- +tg: (220529a..) patch/tablelayout (depends on: master) --- jas-plotter-2.2.6+dfsg1.orig/debian/patches/patch/pom.xml.diff +++ jas-plotter-2.2.6+dfsg1/debian/patches/patch/pom.xml.diff @@ -0,0 +1,46 @@ +From: Gabriele Giacone <1o5g4r8o@gmail.com> +Subject: [PATCH] patch/pom.xml + + - Removed dependence on freehep-export (cyclic dependency) + - Added dependence on Debian libtablelayout + +Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com> + +--- + pom.xml | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/pom.xml b/pom.xml +index ed34af3..ade5308 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -29,12 +29,6 @@ + + + +- org.freehep +- freehep-export +- 2.1.1 +- test +- +- + javax.help + javahelp + 2.0.02 +@@ -48,7 +42,13 @@ + + junit + junit +- ++ ++ ++ org.debian ++ tablelayout ++ system ++ /usr/share/java/tablelayout.jar ++ + + + +-- +tg: (220529a..) patch/pom.xml (depends on: master) --- jas-plotter-2.2.6+dfsg1.orig/debian/patches/patch/XMLCharacterProperties.java.diff +++ jas-plotter-2.2.6+dfsg1/debian/patches/patch/XMLCharacterProperties.java.diff @@ -0,0 +1,99 @@ +From: Giovanni Mascellani +Subject: [PATCH] patch/XMLCharacterProperties.java + +Substitute for XMLCharacterProperties.java, which is not compatible with LGPL. + +Signed-off-by: Giovanni Mascellani + +--- + .../java/jas/util/xml/XMLCharacterProperties.java | 80 ++++++++++++++++++++ + 1 files changed, 80 insertions(+), 0 deletions(-) + +diff --git a/src/main/java/jas/util/xml/XMLCharacterProperties.java b/src/main/java/jas/util/xml/XMLCharacterProperties.java +new file mode 100644 +index 0000000..394acd7 +--- /dev/null ++++ b/src/main/java/jas/util/xml/XMLCharacterProperties.java +@@ -0,0 +1,80 @@ ++/* ++ * Copyright 2010 by Giovanni Mascellani ++ * ++ * This class is meant as a substitute for the original XMLCharacterProperties ++ * in JAS Plotter, which is picked out from Xerces, but it licensed ++ * under Apache 1.1 license (GPL-incompatible). IT IS NOT A COMPLETE ++ * REPLACEMENT: it just implements the three methods needed by JAS Plotter. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++package jas.util.xml; ++ ++public class XMLCharacterProperties { ++ ++ public static boolean isLetter(char c) { ++ return ((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')); ++ } ++ ++ public static boolean isDigit(char c) { ++ return (c >= '0') && (c <= '9'); ++ } ++ ++ /* ++ * [26] VersionNum ::= ([a-zA-Z0-9_.:] | '-')+ ++ */ ++ public static boolean validVersionNum(String name) { ++ int len = name.length(); ++ if (len == 0) return false; ++ for (int i = 0; i < len; i++) { ++ char c = name.charAt(i); ++ if (!(isLetter(c) || isDigit(c) || c == '_' || c == '.' || c == ':' || c == '-')) return false; ++ } ++ return true; ++ } ++ ++ /* ++ * [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* ++ */ ++ public static boolean validEncName(String name) { ++ int len = name.length(); ++ if (len == 0) return false; ++ if (!isLetter(name.charAt(0))) return false; ++ for (int i = 1; i < len; i++) { ++ char c = name.charAt(i); ++ if (!(isLetter(c) || isDigit(c) || c == '.' || c == '_' || c == '-')) return false; ++ } ++ return true; ++ } ++ ++ /* ++ * [5] Name ::= (Letter | '_' | ':') (NameChar)* ++ */ ++ public static boolean validName(String name) { ++ int len = name.length(); ++ if (len == 0) return false; ++ char c = name.charAt(0); ++ if (!(isLetter(c) || c == '_' || c == ':')) return false; ++ for (int i = 1; i < len; i++) { ++ c = name.charAt(i); ++ if (!(isLetter(c) || isDigit(c) || c == '_' || c == '.' || c == ':' || c == '-')) return false; ++ } ++ return true; ++ } ++ ++} ++ +-- +tg: (2e38280..) patch/XMLCharacterProperties.java (depends on: master)