This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jftp.
commit 25a009bbe93239bc2bc4a2b14292b4a0e118e4e6 Author: Markus Koschany <[email protected]> Date: Sun Apr 3 00:37:21 2016 +0200 Add new debian dir --- debian/{jftp.run => bin/jftp} | 0 debian/changelog | 24 ++- debian/control | 63 ++++---- debian/copyright | 165 ++++++--------------- debian/jftp.desktop | 2 +- debian/jftp.install | 3 + debian/jftp.jlibs | 1 + debian/manifest.mf | 4 - debian/orig-tar.exclude | 9 -- debian/orig-tar.sh | 19 --- debian/patches/JWebBroser-disable.patch | 35 +++++ debian/patches/manifest_fix.diff | 14 -- debian/patches/series | 4 +- .../{webdav_disable.diff => webdav-disable.patch} | 140 +++++++++-------- debian/rules | 31 ++-- debian/watch | 2 +- 16 files changed, 227 insertions(+), 289 deletions(-) diff --git a/debian/jftp.run b/debian/bin/jftp old mode 100644 new mode 100755 similarity index 100% rename from debian/jftp.run rename to debian/bin/jftp diff --git a/debian/changelog b/debian/changelog index ad77095..fd3601b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,24 @@ -jftp (1.52+dfsg-5) UNRELEASED; urgency=medium +jftp (1.60+dfsg-1) unstable; urgency=medium - * Moved the package to Git - - -- Markus Koschany <[email protected]> Sun, 03 Apr 2016 00:30:32 +0200 + * Team upload. + * Imported Upstream version 1.60+dfsg. + * Drop webdav_disable.diff and manifest_fix.diff. + * d/control: + - Add libmiglayout-java, libswt-gtk-4-java, libcommons-codec-java and + javahelper to Build-Depends. + * Add webdav-disable.patch and disable the WebDav feature. + * Add JWebBrowser-disable.patch and disable the native WebBrowser feature. + * Declare compliance with Debian Policy 3.9.7. + * wrap-and-sort -sa. + * Use only Build-Depends field. + * Switch from cdbs to dh sequencer. + * Use jftp.install and jftp.jlibs to install the files. + * Remove superfluous ${shlibs:Depends} substvar. + * Remove manifest.mf + * Depend on default-jre | java6-runtime. + * Update debian/copyright to copyright format 1.0. + + -- Markus Koschany <[email protected]> Sat, 02 Apr 2016 22:45:00 +0200 jftp (1.52+dfsg-4) unstable; urgency=medium diff --git a/debian/control b/debian/control index 8bd192b..1b2f667 100644 --- a/debian/control +++ b/debian/control @@ -1,38 +1,47 @@ Source: jftp Section: net Priority: optional -Maintainer: Debian Java maintainers <[email protected]> -Uploaders: Varun Hiremath <[email protected]> -Build-Depends: cdbs, debhelper (>= 9) -Build-Depends-Indep: ant, - default-jdk, - kunststoff, - libcommons-logging-java, - libj2ssh-java, - libjcifs-java, - libjlayer-java, - libjsch-java, - liblog4j1.2-java, - libyanfs-java -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-java/jftp.git +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: + Varun Hiremath <[email protected]> +Build-Depends: + ant, + debhelper (>= 9), + default-jdk, + javahelper, + kunststoff, + libcommons-codec-java, + libcommons-logging-java, + libj2ssh-java, + libjcifs-java, + libjlayer-java, + libjsch-java, + liblog4j1.2-java, + libmiglayout-java, + libswt-gtk-4-java, + libyanfs-java +Standards-Version: 3.9.7 +Vcs-Svn: svn://anonscm.debian.org/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-logging-java, - libj2ssh-java, - libjcifs-java, - libjlayer-java, - libjsch-java, - liblog4j1.2-java, - libyanfs-java, - default-jre, - ${misc:Depends}, - ${shlibs:Depends} +Depends: + default-jre | java6-runtime, + java-wrappers, + kunststoff, + libcommons-codec-java, + libcommons-logging-java, + libj2ssh-java, + libjcifs-java, + libjlayer-java, + libjsch-java, + liblog4j1.2-java, + libmiglayout-java, + libswt-gtk-4-java, + libyanfs-java, + ${misc:Depends} 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/copyright b/debian/copyright index 93a09ce..613ea0d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,118 +1,51 @@ -This package was debianized by Varun Hiremath <[email protected]> on -Fri, 24 Aug 2007 18:14:39 +0530. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: JFtp +Source: http://sourceforge.net/projects/j-ftp/files/ +Files-Excluded: + *.jar + */CVS* + build/* + lib/* + dist/* + *.class + src/images/org + src/images/silk + src/images/gnome + src/java/net/sf/jftp/net/wrappers/WebdavConnection.java + src/java/net/sf/jftp/gui/hostchooser/WebdavHostChooser.java + +Files: * +Copyright: David Hansmann <[email protected]> +License: GPL-2+ +Comment: + The icons used in JFTP are taken from the GNOME 2.18 Icon theme, which + are also released under the GNU General Public License. They are + available at: http://art.gnome.org/themes/icon/1352 + +Files: debian/* +Copyright: 2007, Kumar Appaiah <[email protected]> + 2008-2010, Varun Hiremath <[email protected]> + 2009-2012, Niels Thykier <[email protected]> + 2014, Emmanuel Bourg <[email protected]> + 2015-2016, Markus Koschany <[email protected]> +License: GPL-2+ + +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + 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-2'. -It was downloaded from http://j-ftp.sourceforge.net -Upstream Author: David Hansmann <[email protected]> - -Copyright: - Copyright (C) 2007 David Hansmann <[email protected]> - -License: - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - 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-2'. ------ - -The icons used in JFTP are taken from the GNOME 2.18 Icon theme, which -are also released under the GNU General Public License. They are -available at: http://art.gnome.org/themes/icon/1352 ------ -jcifs -===== - -Copyright: - Copyright (C) 2003 "Eric Glass" <[email protected]> - Copyright (C) 2000-2002 "Michael B. Allen" <[email protected]> - -License: - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - On Debian systems, you can find the LGPL license in: - /usr/share/common-licenses/LGPL-2.1 ------ - -DesCipher - the DES encryption method (./jcifs/util/DES.java) -------------------------------------------------------------- - - The meat of this code is by Dave Zimmerman <[email protected]>, and is: - - Copyright: Copyright (C) 1996 Widget Workshop, Inc. All Rights Reserved. - - License: - Permission to use, copy, modify, and distribute this software - and its documentation for NON-COMMERCIAL or COMMERCIAL purposes and - without fee is hereby granted, provided that this copyright notice is kept - intact. - - WIDGET WORKSHOP MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY - OF THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED - TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - PARTICULAR PURPOSE, OR NON-INFRINGEMENT. WIDGET WORKSHOP SHALL NOT BE LIABLE - FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR - DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. - - THIS SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE OR RESALE AS ON-LINE - CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE - PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT - NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE - SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE - SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE - PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES"). WIDGET WORKSHOP - SPECIFICALLY DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR - HIGH RISK ACTIVITIES. - - - The rest is: - - Copyright: - Copyright (C) 1996 Jef Poskanzer <[email protected]>. All rights reserved. - Copyright (C) 1996 Wolfgang Platzer <[email protected]>, - All rights reserved. - - License: - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. ------ - -The Debian packaging is Copyright (C) 2007, Varun Hiremath <[email protected]> and -Kumar Appaiah <[email protected]>, and is licensed under the GPL, see above. diff --git a/debian/jftp.desktop b/debian/jftp.desktop index 43c5d56..747809f 100644 --- a/debian/jftp.desktop +++ b/debian/jftp.desktop @@ -6,7 +6,7 @@ Comment=Java GUI client for FTP, SMB, SFTP and NFS Exec=jftp %u Icon=jftp.xpm TryExec=jftp -Terminal=0 +Terminal=false Type=Application Categories=Java;Network;FileTransfer; Keywords=ftp;smb;sftp;nfs;file;transfer;browser;network; diff --git a/debian/jftp.install b/debian/jftp.install new file mode 100644 index 0000000..faf6d1d --- /dev/null +++ b/debian/jftp.install @@ -0,0 +1,3 @@ +debian/jftp.desktop usr/share/applications +debian/jftp.xpm usr/share/pixmaps +debian/bin/jftp usr/bin diff --git a/debian/jftp.jlibs b/debian/jftp.jlibs new file mode 100644 index 0000000..2876606 --- /dev/null +++ b/debian/jftp.jlibs @@ -0,0 +1 @@ +build/jars/jftp.jar diff --git a/debian/manifest.mf b/debian/manifest.mf deleted file mode 100644 index 736e6e9..0000000 --- a/debian/manifest.mf +++ /dev/null @@ -1,4 +0,0 @@ -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 log4j-1.2.jar kunststoff.jar diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude deleted file mode 100644 index 50d436f..0000000 --- a/debian/orig-tar.exclude +++ /dev/null @@ -1,9 +0,0 @@ -*/CVS* -build/* -lib/* -dist/* -*.class -src/images/org -src/images/silk -src/images/gnome -Webdav*.java diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh deleted file mode 100755 index 9af2643..0000000 --- a/debian/orig-tar.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -e - -# called by uscan with '--upstream-version' <version> <file> -DIR=jftp-$2.orig - -# clean up the upstream tarball -tar zxf $3 -mv j-ftp $DIR -GZIP=--best tar czf $3 -X debian/orig-tar.exclude $DIR -rm -rf $DIR - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $3 $origDir - echo "moved $3 to $origDir" -fi - -exit 0 diff --git a/debian/patches/JWebBroser-disable.patch b/debian/patches/JWebBroser-disable.patch new file mode 100644 index 0000000..4038337 --- /dev/null +++ b/debian/patches/JWebBroser-disable.patch @@ -0,0 +1,35 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 2 Apr 2016 19:23:46 +0200 +Subject: JWebBrowser disable + +Disable JWebBrowser because the dependency is not available in Debian. + +Forwarded: not-needed +--- + src/java/net/sf/jftp/gui/tasks/NativeHttpBrowser.java | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/java/net/sf/jftp/gui/tasks/NativeHttpBrowser.java b/src/java/net/sf/jftp/gui/tasks/NativeHttpBrowser.java +index 7afc2a7..20c1d3a 100644 +--- a/src/java/net/sf/jftp/gui/tasks/NativeHttpBrowser.java ++++ b/src/java/net/sf/jftp/gui/tasks/NativeHttpBrowser.java +@@ -35,7 +35,6 @@ import org.eclipse.swt.widgets.Display; + import org.eclipse.swt.widgets.Group; + import org.eclipse.swt.widgets.Shell; + +-import chrriis.dj.sweet.components.JWebBrowser; + + public class NativeHttpBrowser extends Composite { + +@@ -46,8 +45,6 @@ public class NativeHttpBrowser extends Composite { + webBrowserPanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + webBrowserPanel.setLayout(new FillLayout()); + +- final JWebBrowser webBrowser = new JWebBrowser(webBrowserPanel); +- webBrowser.navigate(url); + + webBrowserPanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + } +-- +2.8.0.rc3 + diff --git a/debian/patches/manifest_fix.diff b/debian/patches/manifest_fix.diff deleted file mode 100644 index d5c39a8..0000000 --- a/debian/patches/manifest_fix.diff +++ /dev/null @@ -1,14 +0,0 @@ -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 -@@ -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> diff --git a/debian/patches/series b/debian/patches/series index 71d5abf..7a9e208 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -webdav_disable.diff -manifest_fix.diff +webdav-disable.patch +JWebBroser-disable.patch diff --git a/debian/patches/webdav_disable.diff b/debian/patches/webdav-disable.patch similarity index 62% rename from debian/patches/webdav_disable.diff rename to debian/patches/webdav-disable.patch index b337899..27a1f3c 100644 --- a/debian/patches/webdav_disable.diff +++ b/debian/patches/webdav-disable.patch @@ -1,19 +1,21 @@ -Author: Varun Hiremath <[email protected]> -Date: Sun, 11 Apr 2010 19:43:53 -0400 -Description: Remove all references to webdav, no longer supported in Debian -Index: jftp-1.52.dfsg/src/java/net/sf/jftp/config/Settings.java -=================================================================== ---- jftp-1.52.dfsg.orig/src/java/net/sf/jftp/config/Settings.java 2010-04-11 19:42:59.000000000 -0400 -+++ jftp-1.52.dfsg/src/java/net/sf/jftp/config/Settings.java 2010-04-11 19:43:09.000000000 -0400 -@@ -65,7 +65,6 @@ - - public static boolean newTableGui = getUseJTableLayout(); - public static boolean useFixedTableWidths = true; -- public static boolean enableWebDav = false; - - - // 1: manual, 2: onclick, 0: off -@@ -189,7 +188,6 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 2 Apr 2016 19:21:20 +0200 +Subject: webdav disable + +Disable webdav because the dependency is not available in Debian. + +Forwarded: not-needed +--- + src/java/net/sf/jftp/config/Settings.java | 3 --- + src/java/net/sf/jftp/gui/base/AppMenuBar.java | 20 -------------------- + src/java/net/sf/jftp/gui/base/StatusPanel.java | 19 ------------------- + 3 files changed, 42 deletions(-) + +diff --git a/src/java/net/sf/jftp/config/Settings.java b/src/java/net/sf/jftp/config/Settings.java +index 74f86d2..d9eb242 100644 +--- a/src/java/net/sf/jftp/config/Settings.java ++++ b/src/java/net/sf/jftp/config/Settings.java +@@ -193,7 +193,6 @@ public class Settings public static String openImage; public static String sftpImage; public static String nfsImage; @@ -21,7 +23,7 @@ Index: jftp-1.52.dfsg/src/java/net/sf/jftp/config/Settings.java public static String linkImage; public static String typeImage; public static String deleteImage; -@@ -612,7 +610,6 @@ +@@ -625,7 +624,6 @@ public class Settings openImage = "images/org/javalobby/icons/16x16/World2.gif"; sftpImage = "images/org/javalobby/icons/16x16/NewEnvelope.gif"; nfsImage = "images/org/javalobby/icons/16x16/TrafficGreen.gif"; @@ -29,7 +31,7 @@ Index: jftp-1.52.dfsg/src/java/net/sf/jftp/config/Settings.java linkImage = "images/org/javalobby/icons/16x16/Right.gif"; typeImage = "images/org/javalobby/icons/20x20/Type.gif"; clearImage = "images/org/javalobby/icons/16x16/Undo.gif"; -@@ -658,7 +655,6 @@ +@@ -672,7 +670,6 @@ public class Settings openImage = "images/current/drive_web.png"; sftpImage = "images/current/drive_link.png"; nfsImage = "images/current/drive_network.png"; @@ -37,11 +39,11 @@ Index: jftp-1.52.dfsg/src/java/net/sf/jftp/config/Settings.java linkImage = "images/current/arrow_right.png"; typeImage = "images/current/email_go.png"; deleteImage = "images/current/control_stop.png"; -Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/AppMenuBar.java -=================================================================== ---- jftp-1.52.dfsg.orig/src/java/net/sf/jftp/gui/base/AppMenuBar.java 2010-04-11 19:42:06.000000000 -0400 -+++ jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/AppMenuBar.java 2010-04-11 19:42:29.000000000 -0400 -@@ -22,7 +22,6 @@ +diff --git a/src/java/net/sf/jftp/gui/base/AppMenuBar.java b/src/java/net/sf/jftp/gui/base/AppMenuBar.java +index aa7065a..94329a0 100644 +--- a/src/java/net/sf/jftp/gui/base/AppMenuBar.java ++++ b/src/java/net/sf/jftp/gui/base/AppMenuBar.java +@@ -22,7 +22,6 @@ import net.sf.jftp.gui.hostchooser.HostChooser; import net.sf.jftp.gui.hostchooser.NfsHostChooser; import net.sf.jftp.gui.hostchooser.SftpHostChooser; import net.sf.jftp.gui.hostchooser.SmbHostChooser; @@ -49,7 +51,7 @@ Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/AppMenuBar.java import net.sf.jftp.gui.tasks.AddBookmarks; import net.sf.jftp.gui.tasks.AdvancedOptions; import net.sf.jftp.gui.tasks.BookmarkItem; -@@ -85,13 +84,11 @@ +@@ -86,13 +85,11 @@ public class AppMenuBar extends JMenuBar implements ActionListener JMenuItem localSftpCon = new JMenuItem("Open SFTP Connection in Local Tab..."); JMenuItem localSmbCon = new JMenuItem("Open SMB/LAN Connection in Local Tab..."); JMenuItem localNfsCon = new JMenuItem("Open NFS Connection in Local Tab..."); @@ -63,15 +65,15 @@ Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/AppMenuBar.java JMenuItem close = new JMenuItem("Disconnect and Connect to Filesystem"); JMenuItem exit = new JMenuItem("Exit"); JMenuItem readme = new JMenuItem("Show Readme..."); -@@ -190,7 +187,6 @@ +@@ -187,7 +184,6 @@ public class AppMenuBar extends JMenuBar implements ActionListener proxy.addActionListener(this); stdback.addActionListener(this); opts.addActionListener(this); - webdavCon.addActionListener(this); - sshShell.addActionListener(this); shell.addActionListener(this); nl.addActionListener(this); -@@ -199,7 +195,6 @@ + +@@ -195,7 +191,6 @@ public class AppMenuBar extends JMenuBar implements ActionListener localSftpCon.addActionListener(this); localSmbCon.addActionListener(this); localNfsCon.addActionListener(this); @@ -79,7 +81,7 @@ Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/AppMenuBar.java closeLocalCon.addActionListener(this); add.addActionListener(this); storePasswords.addActionListener(this); -@@ -452,7 +447,6 @@ +@@ -446,7 +441,6 @@ public class AppMenuBar extends JMenuBar implements ActionListener file.add(sftpCon); file.add(smbCon); file.add(nfsCon); @@ -87,55 +89,47 @@ Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/AppMenuBar.java file.addSeparator(); file.add(close); file.addSeparator(); -@@ -462,7 +456,6 @@ - file.add(localSmbCon); - file.add(localNfsCon); - -- //file.add(localWebdavCon); -> not yet - file.addSeparator(); - file.add(closeLocalCon); - file.addSeparator(); -@@ -569,12 +562,6 @@ - AddBookmarks a = new AddBookmarks(JFtp.statusP.jftp); - a.update(); - } -- else if(e.getSource() == webdavCon) -- { -- WebdavHostChooser hc = new WebdavHostChooser(); -- hc.toFront(); -- hc.update(); -- } - else if((e.getSource() == localFtpCon) && (!jftp.uiBlocked)) - { - HostChooser hc = new HostChooser(null, true); -@@ -607,14 +594,6 @@ - //hc.setModal(true); - hc.update(); - } -- else if((e.getSource() == localWebdavCon) && (!jftp.uiBlocked)) -- { -- WebdavHostChooser hc = new WebdavHostChooser(null, true); -- hc.toFront(); -- -- //hc.setModal(true); -- hc.update(); -- } - else if(e.getSource() == closeLocalCon) - { - JFtp.statusP.jftp.closeCurrentLocalTab(); -Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/StatusPanel.java -=================================================================== ---- jftp-1.52.dfsg.orig/src/java/net/sf/jftp/gui/base/StatusPanel.java 2010-04-11 19:42:37.000000000 -0400 -+++ jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/StatusPanel.java 2010-04-11 19:42:51.000000000 -0400 -@@ -22,7 +22,6 @@ +@@ -564,12 +558,6 @@ public class AppMenuBar extends JMenuBar implements ActionListener + AddBookmarks a = new AddBookmarks(JFtp.statusP.jftp); + a.update(); + } +- else if(e.getSource() == webdavCon) +- { +- WebdavHostChooser hc = new WebdavHostChooser(); +- hc.toFront(); +- hc.update(); +- } + else if((e.getSource() == localFtpCon) && (!jftp.uiBlocked)) + { + HostChooser hc = new HostChooser(null, true); +@@ -602,14 +590,6 @@ public class AppMenuBar extends JMenuBar implements ActionListener + //hc.setModal(true); + hc.update(); + } +- else if((e.getSource() == localWebdavCon) && (!jftp.uiBlocked)) +- { +- WebdavHostChooser hc = new WebdavHostChooser(null, true); +- hc.toFront(); +- +- //hc.setModal(true); +- hc.update(); +- } + else if(e.getSource() == closeLocalCon) + { + JFtp.statusP.jftp.closeCurrentLocalTab(); +diff --git a/src/java/net/sf/jftp/gui/base/StatusPanel.java b/src/java/net/sf/jftp/gui/base/StatusPanel.java +index a3fab46..dd3902e 100644 +--- a/src/java/net/sf/jftp/gui/base/StatusPanel.java ++++ b/src/java/net/sf/jftp/gui/base/StatusPanel.java +@@ -22,7 +22,6 @@ import net.sf.jftp.gui.hostchooser.HostChooser; import net.sf.jftp.gui.hostchooser.NfsHostChooser; import net.sf.jftp.gui.hostchooser.SftpHostChooser; import net.sf.jftp.gui.hostchooser.SmbHostChooser; -import net.sf.jftp.gui.hostchooser.WebdavHostChooser; import net.sf.jftp.gui.tasks.HttpBrowser; + import net.sf.jftp.gui.tasks.NativeHttpBrowser; import net.sf.jftp.net.*; - import net.sf.jftp.net.wrappers.HttpTransfer; -@@ -51,10 +50,6 @@ +@@ -53,10 +52,6 @@ public class StatusPanel extends HPanel implements ActionListener this); private HImageButton nfscon = new HImageButton(Settings.nfsImage, "nfscon", "Add NFS Connection...", this); @@ -146,7 +140,7 @@ Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/StatusPanel.java public HImageButton close = new HImageButton(Settings.closeImage, "close", "Close active tab...", this); private HImageButton go = new HImageButton(Settings.refreshImage, "go", -@@ -100,11 +95,6 @@ +@@ -102,11 +97,6 @@ public class StatusPanel extends HPanel implements ActionListener nfscon.setToolTipText("New NFS Connection..."); bar.add(new JLabel(" ")); @@ -158,7 +152,7 @@ Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/StatusPanel.java bar.add(close); close.setSize(24, 24); close.setToolTipText("Close Active Remote tab..."); -@@ -184,15 +174,6 @@ +@@ -186,15 +176,6 @@ public class StatusPanel extends HPanel implements ActionListener //hc.setModal(true); hc.update(); } diff --git a/debian/rules b/debian/rules index 155b7a6..7397895 100755 --- a/debian/rules +++ b/debian/rules @@ -1,24 +1,17 @@ #!/usr/bin/make -f +export JAVA_HOME=/usr/lib/jvm/default-java +export JAVA_TOOL_OPTIONS=-Dfile.encoding=iso-8859-1 +export CLASSPATH=/usr/share/java/jcifs.jar:/usr/share/java/jl.jar:/usr/share/java/commons-logging.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/kunststoff.jar:/usr/share/java/j2ssh-ant.jar:/usr/share/java/j2ssh-core.jar:/usr/share/java/yanfs.jar:/usr/share/java/j2ssh-common.jar:/usr/share/java/j2ssh-daemon.jar:/usr/share/java/jsch.jar:/usr/share/java/miglayout.jar:/usr/share/java/swt-gtk-4.5.jar:/usr/share/java/commons-codec.jar -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk +%: + dh $@ --parallel --with javahelper -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jars -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 -VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\.dfsg//') - -install/jftp:: - chmod 644 doc/FtpUpload.java - install -m 644 -D build/jars/jftp.jar $(DEB_DESTDIR)/usr/share/java/jftp-$(DEB_UPSTREAM_VERSION).jar - install -m 755 -D debian/jftp.run $(DEB_DESTDIR)/usr/bin/jftp - dh_install debian/jftp.desktop /usr/share/applications - dh_install debian/jftp.xpm /usr/share/pixmaps - dh_link /usr/share/java/jftp-$(DEB_UPSTREAM_VERSION).jar \ - /usr/share/java/jftp.jar +override_dh_auto_build: + mkdir -p lib + dh_auto_build -- \ + -Dant.build.javac.source=1.6 \ + -Dant.build.javac.target=1.6 \ + jars get-orig-source: - uscan --download-version $(VERSION) --force-download --rename + uscan --download-current-version --force-download --compression xz --repack diff --git a/debian/watch b/debian/watch index 513a30b..7ad83b2 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts="dversionmangle=s/\+dfsg*//" \ -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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jftp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
