This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jftp.
commit eff3d41fe0736349b64bf5010b2f609c8310fa94 Author: Varun Hiremath <[email protected]> Date: Thu Sep 13 15:41:51 2007 +0000 * debian/control: add java6 dependencies. * debian/orig-tar.sh: updated to remove non-free things * debian/copyright: Update for icons * debian/orig-tar.exclude: Add all non-freeness here --- debian/changelog | 5 ++-- debian/control | 6 ++--- debian/copyright | 5 +++- debian/orig-tar.exclude | 6 +++++ debian/orig-tar.sh | 6 ++--- debian/patches/00list | 2 +- debian/patches/02_printstream_gcj_fix.dpatch | 38 ---------------------------- debian/rules | 4 +-- debian/watch | 6 ++++- 9 files changed, 25 insertions(+), 53 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9b6c10..42e6512 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,11 @@ -jftp (1.50-1) unstable; urgency=low +jftp (1.51~pre3-1) unstable; urgency=low [ Varun Hiremath ] * Initial release (Closes: #415440) * Added 01_manifest_fix.dpatch to use a custom MANIFEST.MF and avoid classpath trouble. - * Added 02_printstream_gcj_fix.dpatch to compile j-ftp with gcj. * Clean up jar, remove non-free components. [ Kumar Appaiah ] * Add README.Debian-source to explain the repackaging. - -- Kumar Appaiah <[email protected]> Wed, 12 Sep 2007 09:18:17 +0530 + -- Varun Hiremath <[email protected]> Thu, 13 Sep 2007 21:04:39 +0530 diff --git a/debian/control b/debian/control index bed4522..663e4b3 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,15 @@ Source: jftp -Section: net +Section: contrib/net Priority: optional Maintainer: Debian Java maintainers <[email protected]> Uploaders: Varun Hiremath <[email protected]>, Kumar Appaiah <[email protected]> Build-Depends: cdbs, debhelper (>= 5), dpatch -Build-Depends-Indep: libslide-webdavclient-java, libjcifs-java, libjorbis-java, libcommons-logging-java, libcommons-httpclient-java, liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java, libjsch-java +Build-Depends-Indep: sun-java6-jdk, libslide-webdavclient-java, libjcifs-java, libjorbis-java, libcommons-logging-java, libcommons-httpclient-java, liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java, libjsch-java Standards-Version: 3.7.2 Package: jftp Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, libslide-webdavclient-java, libjcifs-java, libjorbis-java, libcommons-logging-java, libcommons-httpclient-java, liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java, libjsch-java +Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-jre | java1-runtime | java2-runtime, libslide-webdavclient-java, libjcifs-java, libjorbis-java, libcommons-logging-java, libcommons-httpclient-java, liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java, libjsch-java Description: a Java GUI client for FTP, SMB, SFTP and NFS JFtp is a graphical Java network and file transfer client. It supports FTP using its own FTP API and various other protocols like diff --git a/debian/copyright b/debian/copyright index eb1d05b..cca2ae6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,6 @@ Upstream Author: David Hansmann <[email protected]> Copyright: 2007, David Hansmann <[email protected]> License: - This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -23,6 +22,10 @@ License: along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +The icons used in JFTP are taken from the GNOME 2.18 Icon theme, which +are also released under the GNU General Public License. They are +available at: http://art.gnome.org/themes/icon/1352 + On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude new file mode 100644 index 0000000..97e5abf --- /dev/null +++ b/debian/orig-tar.exclude @@ -0,0 +1,6 @@ +*/CVS* +lib/* +src/images/org +src/images/silk +src/images/gnome + diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 7271b30..9af2643 100644 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,15 +1,13 @@ #!/bin/sh -e # called by uscan with '--upstream-version' <version> <file> -TAR=../j-ftp-$2.tar.gz DIR=jftp-$2.orig # clean up the upstream tarball -mv $TAR $3 tar zxf $3 mv j-ftp $DIR -GZIP=--best tar czf $3 --exclude 'lib/*' --exclude 'src/images/org' --exclude '*/CVS' $DIR -rm -rf $TAR $DIR +GZIP=--best tar czf $3 -X debian/orig-tar.exclude $DIR +rm -rf $DIR # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then diff --git a/debian/patches/00list b/debian/patches/00list index 693f0ec..2cbc5ab 100755 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,3 @@ 01_manifest_fix -02_printstream_gcj_fix + diff --git a/debian/patches/02_printstream_gcj_fix.dpatch b/debian/patches/02_printstream_gcj_fix.dpatch deleted file mode 100755 index bb0a9a2..0000000 --- a/debian/patches/02_printstream_gcj_fix.dpatch +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_printstream_gcj_fix.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad jftp-1.50.orig~/src/java/net/sf/jftp/gui/base/RemoteDir.java jftp-1.50.orig/src/java/net/sf/jftp/gui/base/RemoteDir.java ---- jftp-1.50.orig~/src/java/net/sf/jftp/gui/base/RemoteDir.java 2007-09-09 21:09:37.000000000 +0530 -+++ jftp-1.50.orig/src/java/net/sf/jftp/gui/base/RemoteDir.java 2007-09-09 21:13:11.000000000 +0530 -@@ -776,12 +776,14 @@ - Log.debug("Can only list FtpConnection output!"); - } - -- PrintStream out = new PrintStream(Settings.ls_out); -+ java.io.FileOutputStream f_out = new java.io.FileOutputStream(Settings.ls_out); -+ PrintStream out = new PrintStream(f_out); - for(int i=0; i<((FtpConnection)con).currentListing.size(); i++) { - out.println(((FtpConnection)con).currentListing.get(i)); - } - out.flush(); - out.close(); -+ f_out.close(); - - java.net.URL url = new java.io.File(Settings.ls_out).toURL(); - Displayer d = new Displayer(url, new Font("monospaced",Font.PLAIN, 11)); -@@ -797,6 +799,11 @@ - ex2.printStackTrace(); - Log.debug("ERROR: File not found!"); - } -+ catch(java.io.IOException ex3) -+ { -+ ex3.printStackTrace(); -+ Log.debug("ERROR: Input/Output error!"); -+ } - } - else if(e.getActionCommand().equals("type") && (!JFtp.uiBlocked)) - { diff --git a/debian/rules b/debian/rules index 2352384..19f8586 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ 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-gcj +JAVA_HOME := /usr/lib/jvm/java-6-sun 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.jar \ @@ -18,4 +18,4 @@ install/jftp:: /usr/share/java/jftp.jar get-orig-source: - -uscan --upstream-version 0 + -uscan --upstream-version 0 --rename diff --git a/debian/watch b/debian/watch index 5518239..1891819 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,7 @@ 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 +#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 -- 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
