[SCM] ktp-send-file packaging branch, master, updated. debian/0.7.0-1-16-gab8bde6

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-send-file.git;a=commitdiff;h=8215c41

The following commit has been merged in the master branch:
commit 8215c41b3e771dd08e0c1d681bdaa938428680f5
Author: Diane Trout <diane at ghic.org>
Date:   Thu Feb 20 09:07:02 2014 -0800

    Remove fix-send-file.patch merged upstream
---
 debian/changelog                          |  1 +
 debian/patches/fix-send-file-signal.patch | 44 -------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a821a97..c27c994 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ktp-send-file (0.7.80-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update Standards-Version to 3.9.5. No changes needed.
   * Update ktp-common-interals and kde-telepathy-data dependencies to 0.7.80
+  * Remove fix-send-file.patch merged upstream
 
  -- Diane Trout <diane at ghic.org>  Thu, 20 Feb 2014 08:47:33 -0800
 
diff --git a/debian/patches/fix-send-file-signal.patch b/debian/patches/fix-send-file-signal.patch
deleted file mode 100644
index a3a3737..0000000
--- a/debian/patches/fix-send-file-signal.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Diane Trout <diane at ghic.org>
-Description: There was a change in the signature of a signal that meant
- the send-file ui never received notice that a contact was selected.
---- a/mainwindow.cpp
-+++ b/mainwindow.cpp
-@@ -130,8 +130,8 @@
-     ui->recipientVLayout->addWidget(m_contactGridWidget);
- 
-     connect(m_contactGridWidget,
--            SIGNAL(selectionChanged(Tp::AccountPtr,Tp::ContactPtr)),
--            SLOT(onContactSelectionChanged(Tp::AccountPtr,Tp::ContactPtr)));
-+            SIGNAL(selectionChanged(Tp::AccountPtr,KTp::ContactPtr)),
-+            SLOT(onContactSelectionChanged(Tp::AccountPtr,KTp::ContactPtr)));
- 
-     ui->buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
-     connect(ui->buttonBox, SIGNAL(accepted()), SLOT(onDialogAccepted()));
-@@ -171,7 +171,7 @@
-     }
- }
- 
--void MainWindow::onContactSelectionChanged(Tp::AccountPtr account, Tp::ContactPtr contact)
-+void MainWindow::onContactSelectionChanged(Tp::AccountPtr account, KTp::ContactPtr contact)
- {
-     Q_UNUSED(account)
-     Q_UNUSED(contact)
---- a/mainwindow.h
-+++ b/mainwindow.h
-@@ -26,6 +26,7 @@
- #include <KUrl>
- 
- #include <TelepathyQt/AccountManager>
-+#include <KTp/contact.h>
- 
- 
- namespace Ui {
-@@ -53,7 +54,7 @@
-     void onDialogAccepted();
-     void onPreviewLoaded(const KFileItem &item, const QPixmap &preview);
-     void onPreviewFailed(const KFileItem &item);
--    void onContactSelectionChanged(Tp::AccountPtr account, Tp::ContactPtr contact);
-+    void onContactSelectionChanged(Tp::AccountPtr account, KTp::ContactPtr contact);
-     void slotFileTransferFinished(Tp::PendingOperation *op);
- 
- private:
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6b91cf5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-send-file-signal.patch

-- 
ktp-send-file packaging