[statcvs] 26/43: [statcvs] Nearly builds now ;-)...

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository statcvs.

commit 97117e37b31c9ed711ac9fc6ff1e9a118c9393f7
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Thu Jun 18 23:39:18 2009 +0000

    [statcvs] Nearly builds now ;-)...
---
 debian/changelog                       |  7 ++++---
 debian/patches/01-disable-unjar.dpatch | 11 +++++++----
 debian/rules                           |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc987a4..f048fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-statcvs (1:0.5.0.dfsg-1) experimental; urgency=low
+statcvs (1:0.5.0.dfsg-1) UNRELEASED experimental; urgency=low
 
   * New upstream release.
   * Already conforms to standards 3.8.1
@@ -8,10 +8,11 @@ statcvs (1:0.5.0.dfsg-1) experimental; urgency=low
     in the orig tarball
   * Refreshed debian/patches/01-disable-unjar
   * Upload to experimental to allow for tests with statsvn
-  * NOT YET READY FOR UPLOAD.
   * I have finally learned how to use DEB_UPSTREAM_VERSION...
+  * This version requires libjfreechart-java version 1.0.13
+  * Disable tests from the build system, as their source isn't provided.
 
- -- Vincent Fourmond <fourmond at debian.org>  Wed, 17 Jun 2009 00:45:38 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Fri, 19 Jun 2009 01:24:07 +0200
 
 statcvs (1:0.4.0.dfsg-3) unstable; urgency=low
 
diff --git a/debian/patches/01-disable-unjar.dpatch b/debian/patches/01-disable-unjar.dpatch
index c5c213d..6308050 100755
--- a/debian/patches/01-disable-unjar.dpatch
+++ b/debian/patches/01-disable-unjar.dpatch
@@ -2,12 +2,12 @@
 ## 01-disable-unjar.dpatch by  <fourmond at debian.org>
 ##
 ## DP: We don't ship the external prebuilt jars, so we don't need
-## DP: to unpack them.
+## DP: to unpack them. Also disable tests, as their source isn't provided.
 
 @DPATCH@
 diff -urNad statcvs-0.5.0.dfsg~/build.xml statcvs-0.5.0.dfsg/build.xml
 --- statcvs-0.5.0.dfsg~/build.xml	2009-05-09 20:33:32.000000000 +0200
-+++ statcvs-0.5.0.dfsg/build.xml	2009-06-17 00:15:49.000000000 +0200
++++ statcvs-0.5.0.dfsg/build.xml	2009-06-19 01:23:35.000000000 +0200
 @@ -1,5 +1,5 @@
  <?xml version="1.0" encoding="iso-8859-1"?>
 -<project name="statcvs" default="all" basedir=".">
@@ -15,9 +15,12 @@ diff -urNad statcvs-0.5.0.dfsg~/build.xml statcvs-0.5.0.dfsg/build.xml
    <property file="project.properties" />
    <property name="project" value="statcvs" />
    <property name="project.path" value="net/sf/statcvs" />
-@@ -151,9 +151,9 @@
+@@ -149,11 +149,11 @@
+     </java>
+   </target>
    <target name="release" depends="clean,jar,javadoc,zip,zip.source"/>
-   <target name="jar" depends="test">
+-  <target name="jar" depends="test">
++  <target name="jar" depends="compile,copyfiles">
      <!-- Creates an executable jar file for the project -->
 -    <unjar src="${lib}/${jfreechart.jar}" dest="${build}" />
 -    <unjar src="${lib}/${jcommon.jar}" dest="${build}" />
diff --git a/debian/rules b/debian/rules
index 263500b..163c210 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
-VERSION = $(subst .dfsg,, $(DEB_UPSTREAM_VERSION))
+VERSION=$(subst .dfsg,,$(DEB_UPSTREAM_VERSION))
 
 JAVA_HOME_DIRS       := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar \
 	junit jcommon jfreechart jdom1
 DEB_ANT_COMPILER     := modern
-# DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder
+DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statcvs.git