[SCM] kstars packaging branch, kde4.12, updated. debian/4.11.5-1-2-g0c4a64c
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Feb 7 08:45:20 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kstars.git;a=commitdiff;h=0c4a64c
The following commit has been merged in the kde4.12 branch:
commit 0c4a64c3784555801967f6ba872ad4f1658793e2
Author: Maximiliano Curia <maxy at debian.org>
Date: Fri Feb 7 09:15:56 2014 +0100
Refresh patches.
---
debian/changelog | 6 +
debian/patches/eigen3.patch | 24 +--
debian/patches/link_pthread.diff | 8 +-
debian/patches/series | 3 -
...eam_tests-always-the-system-temporary-dir.patch | 56 -------
.../patches/upstream_tests-split-init-tearup.patch | 91 -----------
...upstream_tests-use-proper-temporary-files.patch | 169 ---------------------
7 files changed, 22 insertions(+), 335 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5635db1..3da7cf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
kstars (4:4.12.2-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Remove: upstream_tests-always-the-system-temporary-dir.patch,
+ applied by upstream
+ * Remove: upstream_tests-use-proper-temporary-files.patch, applied by
+ upstream
+ * Remove: upstream_tests-split-init-tearup.patch, applied by upstream
+ * Refresh patches.
-- Maximiliano Curia <maxy at debian.org> Tue, 04 Feb 2014 19:26:12 +0100
diff --git a/debian/patches/eigen3.patch b/debian/patches/eigen3.patch
index 28180ab..aa338a2 100644
--- a/debian/patches/eigen3.patch
+++ b/debian/patches/eigen3.patch
@@ -5,8 +5,8 @@ Last-Update: 2013-10-17
Index: kstars/CMakeLists.txt
===================================================================
---- kstars.orig/CMakeLists.txt 2013-11-09 17:45:22.758523776 +0100
-+++ kstars/CMakeLists.txt 2013-11-09 17:45:22.754523934 +0100
+--- kstars.orig/CMakeLists.txt 2014-02-07 09:10:39.796083315 +0100
++++ kstars/CMakeLists.txt 2014-02-07 09:10:39.780082947 +0100
@@ -15,8 +15,8 @@
# some configure checks needed for kstars
include(CheckIncludeFiles)
@@ -18,7 +18,7 @@ Index: kstars/CMakeLists.txt
macro_optional_find_package(CFitsio)
macro_bool_to_01(CFITSIO_FOUND HAVE_CFITSIO_H)
-@@ -46,13 +46,14 @@
+@@ -50,13 +50,14 @@
enable_testing(true)
@@ -38,7 +38,7 @@ Index: kstars/CMakeLists.txt
Index: kstars/cmake/modules/FindEigen3.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ kstars/cmake/modules/FindEigen3.cmake 2013-11-09 17:45:22.754523934 +0100
++++ kstars/cmake/modules/FindEigen3.cmake 2014-02-07 09:10:39.788083131 +0100
@@ -0,0 +1,81 @@
+# - Try to find Eigen3 lib
+#
@@ -123,8 +123,8 @@ Index: kstars/cmake/modules/FindEigen3.cmake
+
Index: kstars/kstars/ksutils.h
===================================================================
---- kstars.orig/kstars/ksutils.h 2013-11-09 17:45:22.758523776 +0100
-+++ kstars/kstars/ksutils.h 2013-11-09 17:45:22.754523934 +0100
+--- kstars.orig/kstars/ksutils.h 2014-02-07 09:10:39.796083315 +0100
++++ kstars/kstars/ksutils.h 2014-02-07 09:10:39.788083131 +0100
@@ -29,7 +29,7 @@
#include <cstddef>
@@ -136,8 +136,8 @@ Index: kstars/kstars/ksutils.h
Index: kstars/kstars/projections/projector.h
===================================================================
---- kstars.orig/kstars/projections/projector.h 2013-11-09 17:45:22.758523776 +0100
-+++ kstars/kstars/projections/projector.h 2013-11-09 17:45:22.754523934 +0100
+--- kstars.orig/kstars/projections/projector.h 2014-02-07 09:10:39.796083315 +0100
++++ kstars/kstars/projections/projector.h 2014-02-07 09:10:39.788083131 +0100
@@ -22,7 +22,7 @@
#include <cstddef>
@@ -149,8 +149,8 @@ Index: kstars/kstars/projections/projector.h
Index: kstars/kstars/skyglpainter.cpp
===================================================================
---- kstars.orig/kstars/skyglpainter.cpp 2013-11-09 17:45:22.758523776 +0100
-+++ kstars/kstars/skyglpainter.cpp 2013-11-09 17:45:22.754523934 +0100
+--- kstars.orig/kstars/skyglpainter.cpp 2014-02-07 09:10:39.796083315 +0100
++++ kstars/kstars/skyglpainter.cpp 2014-02-07 09:10:39.792083223 +0100
@@ -25,7 +25,7 @@
#include <cstddef>
#include <Eigen/Core>
@@ -162,8 +162,8 @@ Index: kstars/kstars/skyglpainter.cpp
#include <GL/gl.h>
Index: kstars/kstars/skyglpainter.h
===================================================================
---- kstars.orig/kstars/skyglpainter.h 2013-11-09 17:45:22.758523776 +0100
-+++ kstars/kstars/skyglpainter.h 2013-11-09 17:45:22.754523934 +0100
+--- kstars.orig/kstars/skyglpainter.h 2014-02-07 09:10:39.796083315 +0100
++++ kstars/kstars/skyglpainter.h 2014-02-07 09:10:39.792083223 +0100
@@ -22,7 +22,7 @@
#include <cstddef>
diff --git a/debian/patches/link_pthread.diff b/debian/patches/link_pthread.diff
index 19d41aa..a96929c 100644
--- a/debian/patches/link_pthread.diff
+++ b/debian/patches/link_pthread.diff
@@ -5,11 +5,11 @@ Last-Update: 2013-11-20
Index: kstars/kstars/CMakeLists.txt
===================================================================
---- kstars.orig/kstars/CMakeLists.txt 2013-11-20 13:34:32.520871225 +0100
-+++ kstars/kstars/CMakeLists.txt 2013-11-20 13:36:20.804450078 +0100
-@@ -479,6 +479,7 @@
+--- kstars.orig/kstars/CMakeLists.txt 2014-02-07 09:10:50.332325022 +0100
++++ kstars/kstars/CMakeLists.txt 2014-02-07 09:10:50.328324928 +0100
+@@ -485,6 +485,7 @@
+ ${QT_QTDECLARATIVE_LIBRARY}
kdeclarative
- htmesh
${ZLIB_LIBRARIES}
+ pthread
${QT_QTSQL_LIBRARY}
diff --git a/debian/patches/series b/debian/patches/series
index cb98914..5dc4ed8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
eigen3.patch
link_pthread.diff
-upstream_tests-split-init-tearup.patch
-upstream_tests-use-proper-temporary-files.patch
-upstream_tests-always-the-system-temporary-dir.patch
diff --git a/debian/patches/upstream_tests-always-the-system-temporary-dir.patch b/debian/patches/upstream_tests-always-the-system-temporary-dir.patch
deleted file mode 100644
index 0232428..0000000
--- a/debian/patches/upstream_tests-always-the-system-temporary-dir.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 64748ed5e45177224699c4f597d81d6cae3bfcdc Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 30 Nov 2013 20:08:16 +0100
-Subject: [PATCH] tests: always the system temporary dir
-
-the KDE directory might need further directories in $HOME, which we
-don't want to create; hence, force QDir::tempPath() as base directory
-for the temporary files
----
- Tests/testcsvparser.cpp | 2 ++
- Tests/testfwparser.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/Tests/testcsvparser.cpp b/Tests/testcsvparser.cpp
-index e4b8bbc..806e105 100644
---- a/Tests/testcsvparser.cpp
-+++ b/Tests/testcsvparser.cpp
-@@ -25,6 +25,7 @@
-
- #include "testcsvparser.h"
-
-+#include <QDir>
- #include <ktemporaryfile.h>
-
- TestCSVParser::TestCSVParser(): QObject() {
-@@ -85,6 +86,7 @@ void TestCSVParser::initTestCase() {
- test_cases_.append(",,,,,,,,,,,
");
- test_cases_.append("
");
- KTemporaryFile temp_file;
-+ temp_file.setPrefix(QDir::tempPath() + "/");
- temp_file.setSuffix(".txt");
- temp_file.setAutoRemove(false);
- QVERIFY(temp_file.open());
-diff --git a/Tests/testfwparser.cpp b/Tests/testfwparser.cpp
-index 37f5c48..c30716c 100644
---- a/Tests/testfwparser.cpp
-+++ b/Tests/testfwparser.cpp
-@@ -17,6 +17,7 @@
-
- #include "testfwparser.h"
-
-+#include <QDir>
- #include <ktemporaryfile.h>
-
- TestFWParser::TestFWParser(): QObject() {
-@@ -30,6 +31,7 @@ void TestFWParser::initTestCase() {
- test_cases_.append("this is an ex
");
-
- KTemporaryFile temp_file;
-+ temp_file.setPrefix(QDir::tempPath() + "/");
- temp_file.setSuffix(".txt");
- temp_file.setAutoRemove(false);
- QVERIFY(temp_file.open());
---
-1.8.4.2
-
diff --git a/debian/patches/upstream_tests-split-init-tearup.patch b/debian/patches/upstream_tests-split-init-tearup.patch
deleted file mode 100644
index f6d27c6..0000000
--- a/debian/patches/upstream_tests-split-init-tearup.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 3231f23c31896b1da601e7a0704443d1181a0604 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Mon, 25 Nov 2013 23:26:57 +0100
-Subject: [PATCH] tests: split init/tearup
-
-use initTestCase and cleanupTestCase for setting up the tests;
-these will be useful later
----
- Tests/testcsvparser.cpp | 6 ++++++
- Tests/testcsvparser.h | 2 ++
- Tests/testfwparser.cpp | 6 ++++++
- Tests/testfwparser.h | 2 ++
- 4 files changed, 16 insertions(+)
-
-diff --git a/Tests/testcsvparser.cpp b/Tests/testcsvparser.cpp
-index e6b7d23..3547326 100644
---- a/Tests/testcsvparser.cpp
-+++ b/Tests/testcsvparser.cpp
-@@ -26,6 +26,9 @@
- #include "testcsvparser.h"
-
- TestCSVParser::TestCSVParser(): QObject() {
-+}
-+
-+void TestCSVParser::initTestCase() {
- /*
- * Justification for doing this instead of simply creating a file:
- * To add/change tests, we'll need to modify 2 places. The file and this class.
-@@ -113,6 +116,9 @@ TestCSVParser::TestCSVParser(): QObject() {
-
- TestCSVParser::~TestCSVParser()
- {
-+}
-+
-+void TestCSVParser::cleanupTestCase() {
- delete test_parser_;
- }
-
-diff --git a/Tests/testcsvparser.h b/Tests/testcsvparser.h
-index d8b594f..7cb33cf 100644
---- a/Tests/testcsvparser.h
-+++ b/Tests/testcsvparser.h
-@@ -30,6 +30,8 @@ class TestCSVParser: public QObject {
- TestCSVParser();
- ~TestCSVParser();
- private slots:
-+ void initTestCase();
-+ void cleanupTestCase();
- void CSVMixedInputs();
- void CSVQuotesInQuotes();
- void CSVEmptyRow();
-diff --git a/Tests/testfwparser.cpp b/Tests/testfwparser.cpp
-index a58dd6a..78efcb2 100644
---- a/Tests/testfwparser.cpp
-+++ b/Tests/testfwparser.cpp
-@@ -18,6 +18,9 @@
- #include "testfwparser.h"
-
- TestFWParser::TestFWParser(): QObject() {
-+}
-+
-+void TestFWParser::initTestCase() {
- test_cases_.append(
- "this is an exam ple of 256 cases being tested -3.14 times
");
- test_cases_.append(
-@@ -71,6 +74,9 @@ TestFWParser::TestFWParser(): QObject() {
-
- TestFWParser::~TestFWParser()
- {
-+}
-+
-+void TestFWParser::cleanupTestCase() {
- delete test_parser_;
- }
-
-diff --git a/Tests/testfwparser.h b/Tests/testfwparser.h
-index 0a86697..280794b 100644
---- a/Tests/testfwparser.h
-+++ b/Tests/testfwparser.h
-@@ -29,6 +29,8 @@ class TestFWParser: public QObject {
- TestFWParser();
- ~TestFWParser();
- private slots:
-+ void initTestCase();
-+ void cleanupTestCase();
- void MixedInputs();
- void OnlySpaceRow();
- void NoRow();
---
-1.8.4.2
-
diff --git a/debian/patches/upstream_tests-use-proper-temporary-files.patch b/debian/patches/upstream_tests-use-proper-temporary-files.patch
deleted file mode 100644
index 0b49f8a..0000000
--- a/debian/patches/upstream_tests-use-proper-temporary-files.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From bf2cb5653908863eee0ee6c6c05f87ba38886fa3 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Tue, 26 Nov 2013 00:02:51 +0100
-Subject: [PATCH] tests: use proper temporary files
-
-instead of hardcoding temporary file names within the local KDEHOME,
-use proper temporary files for the data files used in the tests
-
-this makes the tests runnable even when there is no real HOME set
----
- Tests/testcsvparser.cpp | 26 ++++++++++++--------------
- Tests/testcsvparser.h | 2 +-
- Tests/testfwparser.cpp | 28 ++++++++++++----------------
- Tests/testfwparser.h | 2 +-
- 4 files changed, 26 insertions(+), 32 deletions(-)
-
-diff --git a/Tests/testcsvparser.cpp b/Tests/testcsvparser.cpp
-index cdb05f0..e4b8bbc 100644
---- a/Tests/testcsvparser.cpp
-+++ b/Tests/testcsvparser.cpp
-@@ -25,6 +25,8 @@
-
- #include "testcsvparser.h"
-
-+#include <ktemporaryfile.h>
-+
- TestCSVParser::TestCSVParser(): QObject() {
- }
-
-@@ -82,18 +84,15 @@ void TestCSVParser::initTestCase() {
- "either
"));
- test_cases_.append(",,,,,,,,,,,
");
- test_cases_.append("
");
-- QString file_name("TestCSV.txt");
-- file_name = KStandardDirs::locateLocal("appdata", file_name);
-- if (!file_name.isNull()) {
-- test_csv_file_.setFileName(file_name);
-- if (!test_csv_file_.open(QIODevice::WriteOnly)) {
-- kWarning() << QString("Couldn't open(%1)").arg(file_name);
-- }
-- }
-- QTextStream out_stream(&test_csv_file_);
-+ KTemporaryFile temp_file;
-+ temp_file.setSuffix(".txt");
-+ temp_file.setAutoRemove(false);
-+ QVERIFY(temp_file.open());
-+ test_file_name_ = temp_file.fileName();
-+ QTextStream out_stream(&temp_file);
- foreach(const QString &test_case, test_cases_)
- out_stream << test_case;
-- test_csv_file_.close();
-+ temp_file.close();
-
- //Building the sequence to be used. Includes all available types.
- sequence_.clear();
-@@ -110,8 +109,7 @@ void TestCSVParser::initTestCase() {
- sequence_.append(qMakePair(QString("field11"), KSParser::D_QSTRING));
- sequence_.append(qMakePair(QString("field12"), KSParser::D_QSTRING));
-
-- QString fname = KStandardDirs::locate( "appdata", file_name );
-- test_parser_ = new KSParser(fname, '#', sequence_);
-+ test_parser_ = new KSParser(test_file_name_, '#', sequence_);
- }
-
- TestCSVParser::~TestCSVParser()
-@@ -265,9 +263,9 @@ void TestCSVParser::CSVReadMissingFile() {
- /*
- * Test 6. Attempt to read a missing file repeatedly
- */
-- QFile::remove(KStandardDirs::locateLocal("appdata","TestCSV.txt"));
-+ QFile::remove(test_file_name_);
-
-- KSParser missing_parser(QString("TestCSV.txt"), '#', sequence_);
-+ KSParser missing_parser(test_file_name_, '#', sequence_);
- QHash<QString, QVariant> row_content = missing_parser.ReadNextRow();
-
- for (int times = 0; times < 20; times++) {
-diff --git a/Tests/testcsvparser.h b/Tests/testcsvparser.h
-index 7cb33cf..1c01782 100644
---- a/Tests/testcsvparser.h
-+++ b/Tests/testcsvparser.h
-@@ -42,7 +42,7 @@ class TestCSVParser: public QObject {
- private:
- QStringList test_cases_;
- QList< QPair<QString, KSParser::DataTypes> > sequence_;
-- QFile test_csv_file_;
-+ QString test_file_name_;
- KSParser *test_parser_;
- };
-
-diff --git a/Tests/testfwparser.cpp b/Tests/testfwparser.cpp
-index 0e39f70..37f5c48 100644
---- a/Tests/testfwparser.cpp
-+++ b/Tests/testfwparser.cpp
-@@ -17,6 +17,8 @@
-
- #include "testfwparser.h"
-
-+#include <ktemporaryfile.h>
-+
- TestFWParser::TestFWParser(): QObject() {
- }
-
-@@ -27,20 +29,15 @@ void TestFWParser::initTestCase() {
- "
");
- test_cases_.append("this is an ex
");
-
-- QString file_name("TestFW.txt");
-- file_name = KStandardDirs::locateLocal("appdata", file_name);
--
-- if (!file_name.isNull()) {
-- test_file_.setFileName(file_name);
-- if (!test_file_.open(QIODevice::WriteOnly)) {
-- kWarning() << QString("Couldn't open(%1)").arg(file_name);
-- }
-- }
--
-- QTextStream out_stream(&test_file_);
-+ KTemporaryFile temp_file;
-+ temp_file.setSuffix(".txt");
-+ temp_file.setAutoRemove(false);
-+ QVERIFY(temp_file.open());
-+ test_file_name_ = temp_file.fileName();
-+ QTextStream out_stream(&temp_file);
- foreach(const QString &test_case, test_cases_)
- out_stream << test_case;
-- test_file_.close();
-+ temp_file.close();
-
- //Building the sequence to be used. Includes all available types.
- sequence_.clear();
-@@ -68,8 +65,7 @@ void TestFWParser::initTestCase() {
- widths_.append(6);
- widths_.append(6); //'repeatedly' doesn't need a width
-
-- QString fname = KStandardDirs::locate( "appdata", file_name );
-- test_parser_ = new KSParser(fname, '#', sequence_, widths_);
-+ test_parser_ = new KSParser(test_file_name_, '#', sequence_, widths_);
- }
-
- TestFWParser::~TestFWParser()
-@@ -156,9 +152,9 @@ void TestFWParser::FWReadMissingFile()
- * This tests how the parser reacts if there is no file with the
- * given path.
- */
-- QFile::remove(KStandardDirs::locateLocal("appdata","TestFW.txt"));
-+ QFile::remove(test_file_name_);
-
-- KSParser missing_parser(QString("TestFW.txt"), '#', sequence_, widths_);
-+ KSParser missing_parser(test_file_name_, '#', sequence_, widths_);
- QHash<QString, QVariant> row_content = missing_parser.ReadNextRow();
-
- for (int times = 0; times < 20; times++) {
-diff --git a/Tests/testfwparser.h b/Tests/testfwparser.h
-index 280794b..625076a 100644
---- a/Tests/testfwparser.h
-+++ b/Tests/testfwparser.h
-@@ -40,7 +40,7 @@ class TestFWParser: public QObject {
- QStringList test_cases_;
- QList<int> widths_;
- QList< QPair<QString, KSParser::DataTypes> > sequence_;
-- QFile test_file_;
-+ QString test_file_name_;
- KSParser *test_parser_;
- };
-
---
-1.8.4.2
-
--
kstars packaging
More information about the pkg-kde-commits
mailing list