[pkg-java] r13499 - trunk/statcvs/debian

[Vincent Fourmond]

Author: fourmond
Date: 2011-04-04 08:34:43 +0000 (Mon, 04 Apr 2011)
New Revision: 13499

Added:
   trunk/statcvs/debian/statcvs.install
   trunk/statcvs/debian/statcvs.jlibs
Modified:
   trunk/statcvs/debian/changelog
   trunk/statcvs/debian/control
   trunk/statcvs/debian/rules
   trunk/statcvs/debian/statcvs.classpath
Log:
[statcvs] Fully switch to javahelper, something I should have done ages ago

Modified: trunk/statcvs/debian/changelog
===================================================================
--- trunk/statcvs/debian/changelog	2011-04-04 08:25:44 UTC (rev 13498)
+++ trunk/statcvs/debian/changelog	2011-04-04 08:34:43 UTC (rev 13499)
@@ -1,13 +1,15 @@
 statcvs (1:0.7.0.dfsg-3) experimental; urgency=low
 
-  * Now (partly) using javahelper
+  * Now fully using javahelper, thanks mjj29 !
   * Profit from it to set a real classpath
   * Now conforms to standards 3.9.1
   * Fix spelling mistakes in the package description
   * Changed the wrapper to automatically get the classpath from the jar
-    file
+    file (needs recent java-wrappers)
+  * Dropped and from the final classpath, as it is only needed for the
+    statcvs ant class
 
- -- Vincent Fourmond <fourmond at debian.org>  Sun, 03 Apr 2011 01:55:31 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 04 Apr 2011 10:16:50 +0200
 
 statcvs (1:0.7.0.dfsg-2) unstable; urgency=low
 

Modified: trunk/statcvs/debian/control
===================================================================
--- trunk/statcvs/debian/control	2011-04-04 08:25:44 UTC (rev 13498)
+++ trunk/statcvs/debian/control	2011-04-04 08:34:43 UTC (rev 13499)
@@ -5,7 +5,7 @@
 Uploaders: Vincent Fourmond <fourmond at debian.org>, Christian Bayle <bayle at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), ant, junit, 
  libjcommon-java, libjfreechart-java (>= 1.0.13), libjdom1-java,
- default-jdk, javahelper
+ default-jdk, javahelper (>= 0.19)
 Standards-Version: 3.9.1
 Homepage: http://statcvs.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statcvs
@@ -14,8 +14,8 @@
 
 Package: statcvs
 Architecture: all
-Depends: java-gcj-compat | java-runtime, libjcommon-java,
- libjfreechart-java (>= 1.0.13), java-wrappers (>= 0.1.20), libjdom1-java,
+Depends: java-gcj-compat | java-runtime, ${java:Depends},
+ libjfreechart-java (>= 1.0.13), java-wrappers (>= 0.1.20),
  ${misc:Depends}
 Breaks: statsvn (<< 0.5.0)
 Conflicts: statsvn (<< 0.5.0)

Modified: trunk/statcvs/debian/rules
===================================================================
--- trunk/statcvs/debian/rules	2011-04-04 08:25:44 UTC (rev 13498)
+++ trunk/statcvs/debian/rules	2011-04-04 08:34:43 UTC (rev 13499)
@@ -7,8 +7,8 @@
 # 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))
 
@@ -22,13 +22,10 @@
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
 
+
 print-version:
 	echo $(VERSION)
 	echo $(DEB_UPSTREAM_VERSION)
 
-install/statcvs::
-	jh_classpath
-	install -m 644 dist/statcvs.jar debian/statcvs/usr/share/java/statcvs-$(VERSION).jar
-	ln -s statcvs-$(VERSION).jar debian/statcvs/usr/share/java/statcvs.jar
-	install -m 755 -t debian/statcvs/usr/bin debian/wrappers/statcvs
+JH_INSTALLLIBS_ARGS = --upstream-version=$(VERSION)
 

Modified: trunk/statcvs/debian/statcvs.classpath
===================================================================
--- trunk/statcvs/debian/statcvs.classpath	2011-04-04 08:25:44 UTC (rev 13498)
+++ trunk/statcvs/debian/statcvs.classpath	2011-04-04 08:34:43 UTC (rev 13499)
@@ -1 +1 @@
-dist/statcvs.jar /usr/share/java/jdom1.jar /usr/share/java/ant.jar /usr/share/java/jcommon.jar /usr/share/java/jfreechart.jar
+dist/statcvs.jar /usr/share/java/jdom1.jar /usr/share/java/jcommon.jar /usr/share/java/jfreechart.jar

Added: trunk/statcvs/debian/statcvs.install
===================================================================
--- trunk/statcvs/debian/statcvs.install	                        (rev 0)
+++ trunk/statcvs/debian/statcvs.install	2011-04-04 08:34:43 UTC (rev 13499)
@@ -0,0 +1 @@
+debian/wrappers/statcvs usr/bin
\ No newline at end of file

Added: trunk/statcvs/debian/statcvs.jlibs
===================================================================
--- trunk/statcvs/debian/statcvs.jlibs	                        (rev 0)
+++ trunk/statcvs/debian/statcvs.jlibs	2011-04-04 08:34:43 UTC (rev 13499)
@@ -0,0 +1 @@
+dist/statcvs.jar
\ No newline at end of file