diff -u jftp-1.51~pre4/debian/rules jftp-1.51~pre4/debian/rules --- jftp-1.51~pre4/debian/rules +++ jftp-1.51~pre4/debian/rules @@ -4,11 +4,12 @@ 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/default-java DEB_ANT_BUILD_TARGET := jars -DEB_JARS := jcifs jl commons-logging commons-httpclient log4j-1.2 jorbis jogg \ +DEB_JARS := jcifs jl commons-logging commons-httpclient log4j-1.2 \ jakarta-slide-webdavlib kunststoff j2ssh-ant j2ssh-core yanfs \ j2ssh-common j2ssh-dameon jsch +DEB_ANT_ARGS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 install/jftp:: chmod 644 doc/FtpUpload.java diff -u jftp-1.51~pre4/debian/control jftp-1.51~pre4/debian/control --- jftp-1.51~pre4/debian/control +++ jftp-1.51~pre4/debian/control @@ -1,22 +1,23 @@ Source: jftp Section: contrib/net Priority: optional -Maintainer: Debian Java maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Java maintainers Uploaders: Varun Hiremath , Kumar Appaiah Build-Depends: cdbs, debhelper (>= 5), dpatch -Build-Depends-Indep: sun-java6-jdk, ant, libslide-webdavclient-java, - libjcifs-java, libjorbis-java, libcommons-logging-java, +Build-Depends-Indep: default-jdk, ant, libslide-webdavclient-java, + libjcifs-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, - libslide-webdavclient-java, libjcifs-java, libjorbis-java, +Depends: default-jre | java2-runtime, + libslide-webdavclient-java, libjcifs-java, libcommons-logging-java, libcommons-httpclient-java, liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java, libjsch-java, libjlayer-java diff -u jftp-1.51~pre4/debian/changelog jftp-1.51~pre4/debian/changelog --- jftp-1.51~pre4/debian/changelog +++ jftp-1.51~pre4/debian/changelog @@ -1,3 +1,26 @@ +jftp (1.51~pre4-1ubuntu1) intrepid; urgency=low + + * debian/control + - Use 'default-jdk' as build dependency. (LP: #256609) + - Use 'default-jre | java2-runtime' as build dependency. + - Remove unneeded build dependency libjorbis-java. + - Remove unneeded runtime dependeny libjorbis-java. + - Standard version 3.8.0. + - Modify Maintainer value to match the DebianMaintainerField + specification. + * debian/rules + - Set JAVA_HOME corresponding to default-jdk. + - Add ant arguments to compile code for target JVM 1.5 + - Remove unneeded jar files names, jorbis and jogg. + * debian/jftp.run + - Remove hard coded path to Sun Java. + * debian/manifest.mf + - Remove unneeded jar files names, jorbis and jogg. + * debian/README.Debian + - Added to comply with standard version 3.8.0. + + -- Onkar Shinde Sun, 10 Aug 2008 17:03:55 +0530 + jftp (1.51~pre4-1) unstable; urgency=low * New upstream release. diff -u jftp-1.51~pre4/debian/manifest.mf jftp-1.51~pre4/debian/manifest.mf --- jftp-1.51~pre4/debian/manifest.mf +++ jftp-1.51~pre4/debian/manifest.mf @@ -4 +4 @@ -Class-Path: j2ssh-ant.jar j2ssh-core.jar yanfs.jar j2ssh-common.jar j2ssh-dameon.jar jsch.jar jcifs.jar jl.jar commons-logging.jar commons-httpclient.jar log4j-1.2.jar jorbis.jar jogg.jar jakarta-slide-webdavlib.jar kunststoff.jar +Class-Path: j2ssh-ant.jar j2ssh-core.jar yanfs.jar j2ssh-common.jar j2ssh-dameon.jar jsch.jar jcifs.jar jl.jar commons-logging.jar commons-httpclient.jar log4j-1.2.jar jakarta-slide-webdavlib.jar kunststoff.jar diff -u jftp-1.51~pre4/debian/jftp.run jftp-1.51~pre4/debian/jftp.run --- jftp-1.51~pre4/debian/jftp.run +++ jftp-1.51~pre4/debian/jftp.run @@ -2 +2 @@ -/usr/lib/jvm/java-6-sun/jre/bin/java -jar /usr/share/java/jftp.jar "$@" +java -jar /usr/share/java/jftp.jar "$@" only in patch2: unchanged: --- jftp-1.51~pre4.orig/debian/README.Debian +++ jftp-1.51~pre4/debian/README.Debian @@ -0,0 +1,32 @@ +This package uses dpatch in order to apply patches to the upstream source. +Patches are stored in debian/patches and their filenames usually end in .dpatch . +For further details, see the man pages for dpatch and dpatch-edit-patch. + +All commands described below should be run from the top directory of the +package source tree, unless otherwise stated. + + * To generate the fully patched source, in a form ready for + editing, that would be built to create Debian packages, run: + + dpatch apply-all + + Note: This should happen automatically when you run + dpkg-source -x on a dpatch source package. + + * To modify the source and save those modifications so that + they will be applied when building the package, pick a + suitably informative patch file name, for example + 01_add_README.source_file.dpatch, and then run: + + dpatch-edit-patch 01_add_README.source_file.dpatch + + This will place you in a new shell in a temporary copy of the + source tree. Make your desired modifications to it, and then + exit the shell to create the patch file containing them (this + file will appear in debian/patches). + + * To remove source modifications that are currently being + applied when building the package, run: + + dpatch unapply-all +