[statcvs] 25/43: [statcvs] Further work with newer upstream release - does not build yet

[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 8c782a869b4ce89edf21908da08bdb6692a67038
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Tue Jun 16 22:47:07 2009 +0000

    [statcvs] Further work with newer upstream release - does not build yet
---
 debian/changelog                       |  8 ++++++--
 debian/control                         |  4 ++--
 debian/patches/01-disable-unjar.dpatch | 15 ++++++---------
 debian/rules                           |  7 +++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce24683..dc987a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-statcvs (1:0.5.0.dfsg-1) UNRELEASED; urgency=low
+statcvs (1:0.5.0.dfsg-1) experimental; urgency=low
 
   * New upstream release.
   * Already conforms to standards 3.8.1
@@ -6,8 +6,12 @@ statcvs (1:0.5.0.dfsg-1) UNRELEASED; urgency=low
   * Bump debhelper compatibility level to 5 
   * Add ant clean in debian/new-upstream to avoid adding temporary files
     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...
 
- -- Vincent Fourmond <fourmond at debian.org>  Sun, 31 May 2009 00:23:10 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 17 Jun 2009 00:45:38 +0200
 
 statcvs (1:0.4.0.dfsg-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 73b23d2..2626980 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, libjdom1-java
+ libjcommon-java, libjfreechart-java (>= 1.0.13), libjdom1-java
 Standards-Version: 3.8.1
 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), libjdom1-java,
+ libjfreechart-java (>= 1.0.13), java-wrappers (>= 0.1.15), libjdom1-java,
  ${misc:Depends}
 Conflicts: statsvn (< 0.4.0)
 Recommends: cvs
diff --git a/debian/patches/01-disable-unjar.dpatch b/debian/patches/01-disable-unjar.dpatch
index 969cc41..c5c213d 100755
--- a/debian/patches/01-disable-unjar.dpatch
+++ b/debian/patches/01-disable-unjar.dpatch
@@ -5,9 +5,9 @@
 ## DP: to unpack them.
 
 @DPATCH@
-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:43:43.000000000 +0200
+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
 @@ -1,5 +1,5 @@
  <?xml version="1.0" encoding="iso-8859-1"?>
 -<project name="statcvs" default="all" basedir=".">
@@ -15,12 +15,9 @@ diff -urNad statcvs-0.4.0.dfsg~/build.xml statcvs-0.4.0.dfsg/build.xml
    <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,copyfiles">
+@@ -151,9 +151,9 @@
+   <target name="release" depends="clean,jar,javadoc,zip,zip.source"/>
+   <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}" />
diff --git a/debian/rules b/debian/rules
index c727dd0..263500b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,16 +4,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \
-	sed -r 's/Version:\s*//' | sed -r 's/^[0-9]+://' | \
-	sed -r 's/(\.dfsg)?-[0-9.]+//')
-
 # export JITC_PROCESSOR_TYPE=6
 
 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))
+
 JAVA_HOME_DIRS       := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar \
@@ -26,6 +24,7 @@ DEB_ANT_CLEAN_TARGET := clean
 
 print-version:
 	echo $(VERSION)
+	echo $(DEB_UPSTREAM_VERSION)
 
 install/statcvs::
 	install -m 644 dist/statcvs.jar debian/statcvs/usr/share/java/statcvs-$(VERSION).jar

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