[SCM] qtcreator packaging branch, master, updated. debian/3.2.1+dfsg-3-3-g1e49053

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 06df9463412772127f04db19ff9b943719e69c4e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Oct 4 11:27:26 2014 -0300

    Refresh from_header_to_body.diff.
---
 debian/changelog                        |  3 +++
 debian/patches/from_header_to_body.diff | 23 ++++++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4babe59..f4769a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtcreator (3.2.1+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Refresh from_header_to_body.diff.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Oct 2014 10:40:52 -0300
 
 qtcreator (3.2.1+dfsg-3) unstable; urgency=medium
diff --git a/debian/patches/from_header_to_body.diff b/debian/patches/from_header_to_body.diff
index d66ea19..705353f 100644
--- a/debian/patches/from_header_to_body.diff
+++ b/debian/patches/from_header_to_body.diff
@@ -1,8 +1,11 @@
-Index: qtcreator/src/plugins/cpptools/cppmodelmanager.cpp
-===================================================================
---- qtcreator.orig/src/plugins/cpptools/cppmodelmanager.cpp	2014-08-18 02:52:02.000000000 -0500
-+++ qtcreator/src/plugins/cpptools/cppmodelmanager.cpp	2014-09-03 12:28:09.844798669 -0500
-@@ -919,6 +919,24 @@
+---
+ src/plugins/cpptools/cppmodelmanager.cpp |   18 ++++++++++++++++++
+ src/plugins/cpptools/cppmodelmanager.h   |   19 +++----------------
+ 2 files changed, 21 insertions(+), 16 deletions(-)
+
+--- a/src/plugins/cpptools/cppmodelmanager.cpp
++++ b/src/plugins/cpptools/cppmodelmanager.cpp
+@@ -920,6 +920,24 @@ CppIndexingSupport *CppModelManager::ind
      return m_indexingSupporter ? m_indexingSupporter : m_internalIndexingSupport;
  }
  
@@ -27,11 +30,9 @@ Index: qtcreator/src/plugins/cpptools/cppmodelmanager.cpp
  void CppModelManager::enableGarbageCollector(bool enable)
  {
      m_delayedGcTimer->stop();
-Index: qtcreator/src/plugins/cpptools/cppmodelmanager.h
-===================================================================
---- qtcreator.orig/src/plugins/cpptools/cppmodelmanager.h	2014-08-18 02:52:02.000000000 -0500
-+++ qtcreator/src/plugins/cpptools/cppmodelmanager.h	2014-09-03 12:28:28.360799389 -0500
-@@ -122,17 +122,8 @@
+--- a/src/plugins/cpptools/cppmodelmanager.h
++++ b/src/plugins/cpptools/cppmodelmanager.h
+@@ -122,17 +122,8 @@ public:
      virtual void setIndexingSupport(CppIndexingSupport *indexingSupport);
      virtual CppIndexingSupport *indexingSupport();
  
@@ -51,7 +52,7 @@ Index: qtcreator/src/plugins/cpptools/cppmodelmanager.h
  
      // Use this *only* for auto tests
      void setHeaderPaths(const ProjectPart::HeaderPaths &headerPaths)
-@@ -140,11 +131,7 @@
+@@ -140,11 +131,7 @@ public:
          m_headerPaths = headerPaths;
      }
  

-- 
qtcreator packaging