This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository statcvs.
commit 33776d235da6a89e4cd73b57799fdc90f7f2def7 Author: Vincent Fourmond <[email protected]> Date: Mon Apr 4 08:34:43 2011 +0000 [statcvs] Fully switch to javahelper, something I should have done ages ago --- debian/changelog | 8 +++++--- debian/control | 6 +++--- debian/rules | 9 +++------ debian/statcvs.classpath | 2 +- debian/statcvs.install | 1 + debian/statcvs.jlibs | 1 + 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index d19d5aa..a306b21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Sun, 03 Apr 2011 01:55:31 +0200 + -- Vincent Fourmond <[email protected]> Mon, 04 Apr 2011 10:16:50 +0200 statcvs (1:0.7.0.dfsg-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 2bb53ed..1c24a0b 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Vincent Fourmond <[email protected]>, Christian Bayle <[email protected]> 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 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statcvs 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) diff --git a/debian/rules b/debian/rules index a748ace..5ac4cc0 100755 --- a/debian/rules +++ b/debian/rules @@ -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_BUILDDIR := . 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) diff --git a/debian/statcvs.classpath b/debian/statcvs.classpath index 5ade689..4ac91da 100644 --- a/debian/statcvs.classpath +++ b/debian/statcvs.classpath @@ -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 diff --git a/debian/statcvs.install b/debian/statcvs.install new file mode 100644 index 0000000..9f844a4 --- /dev/null +++ b/debian/statcvs.install @@ -0,0 +1 @@ +debian/wrappers/statcvs usr/bin \ No newline at end of file diff --git a/debian/statcvs.jlibs b/debian/statcvs.jlibs new file mode 100644 index 0000000..63489b5 --- /dev/null +++ b/debian/statcvs.jlibs @@ -0,0 +1 @@ +dist/statcvs.jar \ No newline at end of file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statcvs.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
