Author: fourmond Date: 2010-03-08 21:17:19 +0000 (Mon, 08 Mar 2010) New Revision: 11820
Added: trunk/statsvn/debian/patches/10-build-xml-classpath.diff trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff trunk/statsvn/debian/patches/20-disable-jtreemap.diff trunk/statsvn/debian/patches/series trunk/statsvn/debian/source/ trunk/statsvn/debian/source/format Removed: trunk/statsvn/debian/patches/00list trunk/statsvn/debian/patches/10-build-xml-classpath.dpatch trunk/statsvn/debian/patches/15-build-xml-build-jar-only.dpatch trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch Modified: trunk/statsvn/debian/changelog trunk/statsvn/debian/control trunk/statsvn/debian/new-upstream trunk/statsvn/debian/rules Log: [statsvn] Beginnings of the new upstream release Modified: trunk/statsvn/debian/changelog =================================================================== --- trunk/statsvn/debian/changelog 2010-03-08 20:54:00 UTC (rev 11819) +++ trunk/statsvn/debian/changelog 2010-03-08 21:17:19 UTC (rev 11820) @@ -1,3 +1,12 @@ +statsvn (0.7.0.dfsg-1) NOTREADYYET; urgency=low + + * New upstream release (closes: #572613) + * Switch to source format 3.0 (quilt) + * Drop build-dependency on dpatch, now unneeded + * Now conforms to standards 3.8.4 + + -- Vincent Fourmond <[email protected]> Mon, 08 Mar 2010 21:16:59 +0100 + statsvn (0.5.0.dfsg-1) unstable; urgency=low * New upstream release Modified: trunk/statsvn/debian/control =================================================================== --- trunk/statsvn/debian/control 2010-03-08 20:54:00 UTC (rev 11819) +++ trunk/statsvn/debian/control 2010-03-08 21:17:19 UTC (rev 11820) @@ -4,10 +4,9 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Vincent Fourmond <[email protected]> Build-Depends-Indep: java-gcj-compat-dev -Build-Depends: cdbs, debhelper (>= 5), dpatch, ant, - libbackport-util-concurrent-java, - libjcommon-java, libjfreechart-java, statcvs (>= 1:0.5.0) -Standards-Version: 3.8.2 +Build-Depends: cdbs, debhelper (>= 5), ant, libbackport-util-concurrent-java, + libjcommon-java, libjfreechart-java, statcvs (>= 1:0.7.0) +Standards-Version: 3.8.4 Homepage: http://www.statsvn.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statsvn Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statsvn @@ -16,7 +15,7 @@ Package: statsvn Architecture: all Depends: java-gcj-compat | java-runtime, libjcommon-java, - libjfreechart-java, libbackport-util-concurrent-java, statcvs (>= 1:0.5.0), + libjfreechart-java, libbackport-util-concurrent-java, statcvs (>= 1:0.7.0), subversion, java-wrappers (>= 0.1.4), ${misc:Depends} Description: SVN repository statistics StatSVN retrieves information from a Subversion repository and generates Modified: trunk/statsvn/debian/new-upstream =================================================================== --- trunk/statsvn/debian/new-upstream 2010-03-08 20:54:00 UTC (rev 11819) +++ trunk/statsvn/debian/new-upstream 2010-03-08 21:17:19 UTC (rev 11820) @@ -21,11 +21,11 @@ # We repackage the upstream source zip file: unzip $filename -d $dir -origname=statsvn_$version.dfsg.orig.tar.gz +origname=statsvn_$version.dfsg.orig.tar.bz2 # We repackage excluding the lib/ subdir -- and various other ones cd $dir -tar cvz \ +tar cvj \ --exclude '*/lib/*.jar' \ --exclude 'bin' \ --exclude '*jtreemap*.jar' \ Deleted: trunk/statsvn/debian/patches/00list =================================================================== --- trunk/statsvn/debian/patches/00list 2010-03-08 20:54:00 UTC (rev 11819) +++ trunk/statsvn/debian/patches/00list 2010-03-08 21:17:19 UTC (rev 11820) @@ -1,3 +0,0 @@ -10-build-xml-classpath -15-build-xml-build-jar-only -# 20-disable-jtreemap Copied: trunk/statsvn/debian/patches/10-build-xml-classpath.diff (from rev 11810, trunk/statsvn/debian/patches/10-build-xml-classpath.dpatch) =================================================================== --- trunk/statsvn/debian/patches/10-build-xml-classpath.diff (rev 0) +++ trunk/statsvn/debian/patches/10-build-xml-classpath.diff 2010-03-08 21:17:19 UTC (rev 11820) @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-build-xml-jarpaths.dpatch by <[email protected]> +## +## DP: Fix classpath to debian-specific values + +...@dpatch@ +Index: statsvn-0.7.0.dfsg/build.xml +=================================================================== +--- statsvn-0.7.0.dfsg.orig/build.xml 2009-08-17 16:01:36.000000000 +0200 ++++ statsvn-0.7.0.dfsg/build.xml 2010-03-08 20:25:39.047528376 +0100 +@@ -24,9 +24,11 @@ + + <path id="project.class.path"> + <pathelement path="${java.class.path}" /> +- <fileset dir="${lib}"> +- <include name="**/*.jar" /> +- </fileset> ++ <pathelement path="/usr/share/java/statcvs.jar" /> ++ <pathelement path="/usr/share/java/jfreechart.jar" /> ++ <pathelement path="/usr/share/java/jcommon.jar" /> ++ <pathelement ++ path="/usr/share/java/backport-util-concurrent.jar" /> + </path> + + <target name="clean"> Deleted: trunk/statsvn/debian/patches/10-build-xml-classpath.dpatch =================================================================== --- trunk/statsvn/debian/patches/10-build-xml-classpath.dpatch 2010-03-08 20:54:00 UTC (rev 11819) +++ trunk/statsvn/debian/patches/10-build-xml-classpath.dpatch 2010-03-08 21:17:19 UTC (rev 11820) @@ -1,24 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10-build-xml-jarpaths.dpatch by <[email protected]> -## -## DP: Fix classpath to debian-specific values - -...@dpatch@ -diff -urNad statsvn-0.3.1.dfsg~/build.xml statsvn-0.3.1.dfsg/build.xml ---- statsvn-0.3.1.dfsg~/build.xml 2007-02-19 09:16:02.000000000 +0100 -+++ statsvn-0.3.1.dfsg/build.xml 2008-03-01 22:07:22.000000000 +0100 -@@ -24,9 +24,11 @@ - - <path id="project.class.path"> - <pathelement path="${java.class.path}" /> -- <fileset dir="${lib}"> -- <include name="**/*.jar" /> -- </fileset> -+ <pathelement path="/usr/share/java/statcvs.jar" /> -+ <pathelement path="/usr/share/java/jfreechart.jar" /> -+ <pathelement path="/usr/share/java/jcommon.jar" /> -+ <pathelement -+ path="/usr/share/java/backport-util-concurrent.jar" /> - </path> - - <target name="clean"> Copied: trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff (from rev 11810, trunk/statsvn/debian/patches/15-build-xml-build-jar-only.dpatch) =================================================================== --- trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff (rev 0) +++ trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff 2010-03-08 21:17:19 UTC (rev 11820) @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15-build-xml-build-jar-only.dpatch by <[email protected]> +## +## DP: Only build the jar file during the build + +...@dpatch@ +Index: statsvn-0.7.0.dfsg/build.xml +=================================================================== +--- statsvn-0.7.0.dfsg.orig/build.xml 2010-03-08 20:25:30.347534255 +0100 ++++ statsvn-0.7.0.dfsg/build.xml 2010-03-08 20:25:34.015528882 +0100 +@@ -1,6 +1,6 @@ + <?xml version="1.0" encoding="ISO-8859-1"?> + +-<project name="statsvn" default="all" basedir="."> ++<project name="statsvn" default="jar" basedir="."> + + <property file="project.properties" /> + <property name="project" value="statsvn" /> +@@ -93,6 +93,13 @@ + </java> + </target> + ++ <target name="jar" depends="compile,copyfiles"> ++ <!-- Creates an executable jar file for the project --> ++ <mkdir dir="${dist}" /> ++ <jar jarfile="${dist}/${project.jar}" basedir="${build}" /> ++ </target> ++ ++ + <target name="init.tests"> + <!-- Create the build directory structure used by compile.tests --> + <mkdir dir="${build.tests}" /> Deleted: trunk/statsvn/debian/patches/15-build-xml-build-jar-only.dpatch =================================================================== --- trunk/statsvn/debian/patches/15-build-xml-build-jar-only.dpatch 2010-03-08 20:54:00 UTC (rev 11819) +++ trunk/statsvn/debian/patches/15-build-xml-build-jar-only.dpatch 2010-03-08 21:17:19 UTC (rev 11820) @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 15-build-xml-build-jar-only.dpatch by <[email protected]> -## -## DP: Only build the jar file during the build - -...@dpatch@ -diff -urNad statsvn-0.3.1.dfsg~/build.xml statsvn-0.3.1.dfsg/build.xml ---- statsvn-0.3.1.dfsg~/build.xml 2008-03-01 22:25:23.000000000 +0100 -+++ statsvn-0.3.1.dfsg/build.xml 2008-03-01 22:25:52.000000000 +0100 -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="ISO-8859-1"?> - --<project name="statsvn" default="all" basedir="."> -+<project name="statsvn" default="jar" basedir="."> - - <property file="project.properties" /> - <property name="project" value="statsvn" /> -@@ -93,6 +93,13 @@ - </java> - </target> - -+ <target name="jar" depends="compile,copyfiles"> -+ <!-- Creates an executable jar file for the project --> -+ <mkdir dir="${dist}" /> -+ <jar jarfile="${dist}/${project.jar}" basedir="${build}" /> -+ </target> -+ -+ - <target name="init.tests"> - <!-- Create the build directory structure used by compile.tests --> - <mkdir dir="${build.tests}" /> Copied: trunk/statsvn/debian/patches/20-disable-jtreemap.diff (from rev 11810, trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch) =================================================================== --- trunk/statsvn/debian/patches/20-disable-jtreemap.diff (rev 0) +++ trunk/statsvn/debian/patches/20-disable-jtreemap.diff 2010-03-08 21:17:19 UTC (rev 11820) @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20-disable-jtreemap.dpatch by <[email protected]> +## +## DP: Disable the jtreemap-based report + +...@dpatch@ +diff -urNad statsvn-0.3.1.dfsg~/src/net/sf/statsvn/Main.java statsvn-0.3.1.dfsg/src/net/sf/statsvn/Main.java +--- statsvn-0.3.1.dfsg~/src/net/sf/statsvn/Main.java 2007-03-10 12:09:58.000000000 +0100 ++++ statsvn-0.3.1.dfsg/src/net/sf/statsvn/Main.java 2008-03-04 21:10:31.000000000 +0100 +@@ -291,7 +291,9 @@ + } else { + // add new reports + List extraReports = new ArrayList(); +- extraReports.add(new RepoMapPageMaker(config).toFile()); ++ // Disabling RepoMapPageMaker as jtreemap is not ++ // available for Debian ++ // extraReports.add(new RepoMapPageMaker(config).toFile()); + extraReports.add(new ChurnPageMaker(config).toFile()); + + new ReportSuiteMaker(config, ConfigurationOptions.getNotes(), extraReports).toFile().write(); Deleted: trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch =================================================================== --- trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch 2010-03-08 20:54:00 UTC (rev 11819) +++ trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch 2010-03-08 21:17:19 UTC (rev 11820) @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20-disable-jtreemap.dpatch by <[email protected]> -## -## DP: Disable the jtreemap-based report - -...@dpatch@ -diff -urNad statsvn-0.3.1.dfsg~/src/net/sf/statsvn/Main.java statsvn-0.3.1.dfsg/src/net/sf/statsvn/Main.java ---- statsvn-0.3.1.dfsg~/src/net/sf/statsvn/Main.java 2007-03-10 12:09:58.000000000 +0100 -+++ statsvn-0.3.1.dfsg/src/net/sf/statsvn/Main.java 2008-03-04 21:10:31.000000000 +0100 -@@ -291,7 +291,9 @@ - } else { - // add new reports - List extraReports = new ArrayList(); -- extraReports.add(new RepoMapPageMaker(config).toFile()); -+ // Disabling RepoMapPageMaker as jtreemap is not -+ // available for Debian -+ // extraReports.add(new RepoMapPageMaker(config).toFile()); - extraReports.add(new ChurnPageMaker(config).toFile()); - - new ReportSuiteMaker(config, ConfigurationOptions.getNotes(), extraReports).toFile().write(); Copied: trunk/statsvn/debian/patches/series (from rev 11810, trunk/statsvn/debian/patches/00list) =================================================================== --- trunk/statsvn/debian/patches/series (rev 0) +++ trunk/statsvn/debian/patches/series 2010-03-08 21:17:19 UTC (rev 11820) @@ -0,0 +1,2 @@ +10-build-xml-classpath.diff +15-build-xml-build-jar-only.diff Modified: trunk/statsvn/debian/rules =================================================================== --- trunk/statsvn/debian/rules 2010-03-08 20:54:00 UTC (rev 11819) +++ trunk/statsvn/debian/rules 2010-03-08 21:17:19 UTC (rev 11820) @@ -12,9 +12,9 @@ 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 -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 Added: trunk/statsvn/debian/source/format =================================================================== --- trunk/statsvn/debian/source/format (rev 0) +++ trunk/statsvn/debian/source/format 2010-03-08 21:17:19 UTC (rev 11820) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
