[pkg-java] r18876 - trunk/jftp/debian

[Markus Koschany]

Author: apo-guest
Date: 2015-10-29 17:24:57 +0000 (Thu, 29 Oct 2015)
New Revision: 18876

Modified:
   trunk/jftp/debian/changelog
   trunk/jftp/debian/control
   trunk/jftp/debian/jftp.desktop
   trunk/jftp/debian/manifest.mf
   trunk/jftp/debian/orig-tar.exclude
   trunk/jftp/debian/rules
Log:
Fix #770570 and #801001


Modified: trunk/jftp/debian/changelog
===================================================================
--- trunk/jftp/debian/changelog	2015-10-28 13:43:01 UTC (rev 18875)
+++ trunk/jftp/debian/changelog	2015-10-29 17:24:57 UTC (rev 18876)
@@ -1,9 +1,20 @@
-jftp (1.52+dfsg-3.1) UNRELEASED; urgency=medium
+jftp (1.52+dfsg-4) unstable; urgency=medium
 
-  * Remove Kumar Appaiah from uploaders.
+  * Team upload.
 
- -- Kumar Appaiah <akumar at debian.org>  Thu, 23 Jul 2015 14:21:05 +0530
+  [ Kumar Appaiah ]
+  * Remove myself from Uploaders.
 
+  [ Markus Koschany ]
+  * Remove Niels Thykier from Uploaders at his own request. (Closes: #770570)
+  * Remove libcommons-httpclient-java from Build-Depends and Depends.
+    Apparently no code at all depends on it anymore. (Closes: #801001)
+  * Vcs-Browser: Use https.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Add keywords to desktop file.
+
+ -- Markus Koschany <apo at debian.org>  Thu, 29 Oct 2015 18:08:57 +0100
+
 jftp (1.52+dfsg-3) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/jftp/debian/control
===================================================================
--- trunk/jftp/debian/control	2015-10-28 13:43:01 UTC (rev 18875)
+++ trunk/jftp/debian/control	2015-10-29 17:24:57 UTC (rev 18876)
@@ -2,13 +2,11 @@
 Section: net
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>,
-           Niels Thykier <niels at thykier.net>
+Uploaders: Varun Hiremath <varun at debian.org>
 Build-Depends: cdbs, debhelper (>= 9)
 Build-Depends-Indep: ant,
                      default-jdk,
                      kunststoff,
-                     libcommons-httpclient-java,
                      libcommons-logging-java,
                      libj2ssh-java,
                      libjcifs-java,
@@ -16,16 +14,15 @@
                      libjsch-java,
                      liblog4j1.2-java,
                      libyanfs-java
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jftp
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jftp
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/jftp
 Homepage: http://j-ftp.sourceforge.net
 
 Package: jftp
 Architecture: all
 Depends: java-wrappers,
          kunststoff,
-         libcommons-httpclient-java,
          libcommons-logging-java,
          libj2ssh-java,
          libjcifs-java,

Modified: trunk/jftp/debian/jftp.desktop
===================================================================
--- trunk/jftp/debian/jftp.desktop	2015-10-28 13:43:01 UTC (rev 18875)
+++ trunk/jftp/debian/jftp.desktop	2015-10-29 17:24:57 UTC (rev 18876)
@@ -9,3 +9,4 @@
 Terminal=0
 Type=Application
 Categories=Java;Network;FileTransfer;
+Keywords=ftp;smb;sftp;nfs;file;transfer;browser;network;

Modified: trunk/jftp/debian/manifest.mf
===================================================================
--- trunk/jftp/debian/manifest.mf	2015-10-28 13:43:01 UTC (rev 18875)
+++ trunk/jftp/debian/manifest.mf	2015-10-29 17:24:57 UTC (rev 18876)
@@ -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 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 log4j-1.2.jar kunststoff.jar

Modified: trunk/jftp/debian/orig-tar.exclude
===================================================================
--- trunk/jftp/debian/orig-tar.exclude	2015-10-28 13:43:01 UTC (rev 18875)
+++ trunk/jftp/debian/orig-tar.exclude	2015-10-29 17:24:57 UTC (rev 18876)
@@ -3,7 +3,7 @@
 lib/*
 dist/*
 *.class
-src/images/org 
+src/images/org
 src/images/silk
 src/images/gnome
 Webdav*.java

Modified: trunk/jftp/debian/rules
===================================================================
--- trunk/jftp/debian/rules	2015-10-28 13:43:01 UTC (rev 18875)
+++ trunk/jftp/debian/rules	2015-10-29 17:24:57 UTC (rev 18876)
@@ -5,7 +5,7 @@
 
 JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET	:= jars
-DEB_JARS		:= jcifs jl commons-logging commons-httpclient log4j-1.2 \
+DEB_JARS		:= jcifs jl commons-logging log4j-1.2 \
 			   jakarta-slide-webdavlib kunststoff j2ssh-ant j2ssh-core yanfs \
 			   j2ssh-common j2ssh-dameon jsch
 ANT_ARGS		:= -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5