This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository statcvs.
commit 40ea4e1bab9adbfe6b562b1be714099ce4cf132b Author: Vincent Fourmond <[email protected]> Date: Sat Mar 6 21:56:48 2010 +0000 [statcvs] New upstream release + switch to format 3.0 --- debian/changelog | 8 +++++++ debian/control | 6 +++--- debian/new-upstream | 4 ++-- debian/patches/00list | 2 -- ...-disable-unjar.dpatch => 01-disable-unjar.diff} | 7 +++--- debian/patches/10-disable-jtreemap.diff | 25 ++++++++++++++++++++++ debian/patches/10-disable-jtreemap.dpatch | 20 ----------------- debian/patches/series | 2 ++ debian/rules | 4 ++-- debian/source/format | 1 + 10 files changed, 47 insertions(+), 32 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14d12b9..77f560f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +statcvs (1:0.7.0.dfsg-1) experimental/UNRELEASED; urgency=low + + * Newer upstream release + * Switch to format 3.0 (quilt), and convert patches to the quilt format + * Refresh/update patches + + -- Vincent Fourmond <[email protected]> Sat, 06 Mar 2010 22:56:45 +0100 + statcvs (1:0.5.0.dfsg-2) unstable; urgency=low * Moved to Section: vcs diff --git a/debian/control b/debian/control index f92a88d..37a1c99 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: vcs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Vincent Fourmond <[email protected]>, Christian Bayle <[email protected]> -Build-Depends-Indep: java-gcj-compat-dev -Build-Depends: cdbs, debhelper (>= 5), dpatch, ant, junit, - libjcommon-java, libjfreechart-java (>= 1.0.13), libjdom1-java +Build-Depends: cdbs, debhelper (>= 5), ant, junit, + libjcommon-java, libjfreechart-java (>= 1.0.13), libjdom1-java, + default-jdk Standards-Version: 3.8.2 Homepage: http://statcvs.sourceforge.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statcvs diff --git a/debian/new-upstream b/debian/new-upstream index 1a65d3e..4e224bf 100755 --- a/debian/new-upstream +++ b/debian/new-upstream @@ -21,7 +21,7 @@ origdir=`pwd` # We repackage the upstream source zip file: unzip $filename -d $dir -origname=statcvs_$version.dfsg.orig.tar.gz +origname=statcvs_$version.dfsg.orig.tar.bz2 # We repackage excluding the lib/ subdir @@ -29,7 +29,7 @@ cd $dir cd statcvs*/ ant clean cd .. -tar cvz --exclude '*/lib/*.jar' --exclude 'test*' --exclude 'site' \ +tar cvj --exclude '*/lib/*.jar' --exclude 'test*' --exclude 'site' \ --exclude 'jtreemap*.jar' -f $origname stat* cd $origdir mv $dir/$origname .. diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index d11dd3a..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,2 +0,0 @@ -01-disable-unjar -10-disable-jtreemap diff --git a/debian/patches/01-disable-unjar.dpatch b/debian/patches/01-disable-unjar.diff similarity index 83% rename from debian/patches/01-disable-unjar.dpatch rename to debian/patches/01-disable-unjar.diff index 6308050..3982638 100755 --- a/debian/patches/01-disable-unjar.dpatch +++ b/debian/patches/01-disable-unjar.diff @@ -5,9 +5,10 @@ ## 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-19 01:23:35.000000000 +0200 +Index: statcvs-0.7.0.dfsg/build.xml +=================================================================== +--- statcvs-0.7.0.dfsg.orig/build.xml 2009-05-09 20:33:32.000000000 +0200 ++++ statcvs-0.7.0.dfsg/build.xml 2010-03-06 22:49:44.479656166 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<project name="statcvs" default="all" basedir="."> diff --git a/debian/patches/10-disable-jtreemap.diff b/debian/patches/10-disable-jtreemap.diff new file mode 100755 index 0000000..04373f1 --- /dev/null +++ b/debian/patches/10-disable-jtreemap.diff @@ -0,0 +1,25 @@ +Description: Disable the repository map generation, as we don't ship + JTreeMap, which is necessary to actually view the map. + . + This admittedly will have to be improved one day. +Author: Vincent Fourmond <[email protected]> +Index: statcvs-0.7.0.dfsg/src/net/sf/statcvs/pages/ReportSuiteMaker.java +=================================================================== +--- statcvs-0.7.0.dfsg.orig/src/net/sf/statcvs/pages/ReportSuiteMaker.java 2009-08-22 11:30:42.000000000 +0200 ++++ statcvs-0.7.0.dfsg/src/net/sf/statcvs/pages/ReportSuiteMaker.java 2010-03-06 22:51:56.619651549 +0100 +@@ -134,10 +134,11 @@ + modulePage.write(); + } + +- final NavigationNode repoPage = new RepoMapPageMaker(config).toFile(); +- mainMenu.add(repoPage); +- repoPage.setParent(indexPageMaker.getPage()); +- repoPage.write(); ++ // Disable the map generation as JTreeMap is yet unpackaged ++ // final NavigationNode repoPage = new RepoMapPageMaker(config).toFile(); ++ // mainMenu.add(repoPage); ++ // repoPage.setParent(indexPageMaker.getPage()); ++ // repoPage.write(); + + final NavigationNode churnPage = new ChurnPageMaker(config).toFile(); + mainMenu.add(churnPage); diff --git a/debian/patches/10-disable-jtreemap.dpatch b/debian/patches/10-disable-jtreemap.dpatch deleted file mode 100755 index d23ed41..0000000 --- a/debian/patches/10-disable-jtreemap.dpatch +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10-disable-jtreemap.dpatch by <[email protected]> -## -## DP: jtreemap is not available for Debian, so we don't generate the -## DP: corresponding page. - -@DPATCH@ -diff -urNad statcvs-0.4.0.dfsg~/src/net/sf/statcvs/pages/ReportSuiteMaker.java statcvs-0.4.0.dfsg/src/net/sf/statcvs/pages/ReportSuiteMaker.java ---- statcvs-0.4.0.dfsg~/src/net/sf/statcvs/pages/ReportSuiteMaker.java 2008-04-02 12:22:14.000000000 +0200 -+++ statcvs-0.4.0.dfsg/src/net/sf/statcvs/pages/ReportSuiteMaker.java 2008-06-28 13:05:49.000000000 +0200 -@@ -90,7 +90,8 @@ - mainMenu.add(new LOCPageMaker(this.config).toFile()); - mainMenu.add(new FileSizesPageMaker(this.config).toFile()); - mainMenu.add(new DirectorySizesPageMaker(this.config).toFile()); -- mainMenu.add(new RepoMapPageMaker(config).toFile()); -+ // Disabled as debian currently does not distribute jtreemap -+ // mainMenu.add(new RepoMapPageMaker(config).toFile()); - mainMenu.add(new ChurnPageMaker(config).toFile()); - Iterator it = this.extraPages.iterator(); - while (it.hasNext()) { diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..117f89a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +01-disable-unjar.diff +10-disable-jtreemap.diff diff --git a/debian/rules b/debian/rules index 163c210..83dc5ed 100755 --- a/debian/rules +++ b/debian/rules @@ -8,11 +8,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/dpatch.mk +# include /usr/share/cdbs/1/rules/dpatch.mk VERSION=$(subst .dfsg,,$(DEB_UPSTREAM_VERSION)) -JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj +JAVA_HOME_DIRS := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar \ junit jcommon jfreechart jdom1 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statcvs.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
