[SCM] rocs packaging branch, kubuntu_wily_archive, updated. ubuntu/4%15.07.90-0ubuntu2-2-gfea3c6a

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit fea3c6a99f962b0e586afdedc3b914567b7d69d2
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Aug 21 16:57:13 2015 +0000

     New upstream release
    
    * New upstream release
    * Remove upstream patch test-use-new-graph-format
---
 debian/changelog                         |  7 +++++++
 debian/patches/series                    |  1 -
 debian/patches/test-use-new-graph-format | 15 ---------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f3421c..6abb22c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rocs (4:15.08.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Remove upstream patch test-use-new-graph-format
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 21 Aug 2015 16:56:33 +0000
+
 rocs (4:15.07.90-0ubuntu2) wily; urgency=medium
 
   * debian/patches/test-use-new-graph-format: Cherry-pick from upstream to
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1149e3d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-test-use-new-graph-format
diff --git a/debian/patches/test-use-new-graph-format b/debian/patches/test-use-new-graph-format
deleted file mode 100644
index 55e30ea..0000000
--- a/debian/patches/test-use-new-graph-format
+++ /dev/null
@@ -1,15 +0,0 @@
-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);

-- 
rocs packaging