[SCM] rocs packaging branch, kubuntu_wily_archive, updated. ubuntu/4%15.08.0-0ubuntu1-1-g15f834a

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/rocs.git;a=commitdiff;h=15f834a

The following commit has been merged in the kubuntu_wily_archive branch:
commit 15f834a4bb64616acd132ad3c53639dca88244e8
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Sep 1 13:52:18 2015 +0100

    releasing package rocs version 4:15.08.0-0ubuntu2
---
 debian/.gitattributes                                  |  1 -
 debian/changelog                                       |  6 ++++++
 debian/patches/kubuntu_test-user-new-graph-format.diff | 15 +++++++++++++++
 debian/patches/series                                  |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 0bdb941..b567a67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rocs (4:15.08.0-0ubuntu2) wily; urgency=medium
+
+  * Add back kubuntu_test-user-new-graph-format.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 01 Sep 2015 13:51:38 +0100
+
 rocs (4:15.08.0-0ubuntu1) wily; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_test-user-new-graph-format.diff b/debian/patches/kubuntu_test-user-new-graph-format.diff
new file mode 100644
index 0000000..55e30ea
--- /dev/null
+++ b/debian/patches/kubuntu_test-user-new-graph-format.diff
@@ -0,0 +1,15 @@
+Description: Use new graph file format in unit test.
+Author: Andreas Cord-Landwehr
+Origin: http://quickgit.kde.org/?p=rocs.git&a=commitdiff&h=7e1846828e91d604e483bd621696e247df902afb&hp=4d7564256380683e34f8fb74dd31da7b34d210b2
+
+--- rocs-15.07.90.orig/src/autotests/test_project.cpp
++++ rocs-15.07.90/src/autotests/test_project.cpp
+@@ -60,7 +60,7 @@ void TestProject::projectOperations()
+ 
+     // test import of graph
+     QTemporaryFile graphFile;
+-    graphFile.setFileTemplate("XXXXXXX.graph");
++    graphFile.setFileTemplate("XXXXXXX.graph2");
+     graphFile.open();
+     GraphTheory::GraphDocumentPtr graphDoc = project.importGraphDocument(QUrl::fromLocalFile(graphFile.fileName()));
+     QCOMPARE(project.graphDocuments().length(), 1);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..84535e1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_test-user-new-graph-format.diff

-- 
rocs packaging