rev 4716 - in kde-extras/kftpgrabber: tags tags/0.8.0~beta1-1
tags/0.8.0~beta1-1/debian tags/0.8.0~beta1-1/trunk/debian
tags/0.8.0~beta1-1/trunk/debian/patches trunk/debian
trunk/debian/patches
Fathi Boudra
fboudra-guest at costa.debian.org
Wed Oct 18 14:16:44 UTC 2006
Author: fboudra-guest
Date: 2006-10-18 14:16:44 +0000 (Wed, 18 Oct 2006)
New Revision: 4716
Added:
kde-extras/kftpgrabber/tags/0.8.0~beta1-1/
kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/
kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/patches/01_kftpgrabber_branch_r596782.diff
kde-extras/kftpgrabber/trunk/debian/patches/01_kftpgrabber_branch_r596782.diff
Modified:
kde-extras/kftpgrabber/tags/0.8.0~beta1-1/debian/changelog
kde-extras/kftpgrabber/tags/0.8.0~beta1-1/debian/rules
kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/changelog
kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/rules
kde-extras/kftpgrabber/trunk/debian/changelog
kde-extras/kftpgrabber/trunk/debian/rules
Log:
tags kftpgrabber 0.8.0~beta1-1
Copied: kde-extras/kftpgrabber/tags/0.8.0~beta1-1 (from rev 4714, kde-extras/kftpgrabber/trunk)
Modified: kde-extras/kftpgrabber/tags/0.8.0~beta1-1/debian/changelog
===================================================================
--- kde-extras/kftpgrabber/trunk/debian/changelog 2006-10-18 12:34:37 UTC (rev 4714)
+++ kde-extras/kftpgrabber/tags/0.8.0~beta1-1/debian/changelog 2006-10-18 14:16:44 UTC (rev 4716)
@@ -1,8 +1,10 @@
-kftpgrabber (0.8.0~alpha2-2) UNRELEASED; urgency=low
+kftpgrabber (0.8.0~beta1-1) unstable; urgency=low
+ * New upstream release
* Add menu file (Closes: #390212)
+ * Branch pull up to r596782
- -- Fathi Boudra <fboudra at free.fr> Mon, 16 Oct 2006 13:55:51 +0200
+ -- Fathi Boudra <fboudra at free.fr> Wed, 18 Oct 2006 15:27:49 +0200
kftpgrabber (0.8.0~alpha2-1) unstable; urgency=low
Modified: kde-extras/kftpgrabber/tags/0.8.0~beta1-1/debian/rules
===================================================================
--- kde-extras/kftpgrabber/trunk/debian/rules 2006-10-18 12:34:37 UTC (rev 4714)
+++ kde-extras/kftpgrabber/tags/0.8.0~beta1-1/debian/rules 2006-10-18 14:16:44 UTC (rev 4716)
@@ -16,9 +16,3 @@
clean::
rm -f kftpgrabber.1
-
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]
- @@dpatch-get-origtargz ../tarballs
-
Copied: kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk (from rev 4714, kde-extras/kftpgrabber/trunk)
Modified: kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/changelog
===================================================================
--- kde-extras/kftpgrabber/trunk/debian/changelog 2006-10-18 12:34:37 UTC (rev 4714)
+++ kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/changelog 2006-10-18 14:16:44 UTC (rev 4716)
@@ -1,8 +1,10 @@
-kftpgrabber (0.8.0~alpha2-2) UNRELEASED; urgency=low
+kftpgrabber (0.8.0~beta1-1) unstable; urgency=low
+ * New upstream release
* Add menu file (Closes: #390212)
+ * Branch pull up to r596782
- -- Fathi Boudra <fboudra at free.fr> Mon, 16 Oct 2006 13:55:51 +0200
+ -- Fathi Boudra <fboudra at free.fr> Wed, 18 Oct 2006 15:27:49 +0200
kftpgrabber (0.8.0~alpha2-1) unstable; urgency=low
Added: kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/patches/01_kftpgrabber_branch_r596782.diff
===================================================================
--- kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/patches/01_kftpgrabber_branch_r596782.diff (rev 0)
+++ kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/patches/01_kftpgrabber_branch_r596782.diff 2006-10-18 14:16:44 UTC (rev 4716)
@@ -0,0 +1,66 @@
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/kftpsession.cpp kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/kftpsession.cpp
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/kftpsession.cpp 2006-10-17 17:51:04.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/kftpsession.cpp 2006-10-18 15:53:26.000000000 +0200
+@@ -299,10 +299,11 @@
+
+ bool Session::isConnected()
+ {
+- if (!m_remote)
+- return true;
++ // If there are no connections, just check if the session is remote
++ if (m_connections.count() == 0)
++ return !m_remote;
+
+- return getClient()->socket()->isConnected();
++ return m_connections.at(0)->isConnected();
+ }
+
+ void Session::slotClientEngineEvent(KFTPEngine::Event *event)
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/actions.cpp kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/actions.cpp
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/actions.cpp 2006-10-17 17:50:58.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/actions.cpp 2006-10-18 15:49:17.000000000 +0200
+@@ -112,7 +112,9 @@
+ m_exportListingAction = new KAction(i18n("&Export Directory Listing..."), "", KShortcut(), this, SLOT(slotExportListing()), actionCollection());
+ m_showHiddenFilesAction = new KToggleAction(i18n("Show &Hidden Files && Directories"), KShortcut(), this, SLOT(slotShowHiddenFiles()), actionCollection());
+ m_openExternalAction = new KAction(i18n("Open current directory in &Konqueror..."), "konqueror", KShortcut(), this, SLOT(slotOpenExternal()), actionCollection());
+-
++
++ m_showHiddenFilesAction->setChecked(KFTPCore::Config::showHiddenFiles());
++
+ m_moreActions->insert(m_rawCmdAction);
+ m_moreActions->insert(m_changeEncodingAction);
+ m_moreActions->insert(m_exportListingAction);
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/actions.h kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/actions.h
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/actions.h 2006-10-17 17:50:58.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/actions.h 2006-10-18 15:49:51.000000000 +0200
+@@ -55,7 +55,6 @@
+ {
+ Q_OBJECT
+ friend class View;
+-friend class ListView;
+ friend class DetailsView;
+ public:
+ Actions(QObject *parent = 0, const char *name = 0);
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/detailsview.cpp kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/detailsview.cpp
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/detailsview.cpp 2006-10-17 17:50:58.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/detailsview.cpp 2006-10-18 15:55:40.000000000 +0200
+@@ -370,7 +370,7 @@
+
+ QDir::SortSpec spec = KFileView::sorting();
+ if (spec & QDir::Time) {
+- item->setKey(sortingKey(fileItem->size(), fileItem->isDir(), spec));
++ item->setKey(sortingKey(fileItem->time(KIO::UDS_MODIFICATION_TIME), fileItem->isDir(), spec));
+ } else if (spec & QDir::Size) {
+ item->setKey(sortingKey(fileItem->size(), fileItem->isDir(), spec));
+ } else {
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/engine/ftpsocket.cpp kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/engine/ftpsocket.cpp
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/engine/ftpsocket.cpp 2006-10-17 17:50:56.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/engine/ftpsocket.cpp 2006-10-18 16:06:27.000000000 +0200
+@@ -69,6 +69,7 @@
+ m_dataSsl(0),
+ m_clientCert(0)
+ {
++ enableRead(false);
+ setBlocking(false);
+ }
+
Modified: kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/rules
===================================================================
--- kde-extras/kftpgrabber/trunk/debian/rules 2006-10-18 12:34:37 UTC (rev 4714)
+++ kde-extras/kftpgrabber/tags/0.8.0~beta1-1/trunk/debian/rules 2006-10-18 14:16:44 UTC (rev 4716)
@@ -16,9 +16,3 @@
clean::
rm -f kftpgrabber.1
-
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]
- @@dpatch-get-origtargz ../tarballs
-
Modified: kde-extras/kftpgrabber/trunk/debian/changelog
===================================================================
--- kde-extras/kftpgrabber/trunk/debian/changelog 2006-10-18 13:23:03 UTC (rev 4715)
+++ kde-extras/kftpgrabber/trunk/debian/changelog 2006-10-18 14:16:44 UTC (rev 4716)
@@ -1,8 +1,10 @@
-kftpgrabber (0.8.0~alpha2-2) UNRELEASED; urgency=low
+kftpgrabber (0.8.0~beta1-1) unstable; urgency=low
+ * New upstream release
* Add menu file (Closes: #390212)
+ * Branch pull up to r596782
- -- Fathi Boudra <fboudra at free.fr> Mon, 16 Oct 2006 13:55:51 +0200
+ -- Fathi Boudra <fboudra at free.fr> Wed, 18 Oct 2006 15:27:49 +0200
kftpgrabber (0.8.0~alpha2-1) unstable; urgency=low
Added: kde-extras/kftpgrabber/trunk/debian/patches/01_kftpgrabber_branch_r596782.diff
===================================================================
--- kde-extras/kftpgrabber/trunk/debian/patches/01_kftpgrabber_branch_r596782.diff (rev 0)
+++ kde-extras/kftpgrabber/trunk/debian/patches/01_kftpgrabber_branch_r596782.diff 2006-10-18 14:16:44 UTC (rev 4716)
@@ -0,0 +1,66 @@
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/kftpsession.cpp kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/kftpsession.cpp
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/kftpsession.cpp 2006-10-17 17:51:04.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/kftpsession.cpp 2006-10-18 15:53:26.000000000 +0200
+@@ -299,10 +299,11 @@
+
+ bool Session::isConnected()
+ {
+- if (!m_remote)
+- return true;
++ // If there are no connections, just check if the session is remote
++ if (m_connections.count() == 0)
++ return !m_remote;
+
+- return getClient()->socket()->isConnected();
++ return m_connections.at(0)->isConnected();
+ }
+
+ void Session::slotClientEngineEvent(KFTPEngine::Event *event)
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/actions.cpp kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/actions.cpp
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/actions.cpp 2006-10-17 17:50:58.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/actions.cpp 2006-10-18 15:49:17.000000000 +0200
+@@ -112,7 +112,9 @@
+ m_exportListingAction = new KAction(i18n("&Export Directory Listing..."), "", KShortcut(), this, SLOT(slotExportListing()), actionCollection());
+ m_showHiddenFilesAction = new KToggleAction(i18n("Show &Hidden Files && Directories"), KShortcut(), this, SLOT(slotShowHiddenFiles()), actionCollection());
+ m_openExternalAction = new KAction(i18n("Open current directory in &Konqueror..."), "konqueror", KShortcut(), this, SLOT(slotOpenExternal()), actionCollection());
+-
++
++ m_showHiddenFilesAction->setChecked(KFTPCore::Config::showHiddenFiles());
++
+ m_moreActions->insert(m_rawCmdAction);
+ m_moreActions->insert(m_changeEncodingAction);
+ m_moreActions->insert(m_exportListingAction);
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/actions.h kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/actions.h
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/actions.h 2006-10-17 17:50:58.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/actions.h 2006-10-18 15:49:51.000000000 +0200
+@@ -55,7 +55,6 @@
+ {
+ Q_OBJECT
+ friend class View;
+-friend class ListView;
+ friend class DetailsView;
+ public:
+ Actions(QObject *parent = 0, const char *name = 0);
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/detailsview.cpp kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/detailsview.cpp
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/widgets/browser/detailsview.cpp 2006-10-17 17:50:58.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/widgets/browser/detailsview.cpp 2006-10-18 15:55:40.000000000 +0200
+@@ -370,7 +370,7 @@
+
+ QDir::SortSpec spec = KFileView::sorting();
+ if (spec & QDir::Time) {
+- item->setKey(sortingKey(fileItem->size(), fileItem->isDir(), spec));
++ item->setKey(sortingKey(fileItem->time(KIO::UDS_MODIFICATION_TIME), fileItem->isDir(), spec));
+ } else if (spec & QDir::Size) {
+ item->setKey(sortingKey(fileItem->size(), fileItem->isDir(), spec));
+ } else {
+diff -Nur kftpgrabber-0.8.0~beta1/kftpgrabber/src/engine/ftpsocket.cpp kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/engine/ftpsocket.cpp
+--- kftpgrabber-0.8.0~beta1/kftpgrabber/src/engine/ftpsocket.cpp 2006-10-17 17:50:56.000000000 +0200
++++ kftpgrabber-0.8.0~beta1.new/kftpgrabber/src/engine/ftpsocket.cpp 2006-10-18 16:06:27.000000000 +0200
+@@ -69,6 +69,7 @@
+ m_dataSsl(0),
+ m_clientCert(0)
+ {
++ enableRead(false);
+ setBlocking(false);
+ }
+
Modified: kde-extras/kftpgrabber/trunk/debian/rules
===================================================================
--- kde-extras/kftpgrabber/trunk/debian/rules 2006-10-18 13:23:03 UTC (rev 4715)
+++ kde-extras/kftpgrabber/trunk/debian/rules 2006-10-18 14:16:44 UTC (rev 4716)
@@ -16,9 +16,3 @@
clean::
rm -f kftpgrabber.1
-
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]
- @@dpatch-get-origtargz ../tarballs
-
More information about the pkg-kde-commits
mailing list