[SCM] qtcreator packaging branch, master, updated. debian/3.3.0+dfsg-1-13-gfcb22e1

Adam Majer adamm at moszumanska.debian.org
Fri Jun 26 03:17:15 UTC 2015 

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

The following commit has been merged in the master branch:
commit 1a3e7de7f8994b78da38af18006ed04c9de5136e
Author: Adam Majer <adamm at zombino.com>
Date:   Thu Jun 25 11:01:57 2015 -0500

    Refresh patches - only positional changes
---
 debian/changelog                                  |  1 +
 debian/patches/02_use_x-terminal-emulator.diff    |  6 +++---
 debian/patches/always_autotect_qt_versions        | 14 +++++++-------
 debian/patches/qt_versions_trough_qtchooser.patch | 14 +++++++-------
 debian/patches/rpath_nonlinux.diff                | 14 +++++++-------
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f5ad35..9547bcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtcreator (3.4.1+dfsg-1) UNRELEASED; urgency=medium
 
   [ Adam Majer ]
   * New upstream release
+    + Refresh patches - only positional changes
 
  -- Adam Majer <adamm at zombino.com>  Wed, 24 Jun 2015 23:01:01 -0500
 
diff --git a/debian/patches/02_use_x-terminal-emulator.diff b/debian/patches/02_use_x-terminal-emulator.diff
index 2f293ba..dd936e3 100644
--- a/debian/patches/02_use_x-terminal-emulator.diff
+++ b/debian/patches/02_use_x-terminal-emulator.diff
@@ -7,9 +7,9 @@ Author: Fathi Boudra <fabo at debian.org>
 
 Index: qtcreator/src/libs/utils/consoleprocess_unix.cpp
 ===================================================================
---- qtcreator.orig/src/libs/utils/consoleprocess_unix.cpp	2014-12-25 01:52:54.142705181 -0600
-+++ qtcreator/src/libs/utils/consoleprocess_unix.cpp	2014-12-25 01:52:54.138705181 -0600
-@@ -352,6 +352,7 @@
+--- qtcreator.orig/src/libs/utils/consoleprocess_unix.cpp	2015-06-24 23:59:30.295412547 -0500
++++ qtcreator/src/libs/utils/consoleprocess_unix.cpp	2015-06-24 23:59:30.295412547 -0500
+@@ -353,6 +353,7 @@
  
  static const Terminal knownTerminals[] =
  {
diff --git a/debian/patches/always_autotect_qt_versions b/debian/patches/always_autotect_qt_versions
index 7c69d18..45014c5 100644
--- a/debian/patches/always_autotect_qt_versions
+++ b/debian/patches/always_autotect_qt_versions
@@ -1,17 +1,17 @@
 Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 ===================================================================
---- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp	2014-12-25 13:18:51.936998208 -0600
-+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2014-12-25 13:29:00.093021852 -0600
-@@ -139,7 +139,7 @@
- static BaseQtVersion::QmakeBuildConfigs qmakeBuildConfigFromCmdArgs(QList<QMakeAssignment> *assignments,
-                                                                     BaseQtVersion::QmakeBuildConfigs defaultBuildConfig);
+--- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp	2015-06-25 01:19:23.559518183 -0500
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2015-06-25 01:19:23.555518237 -0500
+@@ -102,7 +102,7 @@
+     return a->qtVersion() > b->qtVersion() || (a->qtVersion() == b->qtVersion() && a->uniqueId() < b->uniqueId());
+ }
  static bool restoreQtVersions();
 -static void findSystemQt();
 +static void updateSystemQt();
  static void saveQtVersions();
  static void updateDocumentation();
  
-@@ -168,14 +168,11 @@
+@@ -131,14 +131,11 @@
      disconnect(ProjectExplorer::ToolChainManager::instance(), SIGNAL(toolChainsLoaded()),
                 this, SLOT(triggerQtVersionRestore()));
  
@@ -30,7 +30,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
  
      emit m_instance->qtVersionsLoaded();
      emit m_instance->qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
-@@ -435,28 +432,57 @@
+@@ -398,28 +395,57 @@
      m_writer->save(data, Core::ICore::mainWindow());
  }
  
diff --git a/debian/patches/qt_versions_trough_qtchooser.patch b/debian/patches/qt_versions_trough_qtchooser.patch
index 1fc1bb9..2d2fffc 100644
--- a/debian/patches/qt_versions_trough_qtchooser.patch
+++ b/debian/patches/qt_versions_trough_qtchooser.patch
@@ -9,7 +9,7 @@ Date:   Thu Oct 16 13:52:28 2014 +0200
 Index: qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.cpp	2014-12-25 01:59:14.818719981 -0600
++++ qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.cpp	2015-06-25 01:18:51.731947228 -0500
 @@ -0,0 +1,117 @@
 +/****************************************************************************
 + * *
@@ -131,7 +131,7 @@ Index: qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.cpp
 Index: qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.h	2014-12-25 01:59:14.818719981 -0600
++++ qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.h	2015-06-25 01:18:51.731947228 -0500
 @@ -0,0 +1,57 @@
 +/****************************************************************************
 + * *
@@ -192,8 +192,8 @@ Index: qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.h
 +#endif // QTCHOOSERQTGATHERER_H
 Index: qtcreator/src/plugins/qtsupport/qtsupport.pro
 ===================================================================
---- qtcreator.orig/src/plugins/qtsupport/qtsupport.pro	2014-12-25 01:59:14.822719982 -0600
-+++ qtcreator/src/plugins/qtsupport/qtsupport.pro	2014-12-25 11:27:16.928737915 -0600
+--- qtcreator.orig/src/plugins/qtsupport/qtsupport.pro	2015-06-25 01:18:51.735947174 -0500
++++ qtcreator/src/plugins/qtsupport/qtsupport.pro	2015-06-25 01:18:51.731947228 -0500
 @@ -7,6 +7,7 @@
  include(../../shared/proparser/proparser.pri)
  
@@ -212,8 +212,8 @@ Index: qtcreator/src/plugins/qtsupport/qtsupport.pro
      codegensettingspage.cpp \
 Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 ===================================================================
---- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp	2014-12-25 01:59:14.822719982 -0600
-+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2014-12-25 11:27:56.452739452 -0600
+--- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp	2015-06-25 01:18:51.735947174 -0500
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2015-06-25 01:18:51.731947228 -0500
 @@ -34,6 +34,7 @@
  #include "qtversionfactory.h"
  #include "baseqtversion.h"
@@ -222,7 +222,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
  
  #include <coreplugin/icore.h>
  #include <coreplugin/helpmanager.h>
-@@ -436,15 +437,26 @@
+@@ -399,15 +400,26 @@
  
  static void findSystemQt()
  {
diff --git a/debian/patches/rpath_nonlinux.diff b/debian/patches/rpath_nonlinux.diff
index 320c7d0..fc8d2c6 100644
--- a/debian/patches/rpath_nonlinux.diff
+++ b/debian/patches/rpath_nonlinux.diff
@@ -13,8 +13,8 @@ Forwarded: no
 
 Index: qtcreator/src/rpath.pri
 ===================================================================
---- qtcreator.orig/src/rpath.pri	2014-12-25 01:53:23.534706324 -0600
-+++ qtcreator/src/rpath.pri	2014-12-25 01:54:23.126708641 -0600
+--- qtcreator.orig/src/rpath.pri	2015-06-25 01:14:15.299679763 -0500
++++ qtcreator/src/rpath.pri	2015-06-25 01:14:15.291679873 -0500
 @@ -1,6 +1,6 @@
  macx {
      QMAKE_LFLAGS += -Wl,-rpath, at loader_path/../,-rpath, at executable_path/../
@@ -25,9 +25,9 @@ Index: qtcreator/src/rpath.pri
      QMAKE_RPATHDIR += \$\$ORIGIN
 Index: qtcreator/src/qtcreatorplugin.pri
 ===================================================================
---- qtcreator.orig/src/qtcreatorplugin.pri	2014-12-25 01:53:23.534706324 -0600
-+++ qtcreator/src/qtcreatorplugin.pri	2014-12-25 01:53:23.530706324 -0600
-@@ -96,7 +96,7 @@
+--- qtcreator.orig/src/qtcreatorplugin.pri	2015-06-25 01:14:15.299679763 -0500
++++ qtcreator/src/qtcreatorplugin.pri	2015-06-25 01:14:15.295679819 -0500
+@@ -91,7 +91,7 @@
  
  TEMPLATE = lib
  CONFIG += plugin plugin_with_soname
@@ -38,8 +38,8 @@ Index: qtcreator/src/qtcreatorplugin.pri
      target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins
 Index: qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
 ===================================================================
---- qtcreator.orig/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro	2014-12-25 01:53:23.534706324 -0600
-+++ qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro	2014-12-25 01:53:23.530706324 -0600
+--- qtcreator.orig/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro	2015-06-25 01:14:15.299679763 -0500
++++ qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro	2015-06-25 01:14:15.295679819 -0500
 @@ -13,7 +13,7 @@
      IDE_LIBRARY_BASENAME = lib
  }

-- 
qtcreator packaging

More information about the pkg-kde-commits mailing list