[jftp] 18/40: * 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

Markus Koschany apo at moszumanska.debian.org
Sat Apr 2 22:50:22 UTC 2016


This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository jftp.

commit a82357644246b37477089e6fd51733a2e361e7c6
Author: Varun Hiremath <varun at debian.org>
Date:   Sun Nov 9 16:07:01 2008 +0000

    * 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
---
 debian/{README.Debian-source => README.source}            |  0
 debian/changelog                                          | 10 ++++++++++
 debian/control                                            | 15 +++++++--------
 debian/manifest.mf                                        |  2 +-
 debian/patches/00list                                     |  3 ---
 .../patches/{01_manifest_fix.dpatch => manifest_fix.diff} | 13 +++----------
 debian/patches/series                                     |  1 +
 debian/rules                                              |  4 ++--
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/debian/README.Debian-source b/debian/README.source
similarity index 100%
rename from debian/README.Debian-source
rename to debian/README.source
diff --git a/debian/changelog b/debian/changelog
index 01aa789..a9c876d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <varun at debian.org>  Sun, 09 Nov 2008 11:04:44 -0500
+
 jftp (1.51~pre4-2) unstable; urgency=low
 
   * Switch to openjdk
diff --git a/debian/control b/debian/control
index 0f74e8d..73f7077 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: net
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Kumar Appaiah <akumar at debian.org>
-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 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jftp
 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
diff --git a/debian/manifest.mf b/debian/manifest.mf
index aa78ebd..b66ea68 100644
--- a/debian/manifest.mf
+++ b/debian/manifest.mf
@@ -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
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100755
index 2cbc5ab..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_manifest_fix
-
-
diff --git a/debian/patches/01_manifest_fix.dpatch b/debian/patches/manifest_fix.diff
old mode 100755
new mode 100644
similarity index 51%
rename from debian/patches/01_manifest_fix.dpatch
rename to debian/patches/manifest_fix.diff
index e1b59a7..0f2cf38
--- a/debian/patches/01_manifest_fix.dpatch
+++ b/debian/patches/manifest_fix.diff
@@ -1,13 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_manifest_fix.dpatch by  <akumar at ee.iitm.ac.in>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-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
+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"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..957bb3b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+manifest_fix.diff
diff --git a/debian/rules b/debian/rules
index 336d360..532e6a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jftp.git



More information about the pkg-java-commits mailing list