[pkg-java] r5941 - in trunk/statsvn/debian: . patches wrappers

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-03-04 20:15:42 +0000 (Tue, 04 Mar 2008)
New Revision: 5941

Added:
   trunk/statsvn/debian/README.Debian
   trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch
Modified:
   trunk/statsvn/debian/changelog
   trunk/statsvn/debian/copyright
   trunk/statsvn/debian/new-upstream
   trunk/statsvn/debian/patches/00list
   trunk/statsvn/debian/patches/15-build-xml-build-jar-only.dpatch
   trunk/statsvn/debian/wrappers/statsvn
Log:
[statsvn] Most problems are now gone, though it still needs a manual page and a thourough copyright review

Added: trunk/statsvn/debian/README.Debian
===================================================================
--- trunk/statsvn/debian/README.Debian	                        (rev 0)
+++ trunk/statsvn/debian/README.Debian	2008-03-04 20:15:42 UTC (rev 5941)
@@ -0,0 +1,7 @@
+Notes to Debian users:
+
+  * the jtreemap-based report has been disabled as jtreemap is currently
+    not packaged for Debian, and Debian cannot ship the applet without
+    its sources (not included in statsvn's sources).
+
+ -- Vincent Fourmond <fourmond at debian.org>, Tue,  4 Mar 2008 21:14:14 +0100

Modified: trunk/statsvn/debian/changelog
===================================================================
--- trunk/statsvn/debian/changelog	2008-03-04 05:03:21 UTC (rev 5940)
+++ trunk/statsvn/debian/changelog	2008-03-04 20:15:42 UTC (rev 5941)
@@ -2,5 +2,9 @@
 
   * Initial release (Closes: 456250)
   * 10-build-xml-classpath to get it to build with debian packages
+  * 15-build-xml-build-jar-only to tweak the build system to get a 
+    jar containing only statsvn code (and not many more as upstreams').
+  * 20-disable-jtreemap to disable the jtreemap-based report, as jtreemap
+    is not currently packaged for Debian
 
- -- Vincent Fourmond <fourmond at debian.org>  Sat, 01 Mar 2008 22:15:42 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 04 Mar 2008 21:10:45 +0100

Modified: trunk/statsvn/debian/copyright
===================================================================
--- trunk/statsvn/debian/copyright	2008-03-04 05:03:21 UTC (rev 5940)
+++ trunk/statsvn/debian/copyright	2008-03-04 20:15:42 UTC (rev 5941)
@@ -7,8 +7,10 @@
   * contents of the bin/ directory
   * tests-src/, without 'sources' and copyrights for most
   * site/ also without 'sources' and copyrights
+  * src/.../jtreemap-*.jar, binary library without sources
 
-The debian/new-upstream script from the source package.
+The debian/new-upstream script from the source package was used to repackage
+the upstream zip file after download.
 
 Upstream Authors: Lukasz Pekacki and others
 

Modified: trunk/statsvn/debian/new-upstream
===================================================================
--- trunk/statsvn/debian/new-upstream	2008-03-04 05:03:21 UTC (rev 5940)
+++ trunk/statsvn/debian/new-upstream	2008-03-04 20:15:42 UTC (rev 5941)
@@ -28,6 +28,7 @@
 tar cvz \
     --exclude '*/lib/*.jar' \
     --exclude '*/bin/*' \
+    --exclude '*jtreemap*.jar' \
     --exclude '*/tests-src/*' \
     --exclude '*/site/*' \
     -f $origname stat*

Modified: trunk/statsvn/debian/patches/00list
===================================================================
--- trunk/statsvn/debian/patches/00list	2008-03-04 05:03:21 UTC (rev 5940)
+++ trunk/statsvn/debian/patches/00list	2008-03-04 20:15:42 UTC (rev 5941)
@@ -1,2 +1,3 @@
 10-build-xml-classpath
-15-build-xml-build-jar-only
\ No newline at end of file
+15-build-xml-build-jar-only
+20-disable-jtreemap

Modified: trunk/statsvn/debian/patches/15-build-xml-build-jar-only.dpatch
===================================================================
--- trunk/statsvn/debian/patches/15-build-xml-build-jar-only.dpatch	2008-03-04 05:03:21 UTC (rev 5940)
+++ trunk/statsvn/debian/patches/15-build-xml-build-jar-only.dpatch	2008-03-04 20:15:42 UTC (rev 5941)
@@ -1,8 +1,7 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 15-build-xml-build-jar-only.dpatch by  <fourmond at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## 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

Added: trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch
===================================================================
--- trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch	                        (rev 0)
+++ trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch	2008-03-04 20:15:42 UTC (rev 5941)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-disable-jtreemap.dpatch by  <fourmond at debian.org>
+##
+## DP: Disable the jtreemap-based report
+
+ at 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();


Property changes on: trunk/statsvn/debian/patches/20-disable-jtreemap.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/statsvn/debian/wrappers/statsvn
===================================================================
--- trunk/statsvn/debian/wrappers/statsvn	2008-03-04 05:03:21 UTC (rev 5940)
+++ trunk/statsvn/debian/wrappers/statsvn	2008-03-04 20:15:42 UTC (rev 5941)
@@ -5,8 +5,6 @@
 
 # We unfortunately need sun's runtime
 find_java_runtime sun
-find_jars jfreechart jcommon statcvs statsvn
-# # We 
-# find_jars backport-util-concurrent
+find_jars jfreechart jcommon statcvs backport-util-concurrent statsvn 
 
 run_java net.sf.statsvn.Main "$@"