diff -Nru jcharts-0.7.5/debian/changelog jcharts-0.7.5/debian/changelog --- jcharts-0.7.5/debian/changelog 2014-09-08 17:10:26.000000000 +0000 +++ jcharts-0.7.5/debian/changelog 2017-11-17 15:32:17.000000000 +0000 @@ -1,3 +1,14 @@ +jcharts (0.7.5-5) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 9 (Closes: #875580) + * Build with the DH sequencer instead of CDBS + * Moved the package to Git + * Standards-Version updated to 4.1.1 + * Switch to debhelper level 10 + + -- Emmanuel Bourg Fri, 17 Nov 2017 16:32:17 +0100 + jcharts (0.7.5-4) unstable; urgency=medium * Team upload. diff -Nru jcharts-0.7.5/debian/clean jcharts-0.7.5/debian/clean --- jcharts-0.7.5/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ jcharts-0.7.5/debian/clean 2017-11-17 15:20:10.000000000 +0000 @@ -0,0 +1,3 @@ +build/garbage/ +build/javadocs/ +build/jCharts-*.jar diff -Nru jcharts-0.7.5/debian/compat jcharts-0.7.5/debian/compat --- jcharts-0.7.5/debian/compat 2014-09-08 16:03:00.000000000 +0000 +++ jcharts-0.7.5/debian/compat 2017-11-17 14:50:21.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru jcharts-0.7.5/debian/control jcharts-0.7.5/debian/control --- jcharts-0.7.5/debian/control 2014-09-08 17:08:51.000000000 +0000 +++ jcharts-0.7.5/debian/control 2017-11-17 15:29:32.000000000 +0000 @@ -3,11 +3,18 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Onkar Shinde -Build-Depends: debhelper (>= 9), cdbs, ant, ant-optional -Build-Depends-Indep: default-jdk, default-jdk-doc, libbatik-java, libservlet3.1-java, libservlet3.1-java-doc -Standards-Version: 3.9.5 -Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jcharts -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jcharts +Build-Depends: + ant, + ant-optional, + debhelper (>= 10), + default-jdk, + default-jdk-doc, + libbatik-java, + libservlet3.1-java, + libservlet3.1-java-doc +Standards-Version: 4.1.1 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/jcharts.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jcharts.git Homepage: http://jcharts.sourceforge.net Package: libjcharts-java diff -Nru jcharts-0.7.5/debian/copyright jcharts-0.7.5/debian/copyright --- jcharts-0.7.5/debian/copyright 2014-09-08 16:15:28.000000000 +0000 +++ jcharts-0.7.5/debian/copyright 2017-11-17 14:52:32.000000000 +0000 @@ -6,42 +6,42 @@ Files: * Copyright: 2002, Nathaniel G. Auvil License: jCharts-License - Redistribution and use of this software and associated documentation - ("Software"), with or without modification, are permitted provided that the + Redistribution and use of this software and associated documentation + ("Software"), with or without modification, are permitted provided that the following conditions are met: . 1. Redistributions of source code must retain copyright statements and notices. Redistributions must also contain a copy of this document. . 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . - 3. The name "jCharts" or "Nathaniel G. Auvil" must not be used to endorse or - promote products derived from this Software without prior written permission + 3. The name "jCharts" or "Nathaniel G. Auvil" must not be used to endorse or + promote products derived from this Software without prior written permission of Nathaniel G. Auvil. For written permission, please contact nathaniel_auvil@users.sourceforge.net . - 4. Products derived from this Software may not be called "jCharts" nor may + 4. Products derived from this Software may not be called "jCharts" nor may "jCharts" appear in their names without prior written permission of Nathaniel G. Auvil. jCharts is a registered trademark of Nathaniel G. Auvil. . 5. Due credit should be given to the jCharts Project (http://jcharts.krysalis.org). . - THIS SOFTWARE IS PROVIDED BY Nathaniel G. Auvil AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESSED 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 jCharts OR ITS 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 + THIS SOFTWARE IS PROVIDED BY Nathaniel G. Auvil AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESSED 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 jCharts OR ITS 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: 2009, Onkar Shinde -License: GPL-3+ +License: GPL-3+ This program 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, either version 3 of the License, or diff -Nru jcharts-0.7.5/debian/patches/01_remove_old_functionality.diff jcharts-0.7.5/debian/patches/01_remove_old_functionality.diff --- jcharts-0.7.5/debian/patches/01_remove_old_functionality.diff 2014-09-08 15:59:19.000000000 +0000 +++ jcharts-0.7.5/debian/patches/01_remove_old_functionality.diff 2017-11-17 15:17:33.000000000 +0000 @@ -22,7 +22,7 @@ - + + -+ ++ + + @@ -35,7 +35,7 @@ - +Forwarded: no +--- a/src/org/jCharts/chartText/TextTag.java ++++ b/src/org/jCharts/chartText/TextTag.java +@@ -404,15 +404,15 @@ + + if( attributes != null && attributes.size() > 0 ) + { +- java.util.Enumeration enum = attributes.keys(); ++ java.util.Enumeration enumeration = attributes.keys(); + str += "\nAttributes:"; +- while( enum.hasMoreElements() ) ++ while( enumeration.hasMoreElements() ) + { +- Object ob = enum.nextElement(); ++ Object ob = enumeration.nextElement(); + str += " [" + ob.toString() + "]=[" + attributes.get( ob ).toString() + "]\n"; + } + } + + return str; + } +-} +\ No newline at end of file ++} diff -Nru jcharts-0.7.5/debian/patches/series jcharts-0.7.5/debian/patches/series --- jcharts-0.7.5/debian/patches/series 2014-09-08 15:59:19.000000000 +0000 +++ jcharts-0.7.5/debian/patches/series 2017-11-17 15:13:49.000000000 +0000 @@ -1 +1,2 @@ 01_remove_old_functionality.diff +02_java5_compatibility.patch diff -Nru jcharts-0.7.5/debian/rules jcharts-0.7.5/debian/rules --- jcharts-0.7.5/debian/rules 2014-09-08 17:07:16.000000000 +0000 +++ jcharts-0.7.5/debian/rules 2017-11-17 15:31:11.000000000 +0000 @@ -1,22 +1,20 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +export CLASSPATH=/usr/share/java/batik.jar:/usr/share/java/servlet-api-3.1.jar -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILDFILE := build/build.xml -DEB_JARS := batik servlet-api-3.1 -ANT_ARGS := -Dbatik.classpath=/usr/share/java/batik.jar -Dant.build.javac.source=1.4 -DEB_ANT_BUILD_TARGET := jar javadocs - -clean:: - rm -rf build/garbage - rm -rf build/javadocs - rm -f build/jCharts-$(DEB_UPSTREAM_VERSION).jar - -install/libjcharts-java:: - dh_install build/jCharts-$(DEB_UPSTREAM_VERSION).jar usr/share/java/ - dh_link /usr/share/java/jCharts-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jcharts.jar +%: + dh $@ --buildsystem=ant + +override_dh_auto_build: + dh_auto_build -- -f build/build.xml -Dbatik.classpath=/usr/share/java/batik.jar -Dant.build.javac.source=1.7 jar javadocs + +override_dh_auto_test: + +override_dh_auto_clean: + +override_dh_auto_install: + dh_install build/jCharts-0.7.5.jar usr/share/java/ + dh_link /usr/share/java/jCharts-0.7.5.jar usr/share/java/jcharts.jar get-orig-source: uscan --verbose --force-download