[pkg-xtuple-maintainers] [postbooks] 04/05: Remove patch applied upstream

[Daniel Pocock]

This is an automated email from the git hooks/post-receive script.

pocock pushed a commit to branch debian-experimental
in repository postbooks.

commit d959e45984d21458c818644886ea451755f1fad1
Author: Daniel Pocock <daniel at pocock.pro>
Date:   Wed Sep 24 07:32:20 2014 +0200

    Remove patch applied upstream
---
 debian/patches/01-assistant-fix.patch              | 30 ----------------------
 debian/patches/05-remove-circular-dependency.patch | 15 -----------
 .../08-guiclient-use-libopenrptcommon.patch        | 20 ---------------
 debian/patches/series                              |  3 ---
 4 files changed, 68 deletions(-)

diff --git a/debian/patches/01-assistant-fix.patch b/debian/patches/01-assistant-fix.patch
deleted file mode 100644
index bc0c592..0000000
--- a/debian/patches/01-assistant-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/guiclient/guiclient.cpp b/guiclient/guiclient.cpp
-index 22e97c0..75ab163 100644
---- a/guiclient/guiclient.cpp
-+++ b/guiclient/guiclient.cpp
-@@ -427,7 +427,7 @@ GUIClient::GUIClient(const QString &pDatabaseURL, const QString &pUsername)
- 
-   // load plugins before building the menus
-   // TODO? add a step later to add to the menus from the plugins?
--  QDir pluginsDir(QApplication::applicationDirPath());
-+  QDir pluginsDir("/usr/lib/postbooks");
-   while (! pluginsDir.exists("plugins") && pluginsDir.cdUp())
-     ;
-   if (pluginsDir.cd("plugins"))
-@@ -1360,6 +1360,7 @@ QString translationFile(QString localestr, const QString component, QString &ver
-   QStringList paths;
- //qDebug() << QDesktopServices::storageLocation(QDesktopServices::DataLocation);
-   paths << QDesktopServices::storageLocation(QDesktopServices::DataLocation);
-+  paths << "/usr/lib/postbooks/dict";
-   paths << "dict";
-   paths << "";
-   paths << "../dict";
-@@ -2188,7 +2189,7 @@ void GUIClient::hunspell_initialize()
- {
-     _spellReady = false;
-     QString langName = QLocale::languageToString(QLocale().language());
--    QString appPath = QApplication::applicationDirPath();
-+    QString appPath("/usr/lib/postbooks");
-     QString fullPathWithoutExt = appPath + "/" + langName;
-     QFile affFile(fullPathWithoutExt + tr(".aff"));
-     QFile dicFile(fullPathWithoutExt + tr(".dic"));
diff --git a/debian/patches/05-remove-circular-dependency.patch b/debian/patches/05-remove-circular-dependency.patch
deleted file mode 100644
index e086b3e..0000000
--- a/debian/patches/05-remove-circular-dependency.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/common/checkForUpdates.cpp b/common/checkForUpdates.cpp
-index a5cbac5..529510b 100644
---- a/common/checkForUpdates.cpp
-+++ b/common/checkForUpdates.cpp
-@@ -84,7 +84,9 @@ suffix = "run";
-     _ok->setEnabled(metric.value("allow").toBool());
-   }
-   else if (versions.lastError().type() != QSqlError::NoError)
--    systemError(this, versions.lastError().text(), __FILE__, __LINE__);
-+    // FIXME: This function is from guiclient and creates a circular dependency
-+    //systemError(this, versions.lastError().text(), __FILE__, __LINE__);
-+    qDebug() << "systemError: " << versions.lastError().text();
-   if (DEBUG)
-   {
-     qDebug() << "serverVersion= " << serverVersion;
diff --git a/debian/patches/08-guiclient-use-libopenrptcommon.patch b/debian/patches/08-guiclient-use-libopenrptcommon.patch
deleted file mode 100644
index 4b17fb1..0000000
--- a/debian/patches/08-guiclient-use-libopenrptcommon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/guiclient/guiclient.pro b/guiclient/guiclient.pro
-index 6660cc0..c9ea866 100644
---- a/guiclient/guiclient.pro
-+++ b/guiclient/guiclient.pro
-@@ -32,13 +32,13 @@ win32-msvc* {
-                       $${OPENRPT_BLD}/librenderer.so \
-                       $${OPENRPT_BLD}/libwrtembed.so \
-                       $${OPENRPT_BLD}/libdmtx.so \
--                      $${OPENRPT_BLD}/libcommon.so
-+                      $${OPENRPT_BLD}/libopenrptcommon.so
-   } else {
-     PRE_TARGETDEPS += $${OPENRPT_BLD}/lib/libMetaSQL.a  \
-                       $${OPENRPT_BLD}/lib/librenderer.a \
-                       $${OPENRPT_BLD}/lib/libwrtembed.a \
-                       $${OPENRPT_BLD}/lib/libDmtx_Library.a \
--                      $${OPENRPT_BLD}/lib/libcommon.a
-+                      $${OPENRPT_BLD}/lib/libopenrptcommon.a
-   }
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index fa56365..5845fe0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-01-assistant-fix.patch
-05-remove-circular-dependency.patch
 06-correct-edition-data.patch
 07-include-paths-scriptapi.patch
-08-guiclient-use-libopenrptcommon.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/postbooks.git