This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jftp.
commit 847915b2a76e1e86efcd585080697193c7d604a9 Author: Varun Hiremath <[email protected]> Date: Sat Nov 1 18:42:19 2008 +0000 * Switch to openjdk * Move package to main * Fix watch file * Bump Standards-Version to 3.8.0 * debian/jftp.run: use openjdk --- debian/changelog | 10 ++++++++++ debian/control | 10 +++++----- debian/jftp.run | 2 +- debian/rules | 3 ++- debian/watch | 7 +------ 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2dc73e..01aa789 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +jftp (1.51~pre4-2) unstable; urgency=low + + * Switch to openjdk + * Move package to main + * Fix watch file + * Bump Standards-Version to 3.8.0 + * debian/jftp.run: use openjdk + + -- Varun Hiremath <[email protected]> Sat, 01 Nov 2008 14:23:51 -0400 + jftp (1.51~pre4-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index c5aa908..0f74e8d 100644 --- a/debian/control +++ b/debian/control @@ -1,21 +1,21 @@ Source: jftp -Section: contrib/net +Section: net Priority: optional Maintainer: Debian Java maintainers <[email protected]> -Uploaders: Varun Hiremath <[email protected]>, Kumar Appaiah <[email protected]> +Uploaders: Varun Hiremath <[email protected]>, Kumar Appaiah <[email protected]> Build-Depends: cdbs, debhelper (>= 5), dpatch -Build-Depends-Indep: sun-java6-jdk, ant, libslide-webdavclient-java, +Build-Depends-Indep: openjdk-6-jdk, ant, libslide-webdavclient-java, libjcifs-java, libjorbis-java, libcommons-logging-java, libcommons-httpclient-java, liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java, libjsch-java, libjlayer-java -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Homepage: http://j-ftp.sourceforge.net Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jftp Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jftp Package: jftp Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-jre, +Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre, libslide-webdavclient-java, libjcifs-java, libjorbis-java, libcommons-logging-java, libcommons-httpclient-java, liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java, diff --git a/debian/jftp.run b/debian/jftp.run index e90ac44..5ef4b7c 100644 --- a/debian/jftp.run +++ b/debian/jftp.run @@ -1,2 +1,2 @@ #!/bin/sh -/usr/lib/jvm/java-6-sun/jre/bin/java -jar /usr/share/java/jftp.jar "$@" +/usr/lib/jvm/java-6-openjdk/jre/bin/java -jar /usr/share/java/jftp.jar "$@" diff --git a/debian/rules b/debian/rules index 1b42894..336d360 100755 --- a/debian/rules +++ b/debian/rules @@ -4,11 +4,12 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/dpatch.mk -JAVA_HOME := /usr/lib/jvm/java-6-sun +JAVA_HOME := /usr/lib/jvm/java-6-openjdk DEB_ANT_BUILD_TARGET := jars DEB_JARS := jcifs jl commons-logging commons-httpclient log4j-1.2 jorbis jogg \ jakarta-slide-webdavlib kunststoff j2ssh-ant j2ssh-core yanfs \ j2ssh-common j2ssh-dameon jsch +ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 install/jftp:: chmod 644 doc/FtpUpload.java diff --git a/debian/watch b/debian/watch index 1891819..d8bd54d 100644 --- a/debian/watch +++ b/debian/watch @@ -1,7 +1,2 @@ version=3 -# This is the actual release page, but we are using a pre release. -# So, this section is commented. -#http://heanet.dl.sourceforge.net/sourceforge/j-ftp/ \ -#http://sf.net/j-ftp/ j-ftp-(.*).tar.gz debian debian/orig-tar.sh -opts="uversionmangle=s/-/~/,dversionmangle=s/-/~/" \ -http://j-ftp.sourceforge.net/zips/ j-ftp-(\d.*).tar.gz debian debian/orig-tar.sh +http://heanet.dl.sourceforge.net/sourceforge/j-ftp/j-ftp-(.*).tar.gz debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jftp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
