[SCM] QCA2 library packaging branch, kubuntu_unstable, updated. debian/2.0.3-6-36-gf46f2bf

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=f46f2bf

The following commit has been merged in the kubuntu_unstable branch:
commit f46f2bf1f98e05d6ee7e78ce4d7bc4531bb9d39c
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 5 12:59:43 2015 +0100

    remove temporary qdebugs
    
    the underlying bug was fixed upstream
---
 debian/patches/kubuntu_temporary_qdebug_watch.diff | 56 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 57 deletions(-)

diff --git a/debian/patches/kubuntu_temporary_qdebug_watch.diff b/debian/patches/kubuntu_temporary_qdebug_watch.diff
deleted file mode 100644
index 9f6c45f..0000000
--- a/debian/patches/kubuntu_temporary_qdebug_watch.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: qca/src/support/dirwatch.cpp
-===================================================================
---- qca.orig/src/support/dirwatch.cpp
-+++ qca/src/support/dirwatch.cpp
-@@ -20,6 +20,7 @@
- 
- #include "qca_support.h"
- 
-+#include <QDebug>
- #include <QFileSystemWatcher>
- #include <QFileInfo>
- #include <QDir>
-@@ -193,25 +194,42 @@ public:
- private slots:
- 	void dir_changed(const QString &path)
- 	{
-+            qDebug() << Q_FUNC_INFO << path;
- 		Q_UNUSED(path);
- 		QFileInfo fi(filePath);
- 		bool exists = fi.exists();
-+                qDebug() << Q_FUNC_INFO << "exists" << exists << "existed" << fileExisted;
- 		if(exists && !fileExisted)
- 		{
- 			// this means the file was created.  put a
- 			//   watch on it.
- 			fileExisted = true;
- 			watcher->addPath(filePath);
-+                        qDebug() << Q_FUNC_INFO << "emitting signal";
- 			emit q->changed();
- 		}
- 	}
- 
- 	void file_changed(const QString &path)
- 	{
-+            qDebug() << Q_FUNC_INFO << path;
- 		Q_UNUSED(path);
- 		QFileInfo fi(filePath);
--		if(!fi.exists())
-+                qDebug() << Q_FUNC_INFO << "exists" << fi.exists();
-+		if(!fi.exists() && !fileExisted) {
-+                    // Got a file changed signal on a file that does not exist
-+                    // and is not actively watched. This happens when we
-+                    // previously watched a file but it was deleted and after
-+                    // the original deletion changed-signal we get another one
-+                    // (for example because of bad signal timing). In this scenario
-+                    // we must ignore the change as the change, whatever it may
-+                    // have been, is of no interest to us because we don't watch
-+                    // the file and furthermore the file does not even exist.
-+                    return;
-+                } else if(!fi.exists()) {
- 			fileExisted = false;
-+                }
-+                qDebug() << Q_FUNC_INFO << "emitting signal";
- 		emit q->changed();
- 	}
- };
diff --git a/debian/patches/series b/debian/patches/series
index a50cfcf..1078b9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-kubuntu_temporary_qdebug_watch.diff
 define_qca_export.diff
 pipeunittest_more_wait.diff
 hurd_msync.diff

-- 
QCA2 library packaging