[SCM] qtcreator packaging branch, master, updated. debian/2.7.0-1-27-g06f08cc

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=bb7d0b8

The following commit has been merged in the master branch:
commit bb7d0b81ca108e11f1d0620d63724ff93ca9b96d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jul 22 16:32:01 2013 -0300

    Remove 03_fix_DOCPATH.diff, no longer needed.
---
 debian/changelog                   |    1 +
 debian/patches/03_fix_DOCPATH.diff |   18 ------------------
 debian/patches/series              |    1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9261c4..729111c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ qtcreator (2.8.0-1) UNRELEASED; urgency=low
     - The upstream changelog is splited in different files.
   * Update watch file.
   * Refersh patches.
+  * Remove 03_fix_DOCPATH.diff, no longer needed.
 
   [ Pino Toscano ]
   * Switch Homepage to a qt-project.org page.
diff --git a/debian/patches/03_fix_DOCPATH.diff b/debian/patches/03_fix_DOCPATH.diff
deleted file mode 100644
index ebcc9ec..0000000
--- a/debian/patches/03_fix_DOCPATH.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix DOCPATH for Debian based distributions
-Author: Fathi Boudra <fabo at debian.org>
-
----
- src/plugins/help/helpplugin.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/plugins/help/helpplugin.cpp
-+++ b/src/plugins/help/helpplugin.cpp
-@@ -107,7 +107,7 @@ const char SB_OPENPAGES[] = "OpenPages";
- #if defined(Q_OS_MAC)
- #   define DOCPATH "/../Resources/doc/"
- #else
--#   define DOCPATH "/../share/doc/qtcreator/"
-+#   define DOCPATH "/../share/qtcreator/doc/"
- #endif
- 
- using namespace Core;
diff --git a/debian/patches/series b/debian/patches/series
index 33f2f5e..ec331ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 02_use_x-terminal-emulator.diff
-03_fix_DOCPATH.diff
 rpath_nonlinux.diff
 
 # Debian patches.

-- 
qtcreator packaging