[statsvn] 11/37: [statsvn] Most problems are now gone, though it still needs a manual page and a thourough copyright review

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository statsvn.

commit 58a70edec16e31919757a1f79f743964de9a7fd6
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Tue Mar 4 20:15:42 2008 +0000

    [statsvn] Most problems are now gone, though it still needs a manual page and a thourough copyright review
---
 debian/README.Debian                              |  7 +++++++
 debian/changelog                                  |  6 +++++-
 debian/copyright                                  |  4 +++-
 debian/new-upstream                               |  1 +
 debian/patches/00list                             |  3 ++-
 debian/patches/15-build-xml-build-jar-only.dpatch |  3 +--
 debian/patches/20-disable-jtreemap.dpatch         | 20 ++++++++++++++++++++
 debian/wrappers/statsvn                           |  4 +---
 8 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..ac755d7
--- /dev/null
+++ b/debian/README.Debian
@@ -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
diff --git a/debian/changelog b/debian/changelog
index ada1e0c..61b46be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,9 @@ statsvn (0.3.1.dfsg-1) UNRELEASED; urgency=low
 
   * 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
diff --git a/debian/copyright b/debian/copyright
index a989897..bf87d17 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,8 +7,10 @@ It was repackaged to remove:
   * 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
 
diff --git a/debian/new-upstream b/debian/new-upstream
index c37a677..d51a6a0 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -28,6 +28,7 @@ cd $dir
 tar cvz \
     --exclude '*/lib/*.jar' \
     --exclude '*/bin/*' \
+    --exclude '*jtreemap*.jar' \
     --exclude '*/tests-src/*' \
     --exclude '*/site/*' \
     -f $origname stat*
diff --git a/debian/patches/00list b/debian/patches/00list
index 3927421..ca87d1f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -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
diff --git a/debian/patches/15-build-xml-build-jar-only.dpatch b/debian/patches/15-build-xml-build-jar-only.dpatch
index bddf15b..2cc0a8b 100755
--- a/debian/patches/15-build-xml-build-jar-only.dpatch
+++ b/debian/patches/15-build-xml-build-jar-only.dpatch
@@ -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
diff --git a/debian/patches/20-disable-jtreemap.dpatch b/debian/patches/20-disable-jtreemap.dpatch
new file mode 100755
index 0000000..c042e82
--- /dev/null
+++ b/debian/patches/20-disable-jtreemap.dpatch
@@ -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();
diff --git a/debian/wrappers/statsvn b/debian/wrappers/statsvn
index c657a29..903b561 100755
--- a/debian/wrappers/statsvn
+++ b/debian/wrappers/statsvn
@@ -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 "$@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statsvn.git