[Pkg-owncloud-commits] [owncloud-client] 04/06: Delete upstream approved patches
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Jun 8 09:31:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit f111f0e1c4dbb3804bf295e6ec01d2368266e680
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Wed Jun 8 11:24:13 2016 +0200
Delete upstream approved patches
---
debian/patches/fix_testutility.patch | 21 ----
debian/patches/series | 2 -
debian/patches/use-guilesstests.patch | 195 ----------------------------------
3 files changed, 218 deletions(-)
diff --git a/debian/patches/fix_testutility.patch b/debian/patches/fix_testutility.patch
deleted file mode 100644
index 6eabe28..0000000
--- a/debian/patches/fix_testutility.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Make version string pass with a final version
- Currently it needs somthing after the normal version string.
-Author: Sandro Knauß <bugs at sandroknauss.de>
-Origin: Debian
-Applied-Upstream: https://github.com/owncloud/client/pull/4835
-Last-Update: 2016-05-13
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/test/testutility.cpp
-===================================================================
---- owncloud-client.orig/test/testutility.cpp 2016-05-13 16:07:53.724093437 +0200
-+++ owncloud-client/test/testutility.cpp 2016-05-13 16:07:53.704093027 +0200
-@@ -127,7 +127,7 @@
- qDebug() << "Version of installed ownCloud Binary: " << ver;
- QVERIFY( !ver.isEmpty());
-
-- QRegExp rx( "ownCloud version \\d+\\.\\d+\\.\\d+.+" );
-+ QRegExp rx( "ownCloud version \\d+\\.\\d+\\.\\d+.*" );
- QVERIFY( rx.exactMatch(ver));
- } else {
- QVERIFY( versionOfInstalledBinary().isEmpty());
diff --git a/debian/patches/series b/debian/patches/series
index 4d2fe4c..dd3cdd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,3 @@
0007-move-translations.patch
0008-make-reproducable.patch
0009-fix-installpath-of-dolphin-plugin.patch
-use-guilesstests.patch
-fix_testutility.patch
diff --git a/debian/patches/use-guilesstests.patch b/debian/patches/use-guilesstests.patch
deleted file mode 100644
index 6d63871..0000000
--- a/debian/patches/use-guilesstests.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-Description: Use QTEST_GUILESS_MAIN instead of QTEST_MAIN
- For tests we don't need a xserver, thats why QTEST_GUILESS is enough to run tests.
-Author: Sandro Knauß <bugs at sandroknauss.de>
-Origin: Debian
-Applied-Upstream: https://github.com/owncloud/client/pull/4818/commits/9e0c5078bb58e7b4db928031df4881dcef4d7d9e
-Last-Update: 2016-05-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/test/testchecksumvalidator.cpp
-===================================================================
---- owncloud-client.orig/test/testchecksumvalidator.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testchecksumvalidator.cpp 2016-05-12 18:26:40.374380701 +0200
-@@ -150,5 +150,5 @@
- }
- };
-
--QTEST_MAIN(TestChecksumValidator)
-+QTEST_GUILESS_MAIN(TestChecksumValidator)
- #include "testchecksumvalidator.moc"
-Index: owncloud-client/test/testconcaturl.cpp
-===================================================================
---- owncloud-client.orig/test/testconcaturl.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testconcaturl.cpp 2016-05-12 18:26:40.374380701 +0200
-@@ -100,5 +100,5 @@
-
- };
-
--QTEST_MAIN(TestConcatUrl)
-+QTEST_APPLESS_MAIN(TestConcatUrl)
- #include "testconcaturl.moc"
-Index: owncloud-client/test/testcsyncsqlite.cpp
-===================================================================
---- owncloud-client.orig/test/testcsyncsqlite.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testcsyncsqlite.cpp 2016-05-12 18:26:40.374380701 +0200
-@@ -85,5 +85,5 @@
-
- };
-
--QTEST_MAIN(TestCSyncSqlite)
-+QTEST_APPLESS_MAIN(TestCSyncSqlite)
- #include "testcsyncsqlite.moc"
-Index: owncloud-client/test/testexcludedfiles.cpp
-===================================================================
---- owncloud-client.orig/test/testexcludedfiles.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testexcludedfiles.cpp 2016-05-12 18:26:40.374380701 +0200
-@@ -46,5 +46,5 @@
- }
- };
-
--QTEST_MAIN(TestExcludedFiles)
-+QTEST_APPLESS_MAIN(TestExcludedFiles)
- #include "testexcludedfiles.moc"
-Index: owncloud-client/test/testfilesystem.cpp
-===================================================================
---- owncloud-client.orig/test/testfilesystem.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testfilesystem.cpp 2016-05-12 18:26:40.382380864 +0200
-@@ -87,5 +87,5 @@
-
- };
-
--QTEST_MAIN(TestFileSystem)
-+QTEST_APPLESS_MAIN(TestFileSystem)
- #include "testfilesystem.moc"
-Index: owncloud-client/test/testfolder.cpp
-===================================================================
---- owncloud-client.orig/test/testfolder.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testfolder.cpp 2016-05-12 18:26:40.382380864 +0200
-@@ -41,5 +41,5 @@
-
- };
-
--QTEST_MAIN(TestFolder)
-+QTEST_APPLESS_MAIN(TestFolder)
- #include "testfolder.moc"
-Index: owncloud-client/test/testfolderman.cpp
-===================================================================
---- owncloud-client.orig/test/testfolderman.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testfolderman.cpp 2016-05-12 18:26:40.382380864 +0200
-@@ -118,5 +118,5 @@
- }
- };
-
--QTEST_MAIN(TestFolderMan)
-+QTEST_APPLESS_MAIN(TestFolderMan)
- #include "testfolderman.moc"
-Index: owncloud-client/test/testfolderwatcher.cpp
-===================================================================
---- owncloud-client.orig/test/testfolderwatcher.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testfolderwatcher.cpp 2016-05-12 18:26:40.382380864 +0200
-@@ -182,5 +182,5 @@
- }
- };
-
--QTEST_MAIN(TestFolderWatcher)
-+QTEST_GUILESS_MAIN(TestFolderWatcher)
- #include "testfolderwatcher.moc"
-Index: owncloud-client/test/testinotifywatcher.cpp
-===================================================================
---- owncloud-client.orig/test/testinotifywatcher.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testinotifywatcher.cpp 2016-05-12 18:26:40.382380864 +0200
-@@ -69,5 +69,5 @@
- }
- };
-
--QTEST_MAIN(TestInotifyWatcher)
-+QTEST_APPLESS_MAIN(TestInotifyWatcher)
- #include "testinotifywatcher.moc"
-Index: owncloud-client/test/testnetrcparser.cpp
-===================================================================
---- owncloud-client.orig/test/testnetrcparser.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testnetrcparser.cpp 2016-05-12 18:26:40.382380864 +0200
-@@ -72,5 +72,5 @@
- }
- };
-
--QTEST_MAIN(TestNetrcParser)
-+QTEST_APPLESS_MAIN(TestNetrcParser)
- #include "testnetrcparser.moc"
-Index: owncloud-client/test/testowncloudpropagator.cpp
-===================================================================
---- owncloud-client.orig/test/testowncloudpropagator.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testowncloudpropagator.cpp 2016-05-12 18:26:40.382380864 +0200
-@@ -78,5 +78,5 @@
- }
- };
-
--QTEST_MAIN(TestOwncloudPropagator)
-+QTEST_APPLESS_MAIN(TestOwncloudPropagator)
- #include "testowncloudpropagator.moc"
-Index: owncloud-client/test/testownsql.cpp
-===================================================================
---- owncloud-client.orig/test/testownsql.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testownsql.cpp 2016-05-12 18:26:40.382380864 +0200
-@@ -149,5 +149,5 @@
- SqlDatabase _db;
- };
-
--QTEST_MAIN(TestOwnSql)
-+QTEST_APPLESS_MAIN(TestOwnSql)
- #include "testownsql.moc"
-Index: owncloud-client/test/testsyncfileitem.cpp
-===================================================================
---- owncloud-client.orig/test/testsyncfileitem.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testsyncfileitem.cpp 2016-05-12 18:26:40.382380864 +0200
-@@ -65,5 +65,5 @@
- }
- };
-
--QTEST_MAIN(TestSyncFileItem)
-+QTEST_APPLESS_MAIN(TestSyncFileItem)
- #include "testsyncfileitem.moc"
-Index: owncloud-client/test/testsyncjournaldb.cpp
-===================================================================
---- owncloud-client.orig/test/testsyncjournaldb.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testsyncjournaldb.cpp 2016-05-12 18:26:40.390381028 +0200
-@@ -171,5 +171,5 @@
- SyncJournalDb _db;
- };
-
--QTEST_MAIN(TestSyncJournalDB)
-+QTEST_APPLESS_MAIN(TestSyncJournalDB)
- #include "testsyncjournaldb.moc"
-Index: owncloud-client/test/testupdater.cpp
-===================================================================
---- owncloud-client.orig/test/testupdater.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testupdater.cpp 2016-05-12 18:26:40.390381028 +0200
-@@ -30,5 +30,5 @@
-
- };
-
--QTEST_MAIN(TestUpdater)
-+QTEST_APPLESS_MAIN(TestUpdater)
- #include "testupdater.moc"
-Index: owncloud-client/test/testutility.cpp
-===================================================================
---- owncloud-client.orig/test/testutility.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testutility.cpp 2016-05-12 18:26:40.390381028 +0200
-@@ -160,5 +160,5 @@
- }
- };
-
--QTEST_MAIN(TestUtility)
-+QTEST_APPLESS_MAIN(TestUtility)
- #include "testutility.moc"
-Index: owncloud-client/test/testxmlparse.cpp
-===================================================================
---- owncloud-client.orig/test/testxmlparse.cpp 2016-05-12 18:26:40.426381764 +0200
-+++ owncloud-client/test/testxmlparse.cpp 2016-05-12 18:26:40.390381028 +0200
-@@ -441,5 +441,5 @@
-
- };
-
--QTEST_MAIN(TestXmlParse)
-+QTEST_GUILESS_MAIN(TestXmlParse)
- #include "testxmlparse.moc"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list