qtcreator-plugin-remotelinux

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

  1. join_the_train
  2. Merge into trunk
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
lp:~bzoltan/qtcreator-plugin-remotelinux/join_the_train updated
8. By Zoltan Balogh

Add copyright headers

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

Looks good again.

review: Approve
lp:~bzoltan/qtcreator-plugin-remotelinux/join_the_train updated
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
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2014-04-09 11:27:52 +0000
@@ -0,0 +1,3 @@
1[BUILDDEB]
2split = true
3
04
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-09 06:43:10 +0000
+++ debian/changelog 2014-04-09 11:27:52 +0000
@@ -1,4 +1,4 @@
1qtcreator-plugin-remotelinux (3.0.1-0ubuntu1) trusty; urgency=medium1qtcreator-plugin-remotelinux (3.0.1-0ubuntu1) UNRELEASED; urgency=medium
22
3 [ Benjamin Zeller ]3 [ Benjamin Zeller ]
4 * Added debian packaging4 * Added debian packaging
55
=== modified file 'debian/control'
--- debian/control 2014-04-09 06:43:10 +0000
+++ debian/control 2014-04-09 11:27:52 +0000
@@ -24,7 +24,7 @@
24 ${shlibs:Depends},24 ${shlibs:Depends},
25Replaces: qtcreator (<= 3.0.1-0ubuntu3)25Replaces: qtcreator (<= 3.0.1-0ubuntu3)
26Breaks: qtcreator (<= 3.0.1-0ubuntu3)26Breaks: qtcreator (<= 3.0.1-0ubuntu3)
27Description: CMake plugin for Qt Creator IDE27Description: Remotelinux plugin for Qt Creator IDE
28 Qt Creator is a new, lightweight, cross-platform integrated development28 Qt Creator is a new, lightweight, cross-platform integrated development
29 environment (IDE) designed to make development with the Qt application29 environment (IDE) designed to make development with the Qt application
30 framework even faster and easier.30 framework even faster and easier.
@@ -39,7 +39,7 @@
39 qtcreator-plugin-remotelinux (= ${binary:Version}),39 qtcreator-plugin-remotelinux (= ${binary:Version}),
40Replaces: qtcreator (<= 3.0.1-0ubuntu3)40Replaces: qtcreator (<= 3.0.1-0ubuntu3)
41Breaks: qtcreator (<= 3.0.1-0ubuntu3)41Breaks: qtcreator (<= 3.0.1-0ubuntu3)
42Description: CMake plugin for Qt Creator IDE42Description: QNX plugin for Qt Creator IDE
43 Qt Creator is a new, lightweight, cross-platform integrated development43 Qt Creator is a new, lightweight, cross-platform integrated development
44 environment (IDE) designed to make development with the Qt application44 environment (IDE) designed to make development with the Qt application
45 framework even faster and easier.45 framework even faster and easier.
@@ -54,7 +54,7 @@
54 qtcreator-plugin-remotelinux (= ${binary:Version}),54 qtcreator-plugin-remotelinux (= ${binary:Version}),
55Replaces: qtcreator (<= 3.0.1-0ubuntu3)55Replaces: qtcreator (<= 3.0.1-0ubuntu3)
56Breaks: qtcreator (<= 3.0.1-0ubuntu3)56Breaks: qtcreator (<= 3.0.1-0ubuntu3)
57Description: CMake plugin for Qt Creator IDE57Description: Valgrind plugin for Qt Creator IDE
58 Qt Creator is a new, lightweight, cross-platform integrated development58 Qt Creator is a new, lightweight, cross-platform integrated development
59 environment (IDE) designed to make development with the Qt application59 environment (IDE) designed to make development with the Qt application
60 framework even faster and easier.60 framework even faster and easier.
@@ -67,7 +67,7 @@
67 ${misc:Depends},67 ${misc:Depends},
68Replaces: qtcreator-dev (<= 3.0.1-0ubuntu3)68Replaces: qtcreator-dev (<= 3.0.1-0ubuntu3)
69Breaks: qtcreator-dev (<= 3.0.1-0ubuntu3)69Breaks: qtcreator-dev (<= 3.0.1-0ubuntu3)
70Description: Qt Creator cmake plugin development files70Description: Qt Creator remotelinux plugin development files
71 This package contains the developer files for Qt71 This package contains the developer files for Qt
72 Creator remotelinux plugin development72 Creator remotelinux plugin development
7373
@@ -78,7 +78,7 @@
78 ${misc:Depends},78 ${misc:Depends},
79Replaces: qtcreator-dev (<= 3.0.1-0ubuntu3)79Replaces: qtcreator-dev (<= 3.0.1-0ubuntu3)
80Breaks: qtcreator-dev (<= 3.0.1-0ubuntu3)80Breaks: qtcreator-dev (<= 3.0.1-0ubuntu3)
81Description: Qt Creator cmake plugin development files81Description: Qt Creator valgrind plugin development files
82 This package contains the developer files for Qt82 This package contains the developer files for Qt
83 Creator cmake valgrind development83 Creator cmake valgrind development
8484
@@ -89,6 +89,6 @@
89 ${misc:Depends},89 ${misc:Depends},
90Replaces: qtcreator-dev (<= 3.0.1-0ubuntu3)90Replaces: qtcreator-dev (<= 3.0.1-0ubuntu3)
91Breaks: qtcreator-dev (<= 3.0.1-0ubuntu3)91Breaks: qtcreator-dev (<= 3.0.1-0ubuntu3)
92Description: Qt Creator cmake plugin development files92Description: Qt Creator qnx plugin development files
93 This package contains the developer files for Qt93 This package contains the developer files for Qt
94 Creator qnx plugin development94 Creator qnx plugin development
9595
=== modified file 'debian/qtcreator-plugin-qnx.install'
--- debian/qtcreator-plugin-qnx.install 2014-03-20 11:06:37 +0000
+++ debian/qtcreator-plugin-qnx.install 2014-04-09 11:27:52 +0000
@@ -1,4 +1,3 @@
1
2usr/lib/*/qtcreator/plugins/BlackBerry/Qnx.pluginspec1usr/lib/*/qtcreator/plugins/BlackBerry/Qnx.pluginspec
3usr/lib/*/qtcreator/plugins/BlackBerry/libQnx.so2usr/lib/*/qtcreator/plugins/BlackBerry/libQnx.so
4usr/share/qtcreator/templates/wizards/bb-bardescriptor3usr/share/qtcreator/templates/wizards/bb-bardescriptor
54
=== modified file 'debian/qtcreator-plugin-remotelinux.install'
--- debian/qtcreator-plugin-remotelinux.install 2014-03-18 10:51:43 +0000
+++ debian/qtcreator-plugin-remotelinux.install 2014-04-09 11:27:52 +0000
@@ -1,3 +1,2 @@
1
2usr/lib/*/qtcreator/plugins/QtProject/RemoteLinux.pluginspec1usr/lib/*/qtcreator/plugins/QtProject/RemoteLinux.pluginspec
3usr/lib/*/qtcreator/plugins/QtProject/libRemoteLinux.so2usr/lib/*/qtcreator/plugins/QtProject/libRemoteLinux.so
43
=== modified file 'debian/qtcreator-plugin-valgrind.install'
--- debian/qtcreator-plugin-valgrind.install 2014-03-18 10:51:43 +0000
+++ debian/qtcreator-plugin-valgrind.install 2014-04-09 11:27:52 +0000
@@ -1,3 +1,2 @@
1
2usr/lib/*/qtcreator/plugins/QtProject/Valgrind.pluginspec1usr/lib/*/qtcreator/plugins/QtProject/Valgrind.pluginspec
3usr/lib/*/qtcreator/plugins/QtProject/libValgrind.so2usr/lib/*/qtcreator/plugins/QtProject/libValgrind.so
43
=== modified file 'src/remotelinux/abstractremotelinuxrunconfiguration.cpp'
--- src/remotelinux/abstractremotelinuxrunconfiguration.cpp 2014-03-20 13:39:22 +0000
+++ src/remotelinux/abstractremotelinuxrunconfiguration.cpp 2014-04-09 11:27:52 +0000
@@ -1,3 +1,32 @@
1/****************************************************************************
2**
3** Copyright (C) 2014 Canonical Ltd.
4** Contact: http://www.qt-project.org/legal
5**
6** This file is part of Qt Creator.
7**
8** Commercial License Usage
9** Licensees holding valid commercial Qt licenses may use this file in
10** accordance with the commercial license agreement provided with the
11** Software or, alternatively, in accordance with the terms contained in
12** a written agreement between you and Digia. For licensing terms and
13** conditions see http://qt.digia.com/licensing. For further information
14** use the contact form at http://qt.digia.com/contact-us.
15**
16** GNU Lesser General Public License Usage
17** Alternatively, this file may be used under the terms of the GNU Lesser
18** General Public License version 2.1 as published by the Free Software
19** Foundation and appearing in the file LICENSE.LGPL included in the
20** packaging of this file. Please review the following information to
21** ensure the GNU Lesser General Public License version 2.1 requirements
22** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
23**
24** In addition, as a special exception, Digia gives you certain additional
25** rights. These rights are described in the Digia Qt LGPL Exception
26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
27**
28****************************************************************************/
29
1#include "abstractremotelinuxrunconfiguration.h"30#include "abstractremotelinuxrunconfiguration.h"
231
3namespace RemoteLinux {32namespace RemoteLinux {
433
=== modified file 'src/remotelinux/abstractremotelinuxrunconfiguration.h'
--- src/remotelinux/abstractremotelinuxrunconfiguration.h 2014-03-21 17:53:05 +0000
+++ src/remotelinux/abstractremotelinuxrunconfiguration.h 2014-04-09 11:27:52 +0000
@@ -1,3 +1,32 @@
1/****************************************************************************
2**
3** Copyright (C) 2014 Canonical Ltd.
4** Contact: http://www.qt-project.org/legal
5**
6** This file is part of Qt Creator.
7**
8** Commercial License Usage
9** Licensees holding valid commercial Qt licenses may use this file in
10** accordance with the commercial license agreement provided with the
11** Software or, alternatively, in accordance with the terms contained in
12** a written agreement between you and Digia. For licensing terms and
13** conditions see http://qt.digia.com/licensing. For further information
14** use the contact form at http://qt.digia.com/contact-us.
15**
16** GNU Lesser General Public License Usage
17** Alternatively, this file may be used under the terms of the GNU Lesser
18** General Public License version 2.1 as published by the Free Software
19** Foundation and appearing in the file LICENSE.LGPL included in the
20** packaging of this file. Please review the following information to
21** ensure the GNU Lesser General Public License version 2.1 requirements
22** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
23**
24** In addition, as a special exception, Digia gives you certain additional
25** rights. These rights are described in the Digia Qt LGPL Exception
26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
27**
28****************************************************************************/
29
1#ifndef REMOTELINUX_ABSTRACTREMOTELINUXRUNCONFIGURATION_H30#ifndef REMOTELINUX_ABSTRACTREMOTELINUXRUNCONFIGURATION_H
2#define REMOTELINUX_ABSTRACTREMOTELINUXRUNCONFIGURATION_H31#define REMOTELINUX_ABSTRACTREMOTELINUXRUNCONFIGURATION_H
332

Subscribers

People subscribed via source and target branches

to all changes: