Author: varun Date: 2010-04-12 00:16:34 +0000 (Mon, 12 Apr 2010) New Revision: 12133
Added: trunk/jftp/debian/patches/webdav_disable.diff trunk/jftp/debian/source/ trunk/jftp/debian/source/format Modified: trunk/jftp/debian/changelog trunk/jftp/debian/control trunk/jftp/debian/jftp.run trunk/jftp/debian/orig-tar.exclude trunk/jftp/debian/patches/series trunk/jftp/debian/rules trunk/jftp/debian/watch Log: * Regenerated a cleaner orig tarball (Closes: #577396) * Remove Webdav*.java source files from tarball * Add patches/webdav_disable.diff to remove all references to webdav in upstream source files * Switch to default-jdk * Use java-wrappers to find JAVA_HOME in debian/jftp.run * debian/rules: rename ANT_OPTS to ANT_ARGS * Bump Standards-Version to 3.8.4 * Fix debian/watch file Modified: trunk/jftp/debian/changelog =================================================================== --- trunk/jftp/debian/changelog 2010-04-11 21:00:12 UTC (rev 12132) +++ trunk/jftp/debian/changelog 2010-04-12 00:16:34 UTC (rev 12133) @@ -1,11 +1,21 @@ -jftp (1.52.dfsg-1) unstable; urgency=low +jftp (1.52+dfsg-1) unstable; urgency=low - UNRELEASED + [ Torsten Werner ] * Team Upload - * Regenerated a cleaner orig tarball using the get-orig-source target. + * Regenerated a cleaner orig tarball (Closes: #577396) - -- Torsten Werner <[email protected]> Sun, 11 Apr 2010 11:19:46 +0200 + [ Varun Hiremath ] + * Remove Webdav*.java source files from tarball + * Add patches/webdav_disable.diff to remove all references to webdav in + upstream source files + * Switch to default-jdk + * Use java-wrappers to find JAVA_HOME in debian/jftp.run + * debian/rules: rename ANT_OPTS to ANT_ARGS + * Bump Standards-Version to 3.8.4 + * Fix debian/watch file + -- Varun Hiremath <[email protected]> Sun, 11 Apr 2010 19:35:13 -0400 + jftp (1.52-2) unstable; urgency=low * Removed Depends on jakarta-slide-webdavlib, which was supposed to @@ -52,7 +62,7 @@ * Fix watch file * Bump Standards-Version to 3.8.0 * debian/jftp.run: use openjdk - + -- Varun Hiremath <[email protected]> Sat, 01 Nov 2008 14:23:51 -0400 jftp (1.51~pre4-1) unstable; urgency=low Modified: trunk/jftp/debian/control =================================================================== --- trunk/jftp/debian/control 2010-04-11 21:00:12 UTC (rev 12132) +++ trunk/jftp/debian/control 2010-04-12 00:16:34 UTC (rev 12133) @@ -4,12 +4,12 @@ Maintainer: Debian Java maintainers <[email protected]> Uploaders: Varun Hiremath <[email protected]>, Kumar Appaiah <[email protected]>, Niels Thykier <[email protected]> -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.3 +Build-Depends: cdbs, debhelper (>= 7) +Build-Depends-Indep: default-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.4 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 @@ -19,7 +19,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre, libjcifs-java, libcommons-logging-java, libcommons-httpclient-java, liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java, - libjsch-java, libjlayer-java + libjsch-java, libjlayer-java, java-wrappers 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 Modified: trunk/jftp/debian/jftp.run =================================================================== --- trunk/jftp/debian/jftp.run 2010-04-11 21:00:12 UTC (rev 12132) +++ trunk/jftp/debian/jftp.run 2010-04-12 00:16:34 UTC (rev 12133) @@ -1,2 +1,7 @@ #!/bin/sh -/usr/lib/jvm/java-6-openjdk/jre/bin/java -jar /usr/share/java/jftp.jar "$@" +# find JAVA_HOME +. /usr/lib/java-wrappers/java-wrappers.sh +find_java_runtime java6 + +# run jftp +exec $JAVA_HOME/bin/java -jar /usr/share/java/jftp.jar "$@" Modified: trunk/jftp/debian/orig-tar.exclude =================================================================== --- trunk/jftp/debian/orig-tar.exclude 2010-04-11 21:00:12 UTC (rev 12132) +++ trunk/jftp/debian/orig-tar.exclude 2010-04-12 00:16:34 UTC (rev 12133) @@ -6,3 +6,4 @@ src/images/org src/images/silk src/images/gnome +Webdav*.java Modified: trunk/jftp/debian/patches/series =================================================================== --- trunk/jftp/debian/patches/series 2010-04-11 21:00:12 UTC (rev 12132) +++ trunk/jftp/debian/patches/series 2010-04-12 00:16:34 UTC (rev 12133) @@ -1 +1,2 @@ +webdav_disable.diff manifest_fix.diff Added: trunk/jftp/debian/patches/webdav_disable.diff =================================================================== --- trunk/jftp/debian/patches/webdav_disable.diff (rev 0) +++ trunk/jftp/debian/patches/webdav_disable.diff 2010-04-12 00:16:34 UTC (rev 12133) @@ -0,0 +1,176 @@ +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 @@ + public static String openImage; + public static String sftpImage; + public static String nfsImage; +- public static String webdavImage; + public static String linkImage; + public static String typeImage; + public static String deleteImage; +@@ -612,7 +610,6 @@ + openImage = "images/org/javalobby/icons/16x16/World2.gif"; + sftpImage = "images/org/javalobby/icons/16x16/NewEnvelope.gif"; + nfsImage = "images/org/javalobby/icons/16x16/TrafficGreen.gif"; +- webdavImage = "images/org/javalobby/icons/16x16/DataStore.gif"; + 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 @@ + openImage = "images/current/drive_web.png"; + sftpImage = "images/current/drive_link.png"; + nfsImage = "images/current/drive_network.png"; +- webdavImage = "images/current/house_go.png"; + 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 @@ + 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.AddBookmarks; + import net.sf.jftp.gui.tasks.AdvancedOptions; + import net.sf.jftp.gui.tasks.BookmarkItem; +@@ -85,13 +84,11 @@ + 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..."); +- JMenuItem localWebdavCon = new JMenuItem("Open WebDAV Connection in Local Tab... (ALPHA)"); + JMenuItem closeLocalCon = new JMenuItem("Close Active Connection in Local Tab"); + JMenuItem ftpCon = new JMenuItem("Connect to FTP Server..."); + JMenuItem sftpCon = new JMenuItem("Connect to SFTP Server..."); + JMenuItem smbCon = new JMenuItem("Connect to SMB Server / Browse LAN..."); + JMenuItem nfsCon = new JMenuItem("Connect to NFS Server..."); +- JMenuItem webdavCon = new JMenuItem("Connect to WebDAV Server... (ALPHA)"); + JMenuItem close = new JMenuItem("Disconnect and Connect to Filesystem"); + JMenuItem exit = new JMenuItem("Exit"); + JMenuItem readme = new JMenuItem("Show Readme..."); +@@ -190,7 +187,6 @@ + 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 @@ + localSftpCon.addActionListener(this); + localSmbCon.addActionListener(this); + localNfsCon.addActionListener(this); +- localWebdavCon.addActionListener(this); + closeLocalCon.addActionListener(this); + add.addActionListener(this); + storePasswords.addActionListener(this); +@@ -452,7 +447,6 @@ + file.add(sftpCon); + file.add(smbCon); + file.add(nfsCon); +- file.add(webdavCon); + 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 @@ + 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.net.*; + import net.sf.jftp.net.wrappers.HttpTransfer; +@@ -51,10 +50,6 @@ + this); + private HImageButton nfscon = new HImageButton(Settings.nfsImage, "nfscon", + "Add NFS Connection...", this); +- private HImageButton webdavcon = new HImageButton(Settings.webdavImage, +- "webdavcon", +- "Add WebDAV Connection...", +- this); + public HImageButton close = new HImageButton(Settings.closeImage, "close", + "Close active tab...", this); + private HImageButton go = new HImageButton(Settings.refreshImage, "go", +@@ -100,11 +95,6 @@ + nfscon.setToolTipText("New NFS Connection..."); + bar.add(new JLabel(" ")); + +- if(Settings.enableWebDav) bar.add(webdavcon); +- webdavcon.setSize(24, 24); +- webdavcon.setToolTipText("New WebDAV Connection..."); +- bar.add(new JLabel(" ")); +- + bar.add(close); + close.setSize(24, 24); + close.setToolTipText("Close Active Remote tab..."); +@@ -184,15 +174,6 @@ + //hc.setModal(true); + hc.update(); + } +- else if(e.getActionCommand().equals("webdavcon")) +- { +- //jftp.safeDisconnect(); +- WebdavHostChooser hc = new WebdavHostChooser(); +- hc.toFront(); +- +- //hc.setModal(true); +- hc.update(); +- } + else if(e.getActionCommand().equals("close")) + { + jftp.closeCurrentTab(); Modified: trunk/jftp/debian/rules =================================================================== --- trunk/jftp/debian/rules 2010-04-11 21:00:12 UTC (rev 12132) +++ trunk/jftp/debian/rules 2010-04-12 00:16:34 UTC (rev 12133) @@ -2,14 +2,14 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -JAVA_HOME := /usr/lib/jvm/java-6-openjdk +JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILD_TARGET := jars 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 +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 @@ -21,4 +21,4 @@ /usr/share/java/jftp.jar get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + uscan --download-version $(VERSION) --force-download --rename Added: trunk/jftp/debian/source/format =================================================================== --- trunk/jftp/debian/source/format (rev 0) +++ trunk/jftp/debian/source/format 2010-04-12 00:16:34 UTC (rev 12133) @@ -0,0 +1 @@ +3.0 (quilt) Modified: trunk/jftp/debian/watch =================================================================== --- trunk/jftp/debian/watch 2010-04-11 21:00:12 UTC (rev 12132) +++ trunk/jftp/debian/watch 2010-04-12 00:16:34 UTC (rev 12133) @@ -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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
