From 475285cd8e1d8accc607e348821c3ec3d4001bab Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Sun, 14 Dec 2014 08:30:26 -0500
Subject: Drop patches applied upstream.

---
 debian/patches/cpp4.9_incompatibilities.patch | 67 ---------------------------
 debian/patches/series                         |  2 -
 debian/patches/tclConfig_path.patch           | 19 --------
 3 files changed, 88 deletions(-)
 delete mode 100644 debian/patches/cpp4.9_incompatibilities.patch
 delete mode 100644 debian/patches/tclConfig_path.patch

diff --git a/debian/patches/cpp4.9_incompatibilities.patch b/debian/patches/cpp4.9_incompatibilities.patch
deleted file mode 100644
index a089d8f..0000000
--- a/debian/patches/cpp4.9_incompatibilities.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Fix some gcc 4.9 incompatibilities.
-Author: Unit 193 <unit193@ninthfloor.org>
-Origin: vendor
-Forwarded: yes
-Bug: http://bugs.sqlitestudio.pl/?id=2678
-Last-Update: 2014-10-28
-
---- sqlitestudio-2.99.1.orig/SQLiteStudio3/coreSQLiteStudio/common/utils.h
-+++ sqlitestudio-2.99.1/SQLiteStudio3/coreSQLiteStudio/common/utils.h
-@@ -8,6 +8,7 @@
- #include <QChar>
- #include <QStringList>
- #include <QFileInfo>
-+#include <functional>
- 
- class QTextCodec;
- 
---- sqlitestudio-2.99.1.orig/SQLiteStudio3/coreSQLiteStudio/plugins/plugintype.h
-+++ sqlitestudio-2.99.1/SQLiteStudio3/coreSQLiteStudio/plugins/plugintype.h
-@@ -5,6 +5,7 @@
- #include <QList>
- #include <QString>
- #include <QObject>
-+#include <typeinfo>
- 
- class Plugin;
- 
---- sqlitestudio-2.99.1.orig/SQLiteStudio3/coreSQLiteStudio/services/functionmanager.h
-+++ sqlitestudio-2.99.1/SQLiteStudio3/coreSQLiteStudio/services/functionmanager.h
-@@ -7,6 +7,7 @@
- #include <QSharedPointer>
- #include <QObject>
- #include <QStringList>
-+#include <functional>
- 
- class Db;
- 
---- sqlitestudio-2.99.1.orig/SQLiteStudio3/guiSQLiteStudio/common/datawidgetmapper.h
-+++ sqlitestudio-2.99.1/SQLiteStudio3/guiSQLiteStudio/common/datawidgetmapper.h
-@@ -3,6 +3,7 @@
- 
- #include <QObject>
- #include <QHash>
-+#include <functional>
- 
- class QAbstractItemModel;
- 
---- sqlitestudio-2.99.1.orig/SQLiteStudio3/guiSQLiteStudio/common/verifiablewizardpage.h
-+++ sqlitestudio-2.99.1/SQLiteStudio3/guiSQLiteStudio/common/verifiablewizardpage.h
-@@ -3,6 +3,7 @@
- 
- #include "guiSQLiteStudio_global.h"
- #include <QWizardPage>
-+#include <functional>
- 
- class GUI_API_EXPORT VerifiableWizardPage : public QWizardPage
- {
---- sqlitestudio-2.99.1.orig/SQLiteStudio3/guiSQLiteStudio/uiloader.h
-+++ sqlitestudio-2.99.1/SQLiteStudio3/guiSQLiteStudio/uiloader.h
-@@ -6,6 +6,7 @@
- #include <QHash>
- #include <QStack>
- #include <QXmlDefaultHandler>
-+#include <functional>
- 
- class UiLoaderPropertyHandler;
- 
diff --git a/debian/patches/series b/debian/patches/series
index ec1963f..41f6c1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-cpp4.9_incompatibilities.patch
 fix_tcl_path.patch
 disable_rpath.patch
-tclConfig_path.patch
diff --git a/debian/patches/tclConfig_path.patch b/debian/patches/tclConfig_path.patch
deleted file mode 100644
index ed504e5..0000000
--- a/debian/patches/tclConfig_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: 'info library' doesn't give the right directory on Debian and Ubuntu, construct it a different way.
-Author: Unit 193 <unit193@ninthfloor.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2014-11-29
-
-Index: sqlitestudio-3.0.0/Plugins/ScriptingTcl/ScriptingTcl.pro
-===================================================================
---- sqlitestudio-3.0.0.orig/Plugins/ScriptingTcl/ScriptingTcl.pro
-+++ sqlitestudio-3.0.0/Plugins/ScriptingTcl/ScriptingTcl.pro
-@@ -34,7 +34,7 @@ linux: {
-     #message("Found tclsh: $$TCLSH (version: $$TCL_VERSION)")
- 
-     # Find tclConfig.sh
--    TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh)
-+    TCL_CONFIG_DIR = /usr/lib/$$system(dpkg-architecture -qDEB_HOST_MULTIARCH)/tcl$$TCL_VERSION
-     TCL_CONFIG = $$TCL_CONFIG_DIR/tclConfig.sh
- 
-     # Define other libs required when linking with Tcl
-- 
cgit v1.2.3