[pkg-java] r6608 - in trunk/statcvs/debian: . patches

Sat Jun 28 11:28:13 UTC 2008

Author: fourmond
Date: 2008-06-28 11:28:12 +0000 (Sat, 28 Jun 2008)
New Revision: 6608

Added:
   trunk/statcvs/debian/patches/10-disable-jtreemap.dpatch
Modified:
   trunk/statcvs/debian/README.Debian
   trunk/statcvs/debian/changelog
   trunk/statcvs/debian/compat
   trunk/statcvs/debian/copyright
   trunk/statcvs/debian/new-upstream
   trunk/statcvs/debian/patches/00list
Log:
[statcvs] New upstream release is now ready and fully working

Modified: trunk/statcvs/debian/README.Debian
===================================================================

--- trunk/statcvs/debian/README.Debian	2008-06-27 22:44:20 UTC (rev 6607)
+++ trunk/statcvs/debian/README.Debian	2008-06-28 11:28:12 UTC (rev 6608)
@@ -1,25 +1,12 @@
 statcvs for Debian
 ------------------
 
-In this package there is straight compile of jcommon-0.6.4 and jfreechart-0.9.2 
-so all code is available
-StatCVS doesn't compile (yet?) with last jcommon and jfreechart code that's why these debian package 
-are not used.
-How to use:
+  The newer version of statcvs (0.4.0) provides a way to interactively
+  browse repository statistics via the jtreemap applet. Unfortunately, this
+  applet has not yet been packaged for Debian, so this functionality has been
+  disabled. 
 
-	Checkout a repository in e.g cvsrepos dir
-	cvs log the repository running:
-		cvs log > logfile
-	build the stats running:
- 		java -jar /usr/share/java/statcvs.jar -title <title> logfile cvsrepos
+  Please file a wishlist bug against statcvs if you are missing for this
+  functionality.
 
-	You can get all options running:
-		java -jar /usr/share/java/statcvs.jar
-
-	This probably run only with Sun JVM
-
-	You may encounter problem with huge log so the statcvs wrapper don't work
-	I had to use as an example 
-		/usr/lib/j2sdk1.4-sun/bin/java -server -mx512m -ms128m -ss128m -jar /usr/share/java/statcvs.jar -verbose -output-dir stats -title GForge ~/local/gforge/gforge_cvs.log ~/local/gforge/
-
- -- Christian Bayle <bayle at debian.org>, Fri, 11 Jul 2003 02:20:51 +0200
+ -- Vincent Fourmond <fourmond at debian.org>, Sat, 28 Jun 2008 13:13:52 +0200

Modified: trunk/statcvs/debian/changelog
===================================================================
--- trunk/statcvs/debian/changelog	2008-06-27 22:44:20 UTC (rev 6607)
+++ trunk/statcvs/debian/changelog	2008-06-28 11:28:12 UTC (rev 6608)
@@ -1,4 +1,4 @@
-statcvs (1:0.4.0.dfsg-1) UNRELEASED; urgency=low
+statcvs (1:0.4.0.dfsg-1) unstable; urgency=low
 
   * New upstream release (closes: #481798): 
     - updated debian/new-upstream to cope for the new test 
@@ -9,8 +9,13 @@
   * Now depends on libjdom-java as well
   * Fix the old-fsf-address-in-copyright-file lintian warning
   * Improved manual page
+  * Updated debian/new-upstream to strip the sourceless jtreemap jar
+    from upstream's archive
+  * 10-disable-jtreemap to disable the generation of the page with
+    jtreemap-based map display
+  * Updated REAME.Debian
 
- -- Vincent Fourmond <fourmond at debian.org>  Wed, 25 Jun 2008 21:19:23 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 28 Jun 2008 13:14:09 +0200
 
 statcvs (1:0.3.dfsg+1-1) unstable; urgency=low
 

Modified: trunk/statcvs/debian/compat
===================================================================
--- trunk/statcvs/debian/compat	2008-06-27 22:44:20 UTC (rev 6607)
+++ trunk/statcvs/debian/compat	2008-06-28 11:28:12 UTC (rev 6608)
@@ -1 +1 @@
-4
\ No newline at end of file
+4

Modified: trunk/statcvs/debian/copyright
===================================================================
--- trunk/statcvs/debian/copyright	2008-06-27 22:44:20 UTC (rev 6607)
+++ trunk/statcvs/debian/copyright	2008-06-28 11:28:12 UTC (rev 6608)
@@ -2,9 +2,12 @@
 
 It was downloaded from http://statcvs.sf.net
 
-It was repackaged to remove binary only jar files shipped in lib/. The
-debian/new-upstream script from the source package.
+It was repackaged to remove binary only jar files shipped in lib/,
+various test files without appropriate sources and the jtreemap jar. 
 
+The script debian/new-upstream from the source package was used to actually
+perform the repackaging.
+
 Upstream Authors: Manuel Schulze, Lukasz Pekacki, Richard Cyganiak, Anja Jentzsch
 
 Copyright:
@@ -35,4 +38,4 @@
 The original debian packaging is by Christian Bayle.
 
 The current debian packaging is copyright 2008 by Vincent Fourmond,
-licensed under the same terms as statcvs itself.
\ No newline at end of file
+licensed under the same terms as statcvs itself.

Modified: trunk/statcvs/debian/new-upstream
===================================================================
--- trunk/statcvs/debian/new-upstream	2008-06-27 22:44:20 UTC (rev 6607)
+++ trunk/statcvs/debian/new-upstream	2008-06-28 11:28:12 UTC (rev 6608)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# new-upstream: copyright 2007 by Vincent Fourmond.
+# new-upstream: copyright 2007,2008 by Vincent Fourmond.
 # See debian/copyright file for details.
 #
 # Called by uscan; from uscan(1):
@@ -12,7 +12,6 @@
 # is executed, using either the original file or the symlink name.
 #
 # Thanks to Sam Morris <sam at robots.org.uk> for giving me the idea
-#
 
 version=$2
 filename=$3
@@ -26,7 +25,7 @@
 # We repackage excluding the lib/ subdir
 cd $dir
 tar cvz --exclude '*/lib/*.jar' --exclude 'test*' --exclude 'site' \
-    -f $origname stat*
+    --exclude 'jtreemap*.jar' -f $origname stat*
 cd -
 mv $dir/$origname ..
 rm -rf $dir
\ No newline at end of file

Modified: trunk/statcvs/debian/patches/00list
===================================================================
--- trunk/statcvs/debian/patches/00list	2008-06-27 22:44:20 UTC (rev 6607)
+++ trunk/statcvs/debian/patches/00list	2008-06-28 11:28:12 UTC (rev 6608)
@@ -1 +1,2 @@
 01-disable-unjar
+10-disable-jtreemap

Added: trunk/statcvs/debian/patches/10-disable-jtreemap.dpatch
===================================================================
--- trunk/statcvs/debian/patches/10-disable-jtreemap.dpatch	                        (rev 0)
+++ trunk/statcvs/debian/patches/10-disable-jtreemap.dpatch	2008-06-28 11:28:12 UTC (rev 6608)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-disable-jtreemap.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ 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()) {


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


