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

Vincent Fourmond fourmond at alioth.debian.org
Mon Apr 4 15:19:52 UTC 2011 

Author: fourmond
Date: 2011-04-04 15:19:44 +0000 (Mon, 04 Apr 2011)
New Revision: 13501

Added:
   trunk/statsvn/debian/statsvn.classpath
   trunk/statsvn/debian/statsvn.install
   trunk/statsvn/debian/statsvn.jlibs
Modified:
   trunk/statsvn/debian/changelog
   trunk/statsvn/debian/control
   trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff
   trunk/statsvn/debian/rules
   trunk/statsvn/debian/wrappers/statsvn
Log:
[statsvn] Now using javahelper + the new features of java-wrappers

Modified: trunk/statsvn/debian/changelog
===================================================================
--- trunk/statsvn/debian/changelog	2011-04-04 08:37:57 UTC (rev 13500)
+++ trunk/statsvn/debian/changelog	2011-04-04 15:19:44 UTC (rev 13501)
@@ -1,3 +1,12 @@
+statsvn (0.7.0.dfsg-4) experimental; urgency=low
+
+  * Now using javahelper, thanks to mjj29 !
+  * Now specifying a real classpath
+  * Letting java-wrappers find the classpath itself.
+  * Now almost using upstream target for building the jar
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 04 Apr 2011 17:12:20 +0200
+
 statsvn (0.7.0.dfsg-3) unstable; urgency=low
 
   * Add libjdom1-java to dependencies + add jdom1 in the classpath

Modified: trunk/statsvn/debian/control
===================================================================
--- trunk/statsvn/debian/control	2011-04-04 08:37:57 UTC (rev 13500)
+++ trunk/statsvn/debian/control	2011-04-04 15:19:44 UTC (rev 13501)
@@ -5,7 +5,7 @@
 Uploaders: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), ant, libbackport-util-concurrent-java, 
  libjcommon-java, libjfreechart-java, statcvs (>= 1:0.5.0), default-jdk,
- libsvnkit-java, libjdom1-java
+ libsvnkit-java, libjdom1-java, javahelper (>= 0.19)
 Standards-Version: 3.9.1
 Homepage: http://www.statsvn.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statsvn
@@ -14,10 +14,9 @@
 
 Package: statsvn
 Architecture: all
-Depends: java-gcj-compat | java-runtime, libjcommon-java,
- libjfreechart-java, libbackport-util-concurrent-java, statcvs (>= 1:0.7.0), 
- subversion, java-wrappers (>= 0.1.16), ${misc:Depends},
- libsvnkit-java, libjdom1-java
+Depends: java-gcj-compat | java-runtime, ${java:Depends},
+ statcvs (>= 1:0.7.0), subversion, java-wrappers (>= 0.1.20),
+ ${misc:Depends}
 Description: SVN repository statistics
  StatSVN retrieves information from a Subversion repository and generates
  various tables and charts describing the project evolution, e.g.

Modified: trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff
===================================================================
--- trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff	2011-04-04 08:37:57 UTC (rev 13500)
+++ trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff	2011-04-04 15:19:44 UTC (rev 13501)
@@ -6,8 +6,8 @@
 @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
+--- statsvn-0.7.0.dfsg.orig/build.xml	2011-04-04 17:02:57.269898047 +0200
++++ statsvn-0.7.0.dfsg/build.xml	2011-04-04 17:04:41.013898105 +0200
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
@@ -16,17 +16,19 @@
  
  	<property file="project.properties" />
  	<property name="project" value="statsvn" />
-@@ -93,6 +93,13 @@
- 		</java>
+@@ -132,15 +132,6 @@
  	</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}" />
+ 	<target name="dist"  depends="compile,copyfiles">
+-		<!-- Creates an executable jar file for the project -->
+-		<unjar src="${lib}/${statcvs.jar}" dest="${build}" />
+-		<!-- Expand and use the concurrent JAR -->
+-		<unjar src="${lib}/${concurrent.jar}" dest="${build}" />
+-
+-		<!-- Now included in statcvs.jar -->
+-		<!--<unjar src="${lib}/${jfreechart.jar}" dest="${build}" />
+-		<unjar src="${lib}/${jcommon.jar}" dest="${build}" />-->
+-		
+ 		<mkdir dir="${dist}" />
+ 		<jar jarfile="${dist}/${project.jar}" basedir="${build}">
+ 			<manifest>

Modified: trunk/statsvn/debian/rules
===================================================================
--- trunk/statsvn/debian/rules	2011-04-04 08:37:57 UTC (rev 13500)
+++ trunk/statsvn/debian/rules	2011-04-04 15:19:44 UTC (rev 13501)
@@ -1,35 +1,24 @@
 #!/usr/bin/make -f
 # debian/rules for statsvn, based on the one from Batik (uses CDBS)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \
-	sed -r 's/Version:\s*//' | sed -r 's/^[0-9]+://' | \
-	sed -r 's/(\.dfsg)?-[0-9.]+//')
-
-# export JITC_PROCESSOR_TYPE=6
-
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-# include /usr/share/cdbs/1/rules/dpatch.mk
 
+VERSION=$(subst .dfsg,,$(DEB_UPSTREAM_VERSION))
+
 JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar \
-	junit jcommon jfreechart svnkit
+	junit jcommon jfreechart svnkit statcvs
 DEB_ANT_COMPILER     := modern
-# DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder
 DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_BUILD_TARGET := dist
 
 print-version:
 	echo $(VERSION)
+	echo $(DEB_UPSTREAM_VERSION)
 
-install/statsvn::
-	install -m 644 dist/statsvn.jar debian/statsvn/usr/share/java/statsvn-$(VERSION).jar
-	ln -s statsvn-$(VERSION).jar debian/statsvn/usr/share/java/statsvn.jar
-	install -m 755 -t debian/statsvn/usr/bin debian/wrappers/statsvn
-
-
+JH_INSTALLLIBS_ARGS = --upstream-version=$(VERSION)

Added: trunk/statsvn/debian/statsvn.classpath
===================================================================
--- trunk/statsvn/debian/statsvn.classpath	                        (rev 0)
+++ trunk/statsvn/debian/statsvn.classpath	2011-04-04 15:19:44 UTC (rev 13501)
@@ -0,0 +1 @@
+dist/statsvn.jar /usr/share/java/backport-util-concurrent.jar /usr/share/java/statcvs.jar /usr/share/java/svnkit.jar

Added: trunk/statsvn/debian/statsvn.install
===================================================================
--- trunk/statsvn/debian/statsvn.install	                        (rev 0)
+++ trunk/statsvn/debian/statsvn.install	2011-04-04 15:19:44 UTC (rev 13501)
@@ -0,0 +1 @@
+debian/wrappers/statsvn usr/bin
\ No newline at end of file

Added: trunk/statsvn/debian/statsvn.jlibs
===================================================================
--- trunk/statsvn/debian/statsvn.jlibs	                        (rev 0)
+++ trunk/statsvn/debian/statsvn.jlibs	2011-04-04 15:19:44 UTC (rev 13501)
@@ -0,0 +1 @@
+dist/statsvn.jar
\ No newline at end of file

Modified: trunk/statsvn/debian/wrappers/statsvn
===================================================================
--- trunk/statsvn/debian/wrappers/statsvn	2011-04-04 08:37:57 UTC (rev 13500)
+++ trunk/statsvn/debian/wrappers/statsvn	2011-04-04 15:19:44 UTC (rev 13501)
@@ -5,7 +5,6 @@
 
 # We first look for sun's runtime, and then for all the rest
 find_java_runtime sun || find_java_runtime 
-find_jars jfreechart jcommon statcvs backport-util-concurrent statsvn \
-    jdom1
+find_jar_classpath statsvn
 
 run_java net.sf.statsvn.Main "$@"

More information about the pkg-java-commits mailing list