Merge lp:~bzoltan/qtcreator-plugin-remotelinux/join_the_train into lp:qtcreator-plugin-remotelinux

Proposed by Zoltan Balogh
Status: Merged
Merged at revision: 8
Proposed branch: lp:~bzoltan/qtcreator-plugin-remotelinux/join_the_train
Merge into: lp:qtcreator-plugin-remotelinux
Diff against target: 173 lines (+68/-10)
8 files modified
.bzr-builddeb/default.conf (+3/-0)
debian/changelog (+1/-1)
debian/control (+6/-6)
debian/qtcreator-plugin-qnx.install (+0/-1)
debian/qtcreator-plugin-remotelinux.install (+0/-1)
debian/qtcreator-plugin-valgrind.install (+0/-1)
src/remotelinux/abstractremotelinuxrunconfiguration.cpp (+29/-0)
src/remotelinux/abstractremotelinuxrunconfiguration.h (+29/-0)
To merge this branch: bzr merge lp:~bzoltan/qtcreator-plugin-remotelinux/join_the_train
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Review via email: mp+214892@code.launchpad.net

Commit message

Join the CI train for the first release (LP: #1302620)

Description of the change

Join the CI train

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Packaging fixes were merged

review: Approve
8. By Zoltan Balogh

Add copyright headers

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good again.

review: Approve
9. By Zoltan Balogh

The .bzr-builddeb added

10. By Zoltan Balogh

Change the release to UNRELEASED in the changelog

11. By Zoltan Balogh

removed empty lines from the install files

12. By Zoltan Balogh

Fix the short descriptions in the debian/control file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2014-04-09 11:27:52 +0000
5@@ -0,0 +1,3 @@
6+[BUILDDEB]
7+split = true
8+
9
10=== modified file 'debian/changelog'
11--- debian/changelog 2014-04-09 06:43:10 +0000
12+++ debian/changelog 2014-04-09 11:27:52 +0000
13@@ -1,4 +1,4 @@
14-qtcreator-plugin-remotelinux (3.0.1-0ubuntu1) trusty; urgency=medium
15+qtcreator-plugin-remotelinux (3.0.1-0ubuntu1) UNRELEASED; urgency=medium
16
17 [ Benjamin Zeller ]
18 * Added debian packaging
19
20=== modified file 'debian/control'
21--- debian/control 2014-04-09 06:43:10 +0000
22+++ debian/control 2014-04-09 11:27:52 +0000
23@@ -24,7 +24,7 @@
24 ${shlibs:Depends},
25 Replaces: qtcreator (<= 3.0.1-0ubuntu3)
26 Breaks: qtcreator (<= 3.0.1-0ubuntu3)
27-Description: CMake plugin for Qt Creator IDE
28+Description: Remotelinux plugin for Qt Creator IDE
29 Qt Creator is a new, lightweight, cross-platform integrated development
30 environment (IDE) designed to make development with the Qt application
31 framework even faster and easier.
32@@ -39,7 +39,7 @@
33 qtcreator-plugin-remotelinux (= ${binary:Version}),
34 Replaces: qtcreator (<= 3.0.1-0ubuntu3)
35 Breaks: qtcreator (<= 3.0.1-0ubuntu3)
36-Description: CMake plugin for Qt Creator IDE
37+Description: QNX plugin for Qt Creator IDE
38 Qt Creator is a new, lightweight, cross-platform integrated development
39 environment (IDE) designed to make development with the Qt application
40 framework even faster and easier.
41@@ -54,7 +54,7 @@
42 qtcreator-plugin-remotelinux (= ${binary:Version}),
43 Replaces: qtcreator (<= 3.0.1-0ubuntu3)
44 Breaks: qtcreator (<= 3.0.1-0ubuntu3)
45-Description: CMake plugin for Qt Creator IDE
46+Description: Valgrind plugin for Qt Creator IDE
47 Qt Creator is a new, lightweight, cross-platform integrated development
48 environment (IDE) designed to make development with the Qt application
49 framework even faster and easier.
50@@ -67,7 +67,7 @@
51 ${misc:Depends},
52 Replaces: qtcreator-dev (<= 3.0.1-0ubuntu3)
53 Breaks: qtcreator-dev (<= 3.0.1-0ubuntu3)
54-Description: Qt Creator cmake plugin development files
55+Description: Qt Creator remotelinux plugin development files
56 This package contains the developer files for Qt
57 Creator remotelinux plugin development
58
59@@ -78,7 +78,7 @@
60 ${misc:Depends},
61 Replaces: qtcreator-dev (<= 3.0.1-0ubuntu3)
62 Breaks: qtcreator-dev (<= 3.0.1-0ubuntu3)
63-Description: Qt Creator cmake plugin development files
64+Description: Qt Creator valgrind plugin development files
65 This package contains the developer files for Qt
66 Creator cmake valgrind development
67
68@@ -89,6 +89,6 @@
69 ${misc:Depends},
70 Replaces: qtcreator-dev (<= 3.0.1-0ubuntu3)
71 Breaks: qtcreator-dev (<= 3.0.1-0ubuntu3)
72-Description: Qt Creator cmake plugin development files
73+Description: Qt Creator qnx plugin development files
74 This package contains the developer files for Qt
75 Creator qnx plugin development
76
77=== modified file 'debian/qtcreator-plugin-qnx.install'
78--- debian/qtcreator-plugin-qnx.install 2014-03-20 11:06:37 +0000
79+++ debian/qtcreator-plugin-qnx.install 2014-04-09 11:27:52 +0000
80@@ -1,4 +1,3 @@
81-
82 usr/lib/*/qtcreator/plugins/BlackBerry/Qnx.pluginspec
83 usr/lib/*/qtcreator/plugins/BlackBerry/libQnx.so
84 usr/share/qtcreator/templates/wizards/bb-bardescriptor
85
86=== modified file 'debian/qtcreator-plugin-remotelinux.install'
87--- debian/qtcreator-plugin-remotelinux.install 2014-03-18 10:51:43 +0000
88+++ debian/qtcreator-plugin-remotelinux.install 2014-04-09 11:27:52 +0000
89@@ -1,3 +1,2 @@
90-
91 usr/lib/*/qtcreator/plugins/QtProject/RemoteLinux.pluginspec
92 usr/lib/*/qtcreator/plugins/QtProject/libRemoteLinux.so
93
94=== modified file 'debian/qtcreator-plugin-valgrind.install'
95--- debian/qtcreator-plugin-valgrind.install 2014-03-18 10:51:43 +0000
96+++ debian/qtcreator-plugin-valgrind.install 2014-04-09 11:27:52 +0000
97@@ -1,3 +1,2 @@
98-
99 usr/lib/*/qtcreator/plugins/QtProject/Valgrind.pluginspec
100 usr/lib/*/qtcreator/plugins/QtProject/libValgrind.so
101
102=== modified file 'src/remotelinux/abstractremotelinuxrunconfiguration.cpp'
103--- src/remotelinux/abstractremotelinuxrunconfiguration.cpp 2014-03-20 13:39:22 +0000
104+++ src/remotelinux/abstractremotelinuxrunconfiguration.cpp 2014-04-09 11:27:52 +0000
105@@ -1,3 +1,32 @@
106+/****************************************************************************
107+**
108+** Copyright (C) 2014 Canonical Ltd.
109+** Contact: http://www.qt-project.org/legal
110+**
111+** This file is part of Qt Creator.
112+**
113+** Commercial License Usage
114+** Licensees holding valid commercial Qt licenses may use this file in
115+** accordance with the commercial license agreement provided with the
116+** Software or, alternatively, in accordance with the terms contained in
117+** a written agreement between you and Digia. For licensing terms and
118+** conditions see http://qt.digia.com/licensing. For further information
119+** use the contact form at http://qt.digia.com/contact-us.
120+**
121+** GNU Lesser General Public License Usage
122+** Alternatively, this file may be used under the terms of the GNU Lesser
123+** General Public License version 2.1 as published by the Free Software
124+** Foundation and appearing in the file LICENSE.LGPL included in the
125+** packaging of this file. Please review the following information to
126+** ensure the GNU Lesser General Public License version 2.1 requirements
127+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
128+**
129+** In addition, as a special exception, Digia gives you certain additional
130+** rights. These rights are described in the Digia Qt LGPL Exception
131+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
132+**
133+****************************************************************************/
134+
135 #include "abstractremotelinuxrunconfiguration.h"
136
137 namespace RemoteLinux {
138
139=== modified file 'src/remotelinux/abstractremotelinuxrunconfiguration.h'
140--- src/remotelinux/abstractremotelinuxrunconfiguration.h 2014-03-21 17:53:05 +0000
141+++ src/remotelinux/abstractremotelinuxrunconfiguration.h 2014-04-09 11:27:52 +0000
142@@ -1,3 +1,32 @@
143+/****************************************************************************
144+**
145+** Copyright (C) 2014 Canonical Ltd.
146+** Contact: http://www.qt-project.org/legal
147+**
148+** This file is part of Qt Creator.
149+**
150+** Commercial License Usage
151+** Licensees holding valid commercial Qt licenses may use this file in
152+** accordance with the commercial license agreement provided with the
153+** Software or, alternatively, in accordance with the terms contained in
154+** a written agreement between you and Digia. For licensing terms and
155+** conditions see http://qt.digia.com/licensing. For further information
156+** use the contact form at http://qt.digia.com/contact-us.
157+**
158+** GNU Lesser General Public License Usage
159+** Alternatively, this file may be used under the terms of the GNU Lesser
160+** General Public License version 2.1 as published by the Free Software
161+** Foundation and appearing in the file LICENSE.LGPL included in the
162+** packaging of this file. Please review the following information to
163+** ensure the GNU Lesser General Public License version 2.1 requirements
164+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
165+**
166+** In addition, as a special exception, Digia gives you certain additional
167+** rights. These rights are described in the Digia Qt LGPL Exception
168+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
169+**
170+****************************************************************************/
171+
172 #ifndef REMOTELINUX_ABSTRACTREMOTELINUXRUNCONFIGURATION_H
173 #define REMOTELINUX_ABSTRACTREMOTELINUXRUNCONFIGURATION_H
174

Subscribers

People subscribed via source and target branches

to all changes: