CVS statcvs/debian

Christian Bayle bayle@haydn.debian.org
Sun Sep 5 14:09:06 2004


Update of /cvsroot/pkg-java/statcvs/debian
In directory haydn:/tmp/cvs-serv8040/statcvs/debian

Modified Files:
	README.Debian changelog control copyright rules 
Log Message:
Some changes on depends and compile


--- /cvsroot/pkg-java/statcvs/debian/README.Debian	2003/07/15 21:25:59	1.1
+++ /cvsroot/pkg-java/statcvs/debian/README.Debian	2004/09/05 20:08:23	1.2
@@ -16,6 +16,10 @@
 	You can get all options running:
 		java -jar /usr/share/java/statcvs.jar
 
-	This probably run only with Sun Runtime library
+	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@debian.org>, Fri, 11 Jul 2003 02:20:51 +0200
--- /cvsroot/pkg-java/statcvs/debian/changelog	2003/07/20 22:51:49	1.2
+++ /cvsroot/pkg-java/statcvs/debian/changelog	2004/09/05 20:08:23	1.3
@@ -1,3 +1,11 @@
+statcvs (20030713-3) unstable; urgency=low
+
+  * Applied patch proposed by Gary Hennigan
+  to deal with cvs log new format (Closes: #257622)
+  * Modified stacvs wrapper to take in account more possible JVM 
+
+ -- Christian Bayle <bayle@debian.org>  Sun,  5 Sep 2004 20:21:19 +0200
+
 statcvs (20030713-2) unstable; urgency=low
 
   * Corrected dependancies (Closes: bug#201502)
--- /cvsroot/pkg-java/statcvs/debian/control	2003/07/20 22:51:49	1.2
+++ /cvsroot/pkg-java/statcvs/debian/control	2004/09/05 20:08:23	1.3
@@ -2,13 +2,13 @@
 Section: contrib/devel
 Priority: optional
 Maintainer: Christian Bayle <bayle@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), j2sdk1.4, ant
+Build-Depends-Indep: debhelper (>> 4.0.0), sun-j2sdk1.4, ant
 Standards-Version: 3.6.0
 
 Package: statcvs
 Section: contrib/devel
 Architecture: all
-Depends: classpath, kaffe | j2re1.4 | java2-runtime
+Depends: classpath, kaffe | java2-runtime
 Description: CVS Repository statistic analysis tool, written in Java
  StatCvs retrieves information from a CVS repository and generates
  various tables and charts describing the project development,
--- /cvsroot/pkg-java/statcvs/debian/copyright	2003/07/15 21:25:59	1.1
+++ /cvsroot/pkg-java/statcvs/debian/copyright	2004/09/05 20:08:23	1.2
@@ -2,6 +2,7 @@
 
 It was downloaded from http://statcvs.sf.net CVS
 This package contain code of jcommon-0.6.4 jfreechart-0.9.2 downloaded from http://sourceforge.net/projects/jfreechart
+This was build using the j2sdk1.4 package built with mpkg-j2sdk
 
 Upstream Authors: Manuel Schulze, Lukasz Pekacki, Richard Cyganiak, Anja Jentzsch
 JFreechart Author is David Gilbert and others
--- /cvsroot/pkg-java/statcvs/debian/rules	2003/07/20 22:51:49	1.2
+++ /cvsroot/pkg-java/statcvs/debian/rules	2004/09/05 20:08:23	1.3
@@ -4,11 +4,17 @@
 #export DH_VERBOSE=1
 
 # Build 
-export JAVA_HOME=/usr/lib/j2se/1.4
-export JAVA=/usr/lib/j2se/1.4/bin/java
-export JAVAC=/usr/lib/j2se/1.4/bin/javac
-export CLASSPATH=/usr/lib/j2se/1.4/jre/lib/rt.jar
-export CLASSPATH=$(JAVA_HOME)/lib/tools.jar:$(JAVA_HOME)/lib/classes.zip
+#export JAVA_HOME=/usr/lib/j2se/1.4
+#export JAVA=/usr/lib/j2se/1.4/bin/java
+#export JAVAC=/usr/lib/j2se/1.4/bin/javac
+export JAVA_HOME=/usr/lib/j2sdk1.4-sun
+export JAVA=/usr/lib/j2sdk1.4-sun/bin/java
+export JAVAC=/usr/lib/j2sdk1.4-sun/bin/javac
+export JAR=/usr/lib/j2sdk1.4-sun/bin/jar
+# this only compile with sun javac and jar at the moment
+
+#export CLASSPATH=$(JAVA_HOME)/lib/tools.jar:$(JAVA_HOME)/lib/classes.zip
+#export CLASSPATH=$(JAVA_HOME)/lib/tools.jar:/usr/share/ant1.6/lib/ant.jar
 
 export LIBRARY = statcvs
 export VERSION = $(shell head -1 debian/changelog | sed 's/.*(\(.*\)-.*).*/\1/' )
@@ -31,6 +37,8 @@
 	# This part would require batik (http://xml.apache.org/batik/) to compile a demo jfreechart don't use 
 	# So I don't compile this
 	-rm -rf jfreechart-0.9.2/source/com/jrefinery/chart/demo
+	# patch to take in account new cvs log format
+	patch -p0 < cvslognewformat.patch
 	touch configure-stamp
 
 
@@ -41,8 +49,13 @@
 	$(JAVAC) -classpath /usr/share/java/junit.jar -d jfree `find jcommon-0.6.4 -name "*.java"`
 	$(JAVAC) -classpath /usr/share/java/junit.jar:/usr/share/java/servlet-2.2.jar:jfree -d jfree `find jfreechart-0.9.2 -name "*.java"`
 	cp gorilla.jpg jfree/com/jrefinery/chart/
-	(cd jfree; jar cvf ../statcvs-$(VERSION)/lib/jfreechart.jar .)
+	(cd jfree; $(JAR) cvf ../statcvs-$(VERSION)/lib/jfreechart.jar .)
 	cd $(SRCDIR); ant dist
+	#rm -rf jfree
+	#-mkdir jfree
+	# this could be usefull to compile with kaffe one day
+	#$(JAVAC) -classpath statcvs-$(VERSION)/lib/jfreechart.jar:statcvs-$(VERSION)/lib/jdom.jar:statcvs-$(VERSION)/lib/junit.jar:/usr/share/ant1.6/lib/ant.jar:jfree -d jfree `find statcvs-$(VERSION) -name "*.java"` 
+
 	touch build-stamp
 
 javadoc: