diff -Nru kget-4.12.3/debian/changelog kget-4.12.90/debian/changelog --- kget-4.12.3/debian/changelog 2014-03-04 19:48:23.000000000 +0000 +++ kget-4.12.90/debian/changelog 2014-03-20 13:41:37.000000000 +0000 @@ -1,3 +1,16 @@ +kget (4:4.12.90-0ubuntu2) trusty; urgency=medium + + * Drop libnepomukwidgets-dev from build-depends, obsolete + * Remove obsolete nepomuk ontologies from kget.install + + -- Philip Muškovac Thu, 20 Mar 2014 14:13:47 +0100 + +kget (4:4.12.90-0ubuntu1) trusty; urgency=medium + + * New upstream beta release + + -- Jonathan Riddell Wed, 19 Mar 2014 10:57:17 +0000 + kget (4:4.12.3-0ubuntu1) trusty; urgency=medium * New upstream bugfix release diff -Nru kget-4.12.3/debian/control kget-4.12.90/debian/control --- kget-4.12.3/debian/control 2014-03-04 19:48:23.000000000 +0000 +++ kget-4.12.90/debian/control 2014-03-20 13:41:37.000000000 +0000 @@ -4,10 +4,10 @@ Maintainer: Kubuntu Developers Build-Depends: kde-sc-dev-latest (>= 4:4.10.2), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), - kdelibs5-dev (>= 4:4.12.3), libkonq5-dev (>= 4:4.12.3), - libsqlite3-dev, libqca2-dev (>= 2.0.0), kdepimlibs5-dev (>= 4:4.12.3), + kdelibs5-dev (>= 4:4.12.90), libkonq5-dev (>= 4:4.12.90), + libsqlite3-dev, libqca2-dev (>= 2.0.0), kdepimlibs5-dev (>= 4:4.12.90), libktorrent-dev (>= 1.1), libmms-dev, libboost-dev, - kde-workspace-dev (>= 4:4.11.2), libnepomukwidgets-dev (>= 4:4.12.3), + kde-workspace-dev (>= 4:4.11.2) Standards-Version: 3.9.4 Homepage: http://www.kde.org/ Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kget diff -Nru kget-4.12.3/debian/kget.install kget-4.12.90/debian/kget.install --- kget-4.12.3/debian/kget.install 2014-03-04 19:48:23.000000000 +0000 +++ kget-4.12.90/debian/kget.install 2014-03-20 13:41:37.000000000 +0000 @@ -97,5 +97,3 @@ usr/share/kde4/services/plasma-engine-kget.desktop usr/share/kde4/services/plasma-runner-kget.desktop usr/share/kde4/servicetypes/kget_plugin.desktop -usr/share/ontology/kde/kget_history.ontology -usr/share/ontology/kde/kget_history.trig diff -Nru kget-4.12.3/transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp kget-4.12.90/transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp --- kget-4.12.3/transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp 2014-01-27 18:50:28.000000000 +0000 +++ kget-4.12.90/transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp 2014-02-23 19:20:51.000000000 +0000 @@ -330,7 +330,7 @@ case 1: return i18n("Which client the peer is using"); case 2: return i18n("Download speed"); case 3: return i18n("Upload speed"); - case 4: return i18n("Whether or not the peer has choked us. If we are choked, the peer will not send us any data."); + case 4: return i18n("Whether or not the peer has choked us. If we are choked, the peer will not send us any data."); case 5: return i18n("Snubbed means the peer has not sent us any data in the last 2 minutes"); case 6: return i18n("How much of the torrent's data the peer has"); case 7: return i18n("Whether or not the peer has DHT enabled"); diff -Nru kget-4.12.3/transfer-plugins/bittorrent/btsettingswidget.ui kget-4.12.90/transfer-plugins/bittorrent/btsettingswidget.ui --- kget-4.12.3/transfer-plugins/bittorrent/btsettingswidget.ui 2014-01-27 18:50:28.000000000 +0000 +++ kget-4.12.90/transfer-plugins/bittorrent/btsettingswidget.ui 2014-02-23 19:20:51.000000000 +0000 @@ -134,7 +134,7 @@ - Default temporary folder + Default temporary folder: diff -Nru kget-4.12.3/transfer-plugins/kio/transferKio.cpp kget-4.12.90/transfer-plugins/kio/transferKio.cpp --- kget-4.12.3/transfer-plugins/kio/transferKio.cpp 2014-01-27 18:50:28.000000000 +0000 +++ kget-4.12.90/transfer-plugins/kio/transferKio.cpp 2014-02-23 19:20:51.000000000 +0000 @@ -14,6 +14,8 @@ #include "core/signature.h" #include "settings.h" +#include + #include #include #include @@ -172,7 +174,8 @@ // when slotResult gets called, the m_copyjob has already been deleted! m_copyjob=0; - Transfer::ChangesFlags flags = Tc_Status; + // If it is an ftp file, there's still work to do + Transfer::ChangesFlags flags = (m_source.protocol() != "ftp") ? Tc_Status : Tc_None; if (status() == Job::Finished) { if (!m_totalSize) { //downloaded elsewhere already, e.g. Konqueror @@ -195,6 +198,12 @@ } } + if (m_source.protocol() == "ftp") { + KIO::StatJob * statJob = KIO::stat(m_source); + connect(statJob, SIGNAL(result(KJob*)), this, SLOT(slotStatResult(KJob*))); + statJob->start(); + } + setTransferChange(flags, true); } @@ -275,6 +284,24 @@ } } +void TransferKio::slotStatResult(KJob* kioJob) +{ + KIO::StatJob * statJob = qobject_cast(kioJob); + + if (!statJob->error()) { + const KIO::UDSEntry entryResult = statJob->statResult(); + struct utimbuf time; + + time.modtime = entryResult.numberValue(KIO::UDSEntry::UDS_MODIFICATION_TIME); + time.actime = QDateTime::currentDateTime().toTime_t(); + utime(m_dest.toLocalFile().toUtf8().constData(), &time); + } + + setStatus(Job::Finished); + setTransferChange(Tc_Status, true); +} + + bool TransferKio::repair(const KUrl &file) { Q_UNUSED(file) diff -Nru kget-4.12.3/transfer-plugins/kio/transferKio.h kget-4.12.90/transfer-plugins/kio/transferKio.h --- kget-4.12.3/transfer-plugins/kio/transferKio.h 2014-01-27 18:50:28.000000000 +0000 +++ kget-4.12.90/transfer-plugins/kio/transferKio.h 2014-02-23 19:20:51.000000000 +0000 @@ -70,6 +70,7 @@ void slotSpeed( KJob * kioJob, unsigned long bytes_per_second ); void newDestResult(KJob *result); void slotVerified(bool isVerified); + void slotStatResult(KJob * kioJob); private: Verifier *m_verifier; diff -Nru kget-4.12.3/transfer-plugins/multisegmentkio/transfermultisegkio.cpp kget-4.12.90/transfer-plugins/multisegmentkio/transfermultisegkio.cpp --- kget-4.12.3/transfer-plugins/multisegmentkio/transfermultisegkio.cpp 2014-01-27 18:50:28.000000000 +0000 +++ kget-4.12.90/transfer-plugins/multisegmentkio/transfermultisegkio.cpp 2014-02-23 19:20:51.000000000 +0000 @@ -19,6 +19,8 @@ #include "core/verifier.h" #include "core/signature.h" +#include + #include #include #include @@ -189,7 +191,13 @@ } } if (change & Tc_Status) { - setStatus(m_dataSourceFactory->status()); + if ((m_dataSourceFactory->status() == Job::Finished) && m_source.protocol() == "ftp") { + KIO::StatJob * statJob = KIO::stat(m_source); + connect(statJob, SIGNAL(result(KJob*)), this, SLOT(slotStatResult(KJob*))); + statJob->start(); + } else { + setStatus(m_dataSourceFactory->status()); + } if (m_fileModel) { QModelIndex statusIndex = m_fileModel->index(m_dest, FileItem::Status); @@ -254,6 +262,23 @@ } } +void TransferMultiSegKio::slotStatResult(KJob* kioJob) +{ + KIO::StatJob * statJob = qobject_cast(kioJob); + + if (!statJob->error()) { + const KIO::UDSEntry entryResult = statJob->statResult(); + struct utimbuf time; + + time.modtime = entryResult.numberValue(KIO::UDSEntry::UDS_MODIFICATION_TIME); + time.actime = QDateTime::currentDateTime().toTime_t(); + utime(m_dest.toLocalFile().toUtf8().constData(), &time); + } + + setStatus(Job::Finished); + setTransferChange(Tc_Status, true); +} + void TransferMultiSegKio::slotSearchUrls(const QList &urls) { kDebug(5001) << "Found " << urls.size() << " urls."; diff -Nru kget-4.12.3/transfer-plugins/multisegmentkio/transfermultisegkio.h kget-4.12.90/transfer-plugins/multisegmentkio/transfermultisegkio.h --- kget-4.12.3/transfer-plugins/multisegmentkio/transfermultisegkio.h 2014-01-27 18:50:28.000000000 +0000 +++ kget-4.12.90/transfer-plugins/multisegmentkio/transfermultisegkio.h 2014-02-23 19:20:51.000000000 +0000 @@ -82,6 +82,7 @@ void slotSearchUrls(const QList &urls); void slotRename(const KUrl &oldUrl, const KUrl &newUrl); void slotVerified(bool isVerified); + void slotStatResult(KJob * kioJob); private: bool m_movingFile;