[pkg-java] r11813 - in trunk/statcvs/debian: . patches source
Vincent Fourmond
fourmond at alioth.debian.org
Sat Mar 6 21:56:48 UTC 2010
Author: fourmond
Date: 2010-03-06 21:56:48 +0000 (Sat, 06 Mar 2010)
New Revision: 11813
Added:
trunk/statcvs/debian/patches/01-disable-unjar.diff
trunk/statcvs/debian/patches/10-disable-jtreemap.diff
trunk/statcvs/debian/patches/series
trunk/statcvs/debian/source/
trunk/statcvs/debian/source/format
Removed:
trunk/statcvs/debian/patches/00list
trunk/statcvs/debian/patches/01-disable-unjar.dpatch
trunk/statcvs/debian/patches/10-disable-jtreemap.dpatch
Modified:
trunk/statcvs/debian/changelog
trunk/statcvs/debian/control
trunk/statcvs/debian/new-upstream
trunk/statcvs/debian/rules
Log:
[statcvs] New upstream release + switch to format 3.0
Modified: trunk/statcvs/debian/changelog
===================================================================
--- trunk/statcvs/debian/changelog 2010-03-06 20:22:24 UTC (rev 11812)
+++ trunk/statcvs/debian/changelog 2010-03-06 21:56:48 UTC (rev 11813)
@@ -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 <fourmond at debian.org> Sat, 06 Mar 2010 22:56:45 +0100
+
statcvs (1:0.5.0.dfsg-2) unstable; urgency=low
* Moved to Section: vcs
Modified: trunk/statcvs/debian/control
===================================================================
--- trunk/statcvs/debian/control 2010-03-06 20:22:24 UTC (rev 11812)
+++ trunk/statcvs/debian/control 2010-03-06 21:56:48 UTC (rev 11813)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
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 (>= 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
Modified: trunk/statcvs/debian/new-upstream
===================================================================
--- trunk/statcvs/debian/new-upstream 2010-03-06 20:22:24 UTC (rev 11812)
+++ trunk/statcvs/debian/new-upstream 2010-03-06 21:56:48 UTC (rev 11813)
@@ -21,7 +21,7 @@
# 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 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 ..
Deleted: trunk/statcvs/debian/patches/00list
===================================================================
--- trunk/statcvs/debian/patches/00list 2010-03-06 20:22:24 UTC (rev 11812)
+++ trunk/statcvs/debian/patches/00list 2010-03-06 21:56:48 UTC (rev 11813)
@@ -1,2 +0,0 @@
-01-disable-unjar
-10-disable-jtreemap
Copied: trunk/statcvs/debian/patches/01-disable-unjar.diff (from rev 11810, trunk/statcvs/debian/patches/01-disable-unjar.dpatch)
===================================================================
--- trunk/statcvs/debian/patches/01-disable-unjar.diff (rev 0)
+++ trunk/statcvs/debian/patches/01-disable-unjar.diff 2010-03-06 21:56:48 UTC (rev 11813)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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. Also disable tests, as their source isn't provided.
+
+ at DPATCH@
+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=".">
++<project name="statcvs" default="jar" basedir=".">
+ <property file="project.properties" />
+ <property name="project" value="statcvs" />
+ <property name="project.path" value="net/sf/statcvs" />
+@@ -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="compile,copyfiles">
+ <!-- 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>
Deleted: trunk/statcvs/debian/patches/01-disable-unjar.dpatch
===================================================================
--- trunk/statcvs/debian/patches/01-disable-unjar.dpatch 2010-03-06 20:22:24 UTC (rev 11812)
+++ trunk/statcvs/debian/patches/01-disable-unjar.dpatch 2010-03-06 21:56:48 UTC (rev 11813)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 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. Also disable tests, as their source isn't provided.
-
- at 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
-@@ -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" />
-@@ -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="compile,copyfiles">
- <!-- 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>
Copied: trunk/statcvs/debian/patches/10-disable-jtreemap.diff (from rev 11810, trunk/statcvs/debian/patches/10-disable-jtreemap.dpatch)
===================================================================
--- trunk/statcvs/debian/patches/10-disable-jtreemap.diff (rev 0)
+++ trunk/statcvs/debian/patches/10-disable-jtreemap.diff 2010-03-06 21:56:48 UTC (rev 11813)
@@ -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 <fourmond at debian.org>
+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);
Deleted: trunk/statcvs/debian/patches/10-disable-jtreemap.dpatch
===================================================================
--- trunk/statcvs/debian/patches/10-disable-jtreemap.dpatch 2010-03-06 20:22:24 UTC (rev 11812)
+++ trunk/statcvs/debian/patches/10-disable-jtreemap.dpatch 2010-03-06 21:56:48 UTC (rev 11813)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-disable-jtreemap.dpatch by <fourmond at debian.org>
-##
-## DP: jtreemap is not available for Debian, so we don't generate the
-## DP: corresponding page.
-
- at 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()) {
Copied: trunk/statcvs/debian/patches/series (from rev 11810, trunk/statcvs/debian/patches/00list)
===================================================================
--- trunk/statcvs/debian/patches/series (rev 0)
+++ trunk/statcvs/debian/patches/series 2010-03-06 21:56:48 UTC (rev 11813)
@@ -0,0 +1,2 @@
+01-disable-unjar.diff
+10-disable-jtreemap.diff
Modified: trunk/statcvs/debian/rules
===================================================================
--- trunk/statcvs/debian/rules 2010-03-06 20:22:24 UTC (rev 11812)
+++ trunk/statcvs/debian/rules 2010-03-06 21:56:48 UTC (rev 11813)
@@ -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
Added: trunk/statcvs/debian/source/format
===================================================================
--- trunk/statcvs/debian/source/format (rev 0)
+++ trunk/statcvs/debian/source/format 2010-03-06 21:56:48 UTC (rev 11813)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list