[jftp] 35/40: Fix #770570 and #801001

[Markus Koschany]

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

apo pushed a commit to branch master
in repository jftp.

commit a59e2e56fb8363b955f6b33c4ce9b5f73697137d
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Oct 29 17:24:57 2015 +0000

    Fix #770570 and #801001
---
 debian/changelog        | 17 ++++++++++++++---
 debian/control          |  9 +++------
 debian/jftp.desktop     |  1 +
 debian/manifest.mf      |  2 +-
 debian/orig-tar.exclude |  2 +-
 debian/rules            |  2 +-
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fcb36a..33012a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
-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 ]
+  * 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.
 
- -- Kumar Appaiah <akumar at debian.org>  Thu, 23 Jul 2015 14:21:05 +0530
+ -- Markus Koschany <apo at debian.org>  Thu, 29 Oct 2015 18:08:57 +0100
 
 jftp (1.52+dfsg-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2b4cdfd..1a21368 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,11 @@ Source: jftp
 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 @@ Build-Depends-Indep: ant,
                      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,
diff --git a/debian/jftp.desktop b/debian/jftp.desktop
index b561941..43c5d56 100644
--- a/debian/jftp.desktop
+++ b/debian/jftp.desktop
@@ -9,3 +9,4 @@ TryExec=jftp
 Terminal=0
 Type=Application
 Categories=Java;Network;FileTransfer;
+Keywords=ftp;smb;sftp;nfs;file;transfer;browser;network;
diff --git a/debian/manifest.mf b/debian/manifest.mf
index eb45707..736e6e9 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 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
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
index 0ffe553..50d436f 100644
--- a/debian/orig-tar.exclude
+++ b/debian/orig-tar.exclude
@@ -3,7 +3,7 @@ build/*
 lib/*
 dist/*
 *.class
-src/images/org 
+src/images/org
 src/images/silk
 src/images/gnome
 Webdav*.java
diff --git a/debian/rules b/debian/rules
index f89c77d..155b7a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 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

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