kubuntu-packaging

Merge lp:~zeller-benjamin/kubuntu-packaging/qtcreator into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator

  1. qtcreator
  2. Merge into qtcreator
Proposed by Zoltan Balogh
Status: Needs review
Proposed branch: lp:~zeller-benjamin/kubuntu-packaging/qtcreator
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtcreator
Diff against target: 195 lines (+53/-28) (has conflicts)
6 files modified
debian/changelog (+9/-0)
debian/control (+3/-0)
debian/patches/disable_plugins.diff (+39/-8)
debian/patches/series (+1/-1)
debian/qtcreator.install (+0/-18)
debian/rules (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~zeller-benjamin/kubuntu-packaging/qtcreator
Reviewer Review Type Date Requested Status
Dmitry Shachnev Needs Fixing
Timo Jyrinki Pending
Review via email: mp+214891@code.launchpad.net

Commit message

Replace qnx, valgrind and remotelinux plugins with derived versiond

Description of the change

Replace qnx, valgrind and remotelinux plugins with derived versiond

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Why is this needed? What is the difference between the embedded plugins and external ones? Did you submit the patches to Debian or upstream?

Also, there is a conflict in debian/changelog, please resolve that before it can be merged.

review: Needs Fixing
Reply

Unmerged revisions

126. By Benjamin Zeller

-Remove remotelinux/qnx/valgrind plugins from install file

125. By Benjamin Zeller

Filter out removed plugins from the share directory

124. By Benjamin Zeller

Make qnx,remotelinux and valgrind plugins recommended packages

123. By Benjamin Zeller

* Replace Qnx,Remotelinux and Valgrind plugins with derived ones
  - Add debian/patches/disable_plugins.diff to disable QtC's versions
  - To be sorted out with upstream when Ubuntu's modifications ready

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-01 10:02:32 +0000
3+++ debian/changelog 2014-04-09 07:31:40 +0000
4@@ -1,9 +1,18 @@
5+<<<<<<< TREE
6 qtcreator (3.0.1-0ubuntu3) trusty; urgency=medium
7
8 * Rebuild against Qt Webkit 5.1.1
9
10 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 13 Mar 2014 14:23:24 +0000
11
12+=======
13+qtcreator (3.0.1-0ubuntu3) UNRELEASED; urgency=medium
14+
15+ * Replace qnx, valgrind and remotelinux plugins with derived versiond
16+
17+ -- Benjamin Zeller <benjamin.zeller@canonical.com> Mon, 31 Mar 2014 11:24:38 +0200
18+
19+>>>>>>> MERGE-SOURCE
20 qtcreator (3.0.1-0ubuntu2) trusty; urgency=medium
21
22 * Make qtcreator-plugin-cmake a Recommends instead
23
24=== modified file 'debian/control'
25--- debian/control 2014-04-01 10:02:32 +0000
26+++ debian/control 2014-04-09 07:31:40 +0000
27@@ -71,6 +71,9 @@
28 qtbase5-dev-tools,
29 qtcreator-doc,
30 qtcreator-plugin-cmake,
31+ qtcreator-plugin-remotelinux,
32+ qtcreator-plugin-valgrind,
33+ qtcreator-plugin-qnx,
34 qtdeclarative5-dev,
35 xterm | x-terminal-emulator,
36 Breaks: qtcreator-plugin-ubuntu (<= 2.9.0~),
37
38=== renamed file 'debian/patches/disable_cmake_plugin.diff' => 'debian/patches/disable_plugins.diff'
39--- debian/patches/disable_cmake_plugin.diff 2014-03-06 10:25:09 +0000
40+++ debian/patches/disable_plugins.diff 2014-04-09 07:31:40 +0000
41@@ -1,16 +1,17 @@
42-Description: Disable CMake plugin in order to use alternative one
43- This patch disables QtC's current upstream CMake plugin so that
44- qtcreator-plugin-cmake can be installed instead.
45+Description: Disable plugins in order to use alternative one
46+ This patch disables QtC's current upstream CMake,Valgrind,Qnx and
47+ Remotelinux plugin so that qtcreator-plugin-[cmake|valgrind|qnx|remotelinux]
48+ can be installed instead.
49 .
50- The Ubuntu's CMake plugin will be presented to upstream when it's
51+ The Ubuntu's plugins will be presented to upstream when it's
52 fully functional, to consider how to get the improvements to be part
53 of a future release of Qt Creator.
54 Author: Benjamin Zeller <benjamin.zeller@canonical.com>
55 Author: Zoltan Balogh <zoltan.balogh@canonical.com>
56
57 === modified file 'src/plugins/plugins.pro'
58---- a/src/plugins/plugins.pro 2013-12-02 09:16:15 +0000
59-+++ b/src/plugins/plugins.pro 2014-03-06 10:19:13 +0000
60+--- a/src/plugins/plugins.pro 2014-03-06 10:25:09 +0000
61++++ b/src/plugins/plugins.pro 2014-03-31 08:57:03 +0000
62 @@ -24,7 +24,6 @@
63 debugger \
64 help \
65@@ -19,10 +20,22 @@
66 autotoolsprojectmanager \
67 fakevim \
68 designer \
69+@@ -41,11 +40,8 @@
70+ analyzerbase \
71+ qmljstools \
72+ macros \
73+- remotelinux \
74+ android \
75+- valgrind \
76+ todo \
77+- qnx \
78+ clearcase \
79+ baremetal \
80+ ios
81
82 === modified file 'src/plugins/plugins.qbs'
83---- a/src/plugins/plugins.qbs 2013-12-02 09:15:30 +0000
84-+++ b/src/plugins/plugins.qbs 2014-03-06 10:19:13 +0000
85+--- a/src/plugins/plugins.qbs 2014-03-06 10:25:09 +0000
86++++ b/src/plugins/plugins.qbs 2014-03-31 08:57:31 +0000
87 @@ -13,7 +13,6 @@
88 "bookmarks/bookmarks.qbs",
89 "classview/classview.qbs",
90@@ -31,4 +44,22 @@
91 "coreplugin/coreplugin.qbs",
92 "coreplugin/images/logo/logo.qbs",
93 "cpaster/cpaster.qbs",
94+@@ -46,17 +45,14 @@
95+ "qmljstools/qmljstools.qbs",
96+ "qmlprofiler/qmlprofiler.qbs",
97+ "qmlprojectmanager/qmlprojectmanager.qbs",
98+- "qnx/qnx.qbs",
99+ "qmakeprojectmanager/qmakeprojectmanager.qbs",
100+ "qtsupport/qtsupport.qbs",
101+- "remotelinux/remotelinux.qbs",
102+ "resourceeditor/resourceeditor.qbs",
103+ "subversion/subversion.qbs",
104+ "tasklist/tasklist.qbs",
105+ "texteditor/texteditor.qbs",
106+ "todo/todo.qbs",
107+ "updateinfo/updateinfo.qbs",
108+- "valgrind/valgrind.qbs",
109+ "vcsbase/vcsbase.qbs",
110+ "welcome/welcome.qbs"
111+ ].concat(project.additionalPlugins)
112
113
114=== modified file 'debian/patches/series'
115--- debian/patches/series 2014-03-06 10:25:09 +0000
116+++ debian/patches/series 2014-04-09 07:31:40 +0000
117@@ -5,4 +5,4 @@
118
119 # Ubuntu patches
120 rpath_nonlinux.diff
121-disable_cmake_plugin.diff
122+disable_plugins.diff
123
124=== modified file 'debian/qtcreator.install'
125--- debian/qtcreator.install 2014-03-06 08:49:55 +0000
126+++ debian/qtcreator.install 2014-04-09 07:31:40 +0000
127@@ -24,8 +24,6 @@
128 usr/lib/*/qtcreator/libqbscore.so.1.1
129 usr/lib/*/qtcreator/libqbscore.so.1.1.1
130 usr/lib/*/qtcreator/libzeroconf.*
131-usr/lib/*/qtcreator/plugins/BlackBerry/Qnx.pluginspec
132-usr/lib/*/qtcreator/plugins/BlackBerry/libQnx.so
133 usr/lib/*/qtcreator/plugins/QtProject/AnalyzerBase.pluginspec
134 usr/lib/*/qtcreator/plugins/QtProject/Android.pluginspec
135 usr/lib/*/qtcreator/plugins/QtProject/AutotoolsProjectManager.pluginspec
136@@ -64,13 +62,11 @@
137 usr/lib/*/qtcreator/plugins/QtProject/QmlProfiler.pluginspec
138 usr/lib/*/qtcreator/plugins/QtProject/QmlProjectManager.pluginspec
139 usr/lib/*/qtcreator/plugins/QtProject/QtSupport.pluginspec
140-usr/lib/*/qtcreator/plugins/QtProject/RemoteLinux.pluginspec
141 usr/lib/*/qtcreator/plugins/QtProject/ResourceEditor.pluginspec
142 usr/lib/*/qtcreator/plugins/QtProject/Subversion.pluginspec
143 usr/lib/*/qtcreator/plugins/QtProject/TaskList.pluginspec
144 usr/lib/*/qtcreator/plugins/QtProject/TextEditor.pluginspec
145 usr/lib/*/qtcreator/plugins/QtProject/Todo.pluginspec
146-usr/lib/*/qtcreator/plugins/QtProject/Valgrind.pluginspec
147 usr/lib/*/qtcreator/plugins/QtProject/VcsBase.pluginspec
148 usr/lib/*/qtcreator/plugins/QtProject/Welcome.pluginspec
149 usr/lib/*/qtcreator/plugins/QtProject/libAnalyzerBase.so
150@@ -111,13 +107,11 @@
151 usr/lib/*/qtcreator/plugins/QtProject/libQmlProfiler.so
152 usr/lib/*/qtcreator/plugins/QtProject/libQmlProjectManager.so
153 usr/lib/*/qtcreator/plugins/QtProject/libQtSupport.so
154-usr/lib/*/qtcreator/plugins/QtProject/libRemoteLinux.so
155 usr/lib/*/qtcreator/plugins/QtProject/libResourceEditor.so
156 usr/lib/*/qtcreator/plugins/QtProject/libSubversion.so
157 usr/lib/*/qtcreator/plugins/QtProject/libTaskList.so
158 usr/lib/*/qtcreator/plugins/QtProject/libTextEditor.so
159 usr/lib/*/qtcreator/plugins/QtProject/libTodo.so
160-usr/lib/*/qtcreator/plugins/QtProject/libValgrind.so
161 usr/lib/*/qtcreator/plugins/QtProject/libVcsBase.so
162 usr/lib/*/qtcreator/plugins/QtProject/libWelcome.so
163 usr/lib/*/qtcreator/plugins/Sander/BareMetal.pluginspec
164@@ -805,18 +799,6 @@
165 usr/share/qtcreator/templates/shared/icon80.png
166 usr/share/qtcreator/templates/shared/manifest.aegis
167 usr/share/qtcreator/templates/wizards/README.txt
168-usr/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml
169-usr/share/qtcreator/templates/wizards/bb-bardescriptor/wizard.xml
170-usr/share/qtcreator/templates/wizards/bb-cascades-app/assets/main.qml
171-usr/share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml
172-usr/share/qtcreator/templates/wizards/bb-cascades-app/icon.png
173-usr/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
174-usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp
175-usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.h
176-usr/share/qtcreator/templates/wizards/bb-cascades-app/src/main.cpp
177-usr/share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml
178-usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml
179-usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/wizard.xml
180 usr/share/qtcreator/templates/wizards/codesnippet/main.cpp
181 usr/share/qtcreator/templates/wizards/codesnippet/project.pro
182 usr/share/qtcreator/templates/wizards/codesnippet/wizard.xml
183
184=== modified file 'debian/rules'
185--- debian/rules 2014-03-07 06:32:17 +0000
186+++ debian/rules 2014-04-09 07:31:40 +0000
187@@ -48,7 +48,7 @@
188 dh_auto_install --destdir=debian/tmp/usr
189 dh_auto_build -- install_docs INSTALL_ROOT=$(CURDIR)/debian/tmp/usr
190 mkdir -p debian/tmp/usr/src/qtcreator/
191- find | egrep -v '^\.\/doc|^\.\/share|^\.\/\.pc|^\.\/debian|^\.\/tests|^\.\/share|cmakeprojectmanager' | grep "\.pri\$$\|\.h\$$\|\.xsl\$$" | xargs -I{} cp --parents -r "{}" debian/tmp/usr/src/qtcreator
192+ find | egrep -v '^\.\/doc|^\.\/share|^\.\/\.pc|^\.\/debian|^\.\/tests|^\.\/share|cmakeprojectmanager|valgrind|qnx|remotelinux|Qnx' | grep "\.pri\$$\|\.h\$$\|\.xsl\$$" | xargs -I{} cp --parents -r "{}" debian/tmp/usr/src/qtcreator
193 cd debian/tmp/usr/src/qtcreator; cp -r builddir/* .; rm -R builddir
194
195 override_dh_auto_clean:

Subscribers

People subscribed via source and target branches