Author: varun Date: 2008-11-09 16:07:01 +0000 (Sun, 09 Nov 2008) New Revision: 7287
Added: trunk/jftp/debian/README.source trunk/jftp/debian/patches/manifest_fix.diff trunk/jftp/debian/patches/series Removed: trunk/jftp/debian/README.Debian-source trunk/jftp/debian/patches/00list trunk/jftp/debian/patches/01_manifest_fix.dpatch Modified: trunk/jftp/debian/changelog trunk/jftp/debian/control trunk/jftp/debian/manifest.mf trunk/jftp/debian/rules Log: * Reupload with source * Remove jorbis and jogg dependency -- no longer used, thanks to Onkar Shinde (Closes: #504425) * Rename README.Debian-source to README.source * Switch to quilt for patches Deleted: trunk/jftp/debian/README.Debian-source =================================================================== --- trunk/jftp/debian/README.Debian-source 2008-11-09 14:04:44 UTC (rev 7286) +++ trunk/jftp/debian/README.Debian-source 2008-11-09 16:07:01 UTC (rev 7287) @@ -1,18 +0,0 @@ -jftp -==== - -The upstream supplied source package contains binary jar files. -Currently no clean source distribution exists. Therefore, the upstream -sources were modified to comply with the Debian Free Software -Guidelines. - -Use the rules/get-orig-source target to create the orig.tar.gz. -For more details on repackaging of upstream sources please see the -debian/orig-tar.sh file. - -Some of the icons in the original tarball, notably the silk and -JavaLobby icons, are non-free, and thus have been removed from the -original tarball. Only the free icons from GNOME Art are used, as they -are licensed under the GPL. - - -- Kumar Appaiah <[EMAIL PROTECTED]>, Thu, 13 Sep 2007 20:25:21 +0530 Copied: trunk/jftp/debian/README.source (from rev 7213, trunk/jftp/debian/README.Debian-source) =================================================================== --- trunk/jftp/debian/README.source (rev 0) +++ trunk/jftp/debian/README.source 2008-11-09 16:07:01 UTC (rev 7287) @@ -0,0 +1,18 @@ +jftp +==== + +The upstream supplied source package contains binary jar files. +Currently no clean source distribution exists. Therefore, the upstream +sources were modified to comply with the Debian Free Software +Guidelines. + +Use the rules/get-orig-source target to create the orig.tar.gz. +For more details on repackaging of upstream sources please see the +debian/orig-tar.sh file. + +Some of the icons in the original tarball, notably the silk and +JavaLobby icons, are non-free, and thus have been removed from the +original tarball. Only the free icons from GNOME Art are used, as they +are licensed under the GPL. + + -- Kumar Appaiah <[EMAIL PROTECTED]>, Thu, 13 Sep 2007 20:25:21 +0530 Property changes on: trunk/jftp/debian/README.source ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/jftp/debian/changelog =================================================================== --- trunk/jftp/debian/changelog 2008-11-09 14:04:44 UTC (rev 7286) +++ trunk/jftp/debian/changelog 2008-11-09 16:07:01 UTC (rev 7287) @@ -1,3 +1,13 @@ +jftp (1.51~pre4-3) unstable; urgency=low + + * Reupload with source + * Remove jorbis and jogg dependency -- no longer used, thanks to Onkar + Shinde (Closes: #504425) + * Rename README.Debian-source to README.source + * Switch to quilt for patches + + -- Varun Hiremath <[EMAIL PROTECTED]> Sun, 09 Nov 2008 11:04:44 -0500 + jftp (1.51~pre4-2) unstable; urgency=low * Switch to openjdk Modified: trunk/jftp/debian/control =================================================================== --- trunk/jftp/debian/control 2008-11-09 14:04:44 UTC (rev 7286) +++ trunk/jftp/debian/control 2008-11-09 16:07:01 UTC (rev 7287) @@ -3,11 +3,11 @@ 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: cdbs, debhelper (>= 5), quilt 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 + libjcifs-java, libcommons-logging-java, libcommons-httpclient-java, + liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java, libjsch-java, + libjlayer-java Standards-Version: 3.8.0 Homepage: http://j-ftp.sourceforge.net Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jftp @@ -16,10 +16,9 @@ Package: jftp Architecture: all 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, - libjsch-java, libjlayer-java + libslide-webdavclient-java, libjcifs-java, libcommons-logging-java, + libcommons-httpclient-java, liblog4j1.2-java, kunststoff, libyanfs-java, + libj2ssh-java, libjsch-java, libjlayer-java Description: 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 Modified: trunk/jftp/debian/manifest.mf =================================================================== --- trunk/jftp/debian/manifest.mf 2008-11-09 14:04:44 UTC (rev 7286) +++ trunk/jftp/debian/manifest.mf 2008-11-09 16:07:01 UTC (rev 7287) @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Main-Class: net.sf.jftp.JFtp Created-By: 1.4.0-beta (Sun Microsystems Inc.) -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 Deleted: trunk/jftp/debian/patches/00list =================================================================== --- trunk/jftp/debian/patches/00list 2008-11-09 14:04:44 UTC (rev 7286) +++ trunk/jftp/debian/patches/00list 2008-11-09 16:07:01 UTC (rev 7287) @@ -1,3 +0,0 @@ -01_manifest_fix - - Deleted: trunk/jftp/debian/patches/01_manifest_fix.dpatch =================================================================== --- trunk/jftp/debian/patches/01_manifest_fix.dpatch 2008-11-09 14:04:44 UTC (rev 7286) +++ trunk/jftp/debian/patches/01_manifest_fix.dpatch 2008-11-09 16:07:01 UTC (rev 7287) @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_manifest_fix.dpatch by <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - [EMAIL PROTECTED]@ -diff -urNad jftp-1.50~/build.xml jftp-1.50/build.xml ---- jftp-1.50~/build.xml 2007-09-09 13:06:53.000000000 +0530 -+++ jftp-1.50/build.xml 2007-09-09 13:07:06.000000000 +0530 -@@ -122,7 +122,7 @@ - <target name="jars" depends="compile" description="Create Executable Jar"> - <jar compress="true" jarfile="build/jars/jftp.jar" - basedir="build/classes" -- manifest="src/meta-inf/manifest.mf"> -+ manifest="debian/manifest.mf"> - <zipfileset dir="src/images/" prefix="images"> - <include name="**"/> - </zipfileset> Added: trunk/jftp/debian/patches/manifest_fix.diff =================================================================== --- trunk/jftp/debian/patches/manifest_fix.diff (rev 0) +++ trunk/jftp/debian/patches/manifest_fix.diff 2008-11-09 16:07:01 UTC (rev 7287) @@ -0,0 +1,12 @@ +diff -urN jftp-1.51~pre4.orig/build.xml jftp-1.51~pre4/build.xml +--- jftp-1.51~pre4.orig/build.xml 2005-04-13 14:45:27.000000000 -0400 ++++ jftp-1.51~pre4/build.xml 2008-11-09 11:02:00.000000000 -0500 +@@ -122,7 +122,7 @@ + <target name="jars" depends="compile" description="Create Executable Jar"> + <jar compress="true" jarfile="build/jars/jftp.jar" + basedir="build/classes" +- manifest="src/meta-inf/manifest.mf"> ++ manifest="debian/manifest.mf"> + <zipfileset dir="src/images/" prefix="images"> + <include name="**"/> + </zipfileset> Added: trunk/jftp/debian/patches/series =================================================================== --- trunk/jftp/debian/patches/series (rev 0) +++ trunk/jftp/debian/patches/series 2008-11-09 16:07:01 UTC (rev 7287) @@ -0,0 +1 @@ +manifest_fix.diff Modified: trunk/jftp/debian/rules =================================================================== --- trunk/jftp/debian/rules 2008-11-09 14:04:44 UTC (rev 7286) +++ trunk/jftp/debian/rules 2008-11-09 16:07:01 UTC (rev 7287) @@ -2,11 +2,11 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk 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 \ +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 ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
