[statcvs] 18/43: [statcvs] Preparation for new upstream release, but it currently does not work
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 18 20:47:46 BST 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository statcvs.
commit de78233e1a6999f1368d72af5add3dc5a3c885b5
Author: Vincent Fourmond <fourmond at debian.org>
Date: Wed May 7 19:26:16 2008 +0000
[statcvs] Preparation for new upstream release, but it currently does not work
---
debian/changelog | 12 +++++++++
debian/control | 4 +--
debian/copyright | 3 ++-
debian/new-upstream | 3 ++-
debian/patches/00list | 1 -
debian/patches/01-disable-unjar.dpatch | 40 +++++++++++++++++++----------
debian/patches/10-fix-null-exception.dpatch | 21 ---------------
debian/rules | 2 +-
debian/wrappers/statcvs | 2 +-
9 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2714a3f..da941b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+statcvs (1:0.4.0.dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release: updated debian/new-upstream to cope for the
+ new test files in the archive
+ * Updated 01-disable-unjar
+ * Disabling 10-fix-null-exception, not needed anymore
+ * Now depends on libjdom-java as well
+ * Fix the old-fsf-address-in-copyright-file lintian warning
+ * DOES NOT CURRENTLY WORK !!!!!
+
+ -- Vincent Fourmond <fourmond at debian.org> Wed, 07 May 2008 21:25:46 +0200
+
statcvs (1:0.3.dfsg+1-1) unstable; urgency=low
* Re-uploading with a new source, so the package isn't sourceless
diff --git a/debian/control b/debian/control
index 2bde22b..e4e0631 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Vincent Fourmond <fourmond at debian.org>, Christian Bayle <bayle at debian.org>
Build-Depends-Indep: java-gcj-compat-dev
Build-Depends: cdbs, debhelper (>= 5), dpatch, ant, junit,
- libjcommon-java, libjfreechart-java
+ libjcommon-java, libjfreechart-java, libjdom-java
Standards-Version: 3.7.3
Homepage: http://statcvs.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statcvs
@@ -15,7 +15,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statcvs
Package: statcvs
Architecture: all
Depends: java-gcj-compat | java-runtime, libjcommon-java,
- libjfreechart-java, java-wrappers (>= 0.1.3)
+ libjfreechart-java, java-wrappers (>= 0.1.3), libjdom-java
Recommends: cvs
Description: CVS Repository statistic analysis tool, written in Java
StatCvs retrieves information from a CVS repository and generates
diff --git a/debian/copyright b/debian/copyright
index 90253f0..9091b27 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,8 @@ License:
You should have received a copy of the GNU Lesser 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
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'.
diff --git a/debian/new-upstream b/debian/new-upstream
index c99f931..985d3cc 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -25,7 +25,8 @@ origname=statcvs_$version.dfsg.orig.tar.gz
# We repackage excluding the lib/ subdir
cd $dir
-tar cvz --exclude '*/lib/*.jar' -f $origname stat*
+tar cvz --exclude '*/lib/*.jar' --exclude 'test*' --exclude 'site' \
+ -f $origname stat*
cd -
mv $dir/$origname ..
rm -rf $dir
\ No newline at end of file
diff --git a/debian/patches/00list b/debian/patches/00list
index a741cef..7548dad 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
01-disable-unjar
-10-fix-null-exception
\ No newline at end of file
diff --git a/debian/patches/01-disable-unjar.dpatch b/debian/patches/01-disable-unjar.dpatch
index 584ca3c..f2c3dbe 100755
--- a/debian/patches/01-disable-unjar.dpatch
+++ b/debian/patches/01-disable-unjar.dpatch
@@ -5,17 +5,29 @@
## DP: No description.
@DPATCH@
-diff -urNad statcvs-0.3.dfsg~/build.xml statcvs-0.3.dfsg/build.xml
---- statcvs-0.3.dfsg~/build.xml 2006-12-08 17:25:14.000000000 +0100
-+++ statcvs-0.3.dfsg/build.xml 2008-01-05 00:12:47.000000000 +0100
-@@ -141,8 +141,8 @@
-
- <target name="jar" depends="test">
- <!-- Creates an executable jar file for the project -->
-- <unjar src="${lib}/${jfreechart.jar}" dest="${build}"/>
-- <unjar src="${lib}/${jcommon.jar}" dest="${build}"/>
-+<!-- <unjar src="${lib}/${jfreechart.jar}" dest="${build}"/> -->
-+<!-- <unjar src="${lib}/${jcommon.jar}" dest="${build}"/> -->
- <mkdir dir="${dist}"/>
- <jar jarfile="${dist}/${project.jar}" basedir="${build}">
- <manifest>
+diff -urNad statcvs-0.4.0.dfsg~/build.xml statcvs-0.4.0.dfsg/build.xml
+--- statcvs-0.4.0.dfsg~/build.xml 2008-04-21 17:33:32.000000000 +0200
++++ statcvs-0.4.0.dfsg/build.xml 2008-05-07 21:00:52.000000000 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="iso-8859-1"?>
+-<project name="statcvs" default="all" basedir=".">
++<project name="statcvs" default="jar" basedir=".">
+ <property file="project.properties" />
+ <property name="project" value="statcvs" />
+ <property name="project.path" value="net/sf/statcvs" />
+@@ -148,11 +148,11 @@
+ </classpath>
+ </java>
+ </target>
+- <target name="jar" depends="test">
++ <target name="jar" depends="compile,javadoc">
+ <!-- Creates an executable jar file for the project -->
+- <unjar src="${lib}/${jfreechart.jar}" dest="${build}" />
+- <unjar src="${lib}/${jcommon.jar}" dest="${build}" />
+- <unjar src="${lib}/jdom.jar" dest="${build}" />
++<!-- <unjar src="${lib}/${jfreechart.jar}" dest="${build}" /> -->
++<!-- <unjar src="${lib}/${jcommon.jar}" dest="${build}" /> -->
++<!-- <unjar src="${lib}/jdom.jar" dest="${build}" /> -->
+ <mkdir dir="${dist}" />
+ <jar jarfile="${dist}/${project.jar}" basedir="${build}">
+ <manifest>
diff --git a/debian/patches/10-fix-null-exception.dpatch b/debian/patches/10-fix-null-exception.dpatch
deleted file mode 100755
index ffd09f0..0000000
--- a/debian/patches/10-fix-null-exception.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-fix-null-exception.dpatch by <fourmond at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: XYItemRenderer.getSeriesPaint return value has switched from
-## DP: never null to possibly null. Check that.
-
- at DPATCH@
-diff -urNad statcvs-0.3.dfsg~/src/net/sf/statcvs/charts/LOCChartMaker.java statcvs-0.3.dfsg/src/net/sf/statcvs/charts/LOCChartMaker.java
---- statcvs-0.3.dfsg~/src/net/sf/statcvs/charts/LOCChartMaker.java 2006-12-16 20:17:08.000000000 +0100
-+++ statcvs-0.3.dfsg/src/net/sf/statcvs/charts/LOCChartMaker.java 2008-01-05 01:48:45.000000000 +0100
-@@ -112,7 +112,8 @@
- if (colors == null) {
- // We don't like the bright yellow color early on in the series, use a darker one
- for (int i = 0; i < plot.getSeriesCount(); i++) {
-- if (plot.getRenderer().getSeriesPaint(i).equals(new Color(0xFF, 0xFF, 0x55))) {
-+ if (plot.getRenderer().getSeriesPaint(i) != null &&
-+ plot.getRenderer().getSeriesPaint(i).equals(new Color(0xFF, 0xFF, 0x55))) {
- plot.getRenderer().setSeriesPaint(i, new Color(240, 220, 0x55));
- }
- }
diff --git a/debian/rules b/debian/rules
index a1c6f2c..4913a66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/dpatch.mk
JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar \
- junit jcommon jfreechart
+ junit jcommon jfreechart jdom
DEB_ANT_COMPILER := modern
# DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder
DEB_BUILDDIR := .
diff --git a/debian/wrappers/statcvs b/debian/wrappers/statcvs
index c52a554..92f3033 100755
--- a/debian/wrappers/statcvs
+++ b/debian/wrappers/statcvs
@@ -5,6 +5,6 @@
# We first look for sun's runtime, and then for all the rest
find_java_runtime sun || find_java_runtime
-find_jars jfreechart jcommon statcvs
+find_jars jfreechart jcommon jdom statcvs
run_java net.sf.statcvs.Main "$@"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statcvs.git
More information about the pkg-java-commits
mailing list