[pkg-java] r10868 - in trunk/jftp/debian: . patches

Fri Oct 23 20:10:17 UTC 2009

Author: nthykier-guest
Date: 2009-10-23 20:10:17 +0000 (Fri, 23 Oct 2009)
New Revision: 10868

Modified:
   trunk/jftp/debian/changelog
   trunk/jftp/debian/compat
   trunk/jftp/debian/control
   trunk/jftp/debian/copyright
   trunk/jftp/debian/manifest.mf
   trunk/jftp/debian/patches/manifest_fix.diff
   trunk/jftp/debian/watch
Log:
jftp (1.52-1) unstable; urgency=low

  [ Barry deFreese ]
  * New upstream release.
  * Remove jakarta-slide-webdavlib b-d and entry from debian/manifest.mf.
  * Update watch file to use sf redirector.
  * Minor syntax changes to debian/copyright to please lintian.
  * Bump Standards Version to 3.8.3. (No changes needed).

  [ Niels Thykier ]
  * Bumped debhelper version.
  * Corrected reference to GPL-2 in debian/copyright.
  * Added a short description to the Debian patch.

 -- Niels Thykier <niels at thykier.net>  Fri, 23 Oct 2009 22:10:00 +0200


Modified: trunk/jftp/debian/changelog
===================================================================

--- trunk/jftp/debian/changelog	2009-10-23 18:46:55 UTC (rev 10867)
+++ trunk/jftp/debian/changelog	2009-10-23 20:10:17 UTC (rev 10868)
@@ -1,3 +1,19 @@
+jftp (1.52-1) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * New upstream release.
+  * Remove jakarta-slide-webdavlib b-d and entry from debian/manifest.mf.
+  * Update watch file to use sf redirector.
+  * Minor syntax changes to debian/copyright to please lintian.
+  * Bump Standards Version to 3.8.3. (No changes needed).
+
+  [ Niels Thykier ]
+  * Bumped debhelper version.
+  * Corrected reference to GPL-2 in debian/copyright.
+  * Added a short description to the Debian patch.
+
+ -- Niels Thykier <niels at thykier.net>  Fri, 23 Oct 2009 22:10:00 +0200
+
 jftp (1.51-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/jftp/debian/compat
===================================================================
--- trunk/jftp/debian/compat	2009-10-23 18:46:55 UTC (rev 10867)
+++ trunk/jftp/debian/compat	2009-10-23 20:10:17 UTC (rev 10868)
@@ -1 +1 @@
-5
+7

Modified: trunk/jftp/debian/control
===================================================================
--- trunk/jftp/debian/control	2009-10-23 18:46:55 UTC (rev 10867)
+++ trunk/jftp/debian/control	2009-10-23 20:10:17 UTC (rev 10868)
@@ -2,13 +2,14 @@
 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), quilt
-Build-Depends-Indep: openjdk-6-jdk, ant, libslide-webdavclient-java,
+Uploaders: Varun Hiremath <varun at debian.org>, Kumar Appaiah <akumar at debian.org>,
+ Niels Thykier <niels at thykier.net>
+Build-Depends: cdbs, debhelper (>= 7), quilt
+Build-Depends-Indep: openjdk-6-jdk, ant,
  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
+Standards-Version: 3.8.3
 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

Modified: trunk/jftp/debian/copyright
===================================================================
--- trunk/jftp/debian/copyright	2009-10-23 18:46:55 UTC (rev 10867)
+++ trunk/jftp/debian/copyright	2009-10-23 20:10:17 UTC (rev 10868)
@@ -5,7 +5,8 @@
 
 Upstream Author: David Hansmann <hansmann.d at debitel.net>
 
-Copyrights: (C) 2007 David Hansmann <hansmann.d at debitel.net>
+Copyright:
+	Copyright (C) 2007 David Hansmann <hansmann.d at debitel.net>
 
 License:
    This package is free software; you can redistribute it and/or modify
@@ -23,7 +24,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
    On Debian systems, the complete text of the GNU General
-   Public License can be found in `/usr/share/common-licenses/GPL'.
+   Public License can be found in `/usr/share/common-licenses/GPL-2'.
 -----
 
 The icons used in JFTP are taken from the GNOME 2.18 Icon theme, which
@@ -34,8 +35,8 @@
 =====
 
 Copyright: 
-    (C) 2003 "Eric Glass" <jcifs at samba.org>
-    (C) 2000-2002 "Michael B. Allen" <jcifs at samba.org>
+	Copyright (C) 2003 "Eric Glass" <jcifs at samba.org>
+	Copyright (C) 2000-2002 "Michael B. Allen" <jcifs at samba.org>
 
 License:
   This library is free software; you can redistribute it and/or
@@ -49,7 +50,7 @@
   Lesser General Public License for more details.
 
   On Debian systems, you can find the LGPL license in:
-  /usr/share/common-licenses/LGPL
+  /usr/share/common-licenses/LGPL-2.1
 -----
 
 DesCipher - the DES encryption method (./jcifs/util/DES.java)
@@ -57,7 +58,7 @@
 
     The meat of this code is by Dave Zimmerman <dzimm at widget.com>, and is:
 
-    Copyright: (c) 1996 Widget Workshop, Inc. All Rights Reserved.
+    Copyright: Copyright (C) 1996 Widget Workshop, Inc. All Rights Reserved.
 
     License:
     Permission to use, copy, modify, and distribute this software
@@ -86,8 +87,8 @@
     The rest is:
 
     Copyright:
-        (C) 1996 Jef Poskanzer <jef at acme.com>.  All rights reserved.
-        (C) 1996 Wolfgang Platzer <wplatzer at iaik.tu-graz.ac.at>,
+	Copyright (C) 1996 Jef Poskanzer <jef at acme.com>.  All rights reserved.
+	Copyright (C) 1996 Wolfgang Platzer <wplatzer at iaik.tu-graz.ac.at>,
     	         All rights reserved.
 
     License:
@@ -113,5 +114,5 @@
     SUCH DAMAGE.
 -----
 
-The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
+The Debian packaging is Copyright (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
 Kumar Appaiah <akumar at ee.iitm.ac.in>, and is licensed under the GPL, see above.

Modified: trunk/jftp/debian/manifest.mf
===================================================================
--- trunk/jftp/debian/manifest.mf	2009-10-23 18:46:55 UTC (rev 10867)
+++ trunk/jftp/debian/manifest.mf	2009-10-23 20:10:17 UTC (rev 10868)
@@ -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 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 kunststoff.jar

Modified: trunk/jftp/debian/patches/manifest_fix.diff
===================================================================
--- trunk/jftp/debian/patches/manifest_fix.diff	2009-10-23 18:46:55 UTC (rev 10867)
+++ trunk/jftp/debian/patches/manifest_fix.diff	2009-10-23 20:10:17 UTC (rev 10868)
@@ -1,3 +1,5 @@
+Description: Make the upstream build system use our manifest.
+
 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

Modified: trunk/jftp/debian/watch
===================================================================
--- trunk/jftp/debian/watch	2009-10-23 18:46:55 UTC (rev 10867)
+++ trunk/jftp/debian/watch	2009-10-23 20:10:17 UTC (rev 10868)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/j-ftp/j-ftp-([\d.]+).tar.gz debian debian/orig-tar.sh
+
+http://sf.net/j-ftp/j-ftp-([\d.]+)\.tar\.gz


