ubuntu-download-manager

Merge lp:~mandel/ubuntu-download-manager/move-gcc5 into lp:ubuntu-download-manager

  1. move-gcc5
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Approved
Approved by: Alfonso Sanchez-Beato
Approved revision: 341
Proposed branch: lp:~mandel/ubuntu-download-manager/move-gcc5
Merge into: lp:ubuntu-download-manager
Diff against target: 287 lines (+46/-45)
12 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-0)
debian/control (+29/-29)
debian/libubuntu-download-manager-client2.install (+1/-1)
debian/libubuntu-download-manager-client2.symbols (+1/-4)
debian/libubuntu-download-manager-common2.install (+1/-1)
debian/libubuntu-download-manager-common2.symbols (+1/-3)
debian/libubuntu-upload-manager-common2.install (+1/-1)
debian/libubuntu-upload-manager-common2.symbols (+1/-1)
debian/libudm-common2.install (+1/-1)
debian/libudm-common2.symbols (+2/-2)
debian/libudm-priv-common2.install (+1/-1)
To merge this branch: bzr merge lp:~mandel/ubuntu-download-manager/move-gcc5
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Alfonso Sanchez-Beato Approve
Review via email: mp+266530@code.launchpad.net

Commit message

Pump major version and update the symbols file following the move to gcc5.

Description of the change

Pump major version and update the symbols file following the move to gcc5.

To post a comment you must log in.
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve
Reply
lp:~mandel/ubuntu-download-manager/move-gcc5 updated
342. By Manuel de la Peña

Update version and release in changelog.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:341
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/767/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/767/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

342. By Manuel de la Peña

Update version and release in changelog.

341. By Manuel de la Peña

Update symbols and bump version number to adapt to the move to gcc5.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-07-23 14:02:27 +0000
3+++ CMakeLists.txt 2015-07-31 10:23:21 +0000
4@@ -30,7 +30,7 @@
5 OUTPUT_STRIP_TRAILING_WHITESPACE
6 )
7
8-set(UDM_VERSION_MAJOR 1)
9+set(UDM_VERSION_MAJOR 2)
10 set(UDM_VERSION_MINOR 0)
11 set(UDM_VERSION_PATCH 0)
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2015-07-24 16:44:28 +0000
16+++ debian/changelog 2015-07-31 10:23:21 +0000
17@@ -1,3 +1,9 @@
18+ubuntu-download-manager (2.0.0) wily; urgency=medium
19+
20+ * Update the symbols file following the move to gcc5.
21+
22+ -- Manuel de la Pena <manuel.delapena@canonical.com> Fri, 31 Jul 2015 11:39:09 +0200
23+
24 ubuntu-download-manager (1.0+15.10.20150724-0ubuntu1) wily; urgency=medium
25
26 [ Manuel de la Pena ]
27
28=== modified file 'debian/control'
29--- debian/control 2015-07-23 14:02:27 +0000
30+++ debian/control 2015-07-31 10:23:21 +0000
31@@ -27,7 +27,7 @@
32 # upstream branch
33 Vcs-Bzr: lp:ubuntu-download-manager
34
35-Package: libudm-common1
36+Package: libudm-common2
37 Section: libs
38 Architecture: any
39 Depends: ${misc:Depends},
40@@ -42,7 +42,7 @@
41 Package: libudm-common-dev
42 Section: libdevel
43 Architecture: any
44-Depends: libudm-common1 (= ${binary:Version}),
45+Depends: libudm-common2 (= ${binary:Version}),
46 qtbase5-dev,
47 ${shlibs:Depends},
48 ${misc:Depends}
49@@ -50,27 +50,27 @@
50 This package contains the common headers shared between the client library and
51 the daemon library.
52
53-Package: libudm-priv-common1
54+Package: libudm-priv-common2
55 Section: libs
56 Architecture: any
57 Depends: ${misc:Depends},
58 ${shlibs:Depends},
59- libudm-common1 (= ${binary:Version}),
60-Breaks: libubuntu-download-manager-priv1
61-Replaces: libubuntu-download-manager-priv1
62+ libudm-common2 (= ${binary:Version}),
63+Breaks: libubuntu-download-manager-priv2
64+Replaces: libubuntu-download-manager-priv2
65 Description: Upload Download Manager - shared private library
66 Upload Download Manager performs downloads from a centralized location.
67 .
68 This package includes the private shared library.
69
70-Package: libubuntu-download-manager-common1
71+Package: libubuntu-download-manager-common2
72 Section: libs
73 Architecture: any
74-Depends: libudm-common1 (= ${binary:Version}),
75+Depends: libudm-common2 (= ${binary:Version}),
76 ${misc:Depends},
77 ${shlibs:Depends},
78-Breaks: ubuntu-download-manager-common1
79-Replaces: ubuntu-download-manager-common1
80+Breaks: ubuntu-download-manager-common2
81+Replaces: ubuntu-download-manager-common2
82 Description: Ubuntu Download Manager - shared common library
83 Ubuntu Download Manager performs downloads from a centralized location.
84 .
85@@ -81,7 +81,7 @@
86 Section: libdevel
87 Architecture: any
88 Depends: libudm-common-dev (= ${binary:Version}),
89- libubuntu-download-manager-common1 (= ${binary:Version}),
90+ libubuntu-download-manager-common2 (= ${binary:Version}),
91 qtbase5-dev,
92 ${shlibs:Depends},
93 ${misc:Depends}
94@@ -91,15 +91,15 @@
95 This package contains the common headers shared between the client library and
96 the daemon library.
97
98-Package: libubuntu-download-manager-client1
99+Package: libubuntu-download-manager-client2
100 Section: libs
101 Architecture: any
102 Depends: ${misc:Depends},
103 ${shlibs:Depends},
104- libudm-common1 (= ${binary:Version}),
105- libubuntu-download-manager-common1 (= ${binary:Version}),
106-Breaks: ubuntu-download-manager-client1
107-Replaces: ubuntu-download-manager-client1
108+ libudm-common2 (= ${binary:Version}),
109+ libubuntu-download-manager-common2 (= ${binary:Version}),
110+Breaks: ubuntu-download-manager-client2
111+Replaces: ubuntu-download-manager-client2
112 Description: Ubuntu Download Manager - shared public library
113 Ubuntu Download Manager performs downloads from a centralized location.
114 .
115@@ -110,7 +110,7 @@
116 Architecture: any
117 Depends: libudm-common-dev (= ${binary:Version}),
118 libubuntu-download-manager-common-dev (= ${binary:Version}),
119- libubuntu-download-manager-client1 (= ${binary:Version}),
120+ libubuntu-download-manager-client2 (= ${binary:Version}),
121 qtbase5-dev,
122 ${shlibs:Depends},
123 ${misc:Depends}
124@@ -128,10 +128,10 @@
125 Description: Documentation files for libcontent-hub-dev
126 Documentation files for the libcontent-hub development
127
128-Package: libubuntu-upload-manager-common1
129+Package: libubuntu-upload-manager-common2
130 Section: libs
131 Architecture: any
132-Depends: libudm-common1 (= ${binary:Version}),
133+Depends: libudm-common2 (= ${binary:Version}),
134 ${misc:Depends},
135 ${shlibs:Depends},
136 Description: Ubuntu Upload Manager - shared common library
137@@ -144,7 +144,7 @@
138 Section: libdevel
139 Architecture: any
140 Depends: libudm-common-dev (= ${binary:Version}),
141- libubuntu-download-manager-common1 (= ${binary:Version}),
142+ libubuntu-download-manager-common2 (= ${binary:Version}),
143 qtbase5-dev,
144 ${shlibs:Depends},
145 ${misc:Depends}
146@@ -157,9 +157,9 @@
147 Architecture: any
148 Depends: ${misc:Depends},
149 ${shlibs:Depends},
150- libudm-common1 (= ${binary:Version}),
151- libudm-priv-common1 (= ${binary:Version}),
152- libubuntu-download-manager-common1 (= ${binary:Version}),
153+ libudm-common2 (= ${binary:Version}),
154+ libudm-priv-common2 (= ${binary:Version}),
155+ libubuntu-download-manager-common2 (= ${binary:Version}),
156 unzip
157 Suggests: apparmor
158 Description: Ubuntu Download Manager - daemon
159@@ -172,9 +172,9 @@
160 Architecture: any
161 Depends: ${misc:Depends},
162 ${shlibs:Depends},
163- libudm-common1 (= ${binary:Version}),
164- libudm-priv-common1 (= ${binary:Version}),
165- libubuntu-upload-manager-common1 (= ${binary:Version}),
166+ libudm-common2 (= ${binary:Version}),
167+ libudm-priv-common2 (= ${binary:Version}),
168+ libubuntu-upload-manager-common2 (= ${binary:Version}),
169 Description: Ubuntu Upload Manager - daemon
170 Ubuntu Upload Manager performs uploads from a centralized location.
171 .
172@@ -185,9 +185,9 @@
173 Architecture: any
174 Depends: ${misc:Depends},
175 ${shlibs:Depends},
176- libudm-common1 (= ${binary:Version}),
177- libubuntu-download-manager-common1 (= ${binary:Version}),
178- libubuntu-download-manager-client1 (= ${binary:Version})
179+ libudm-common2 (= ${binary:Version}),
180+ libubuntu-download-manager-common2 (= ${binary:Version}),
181+ libubuntu-download-manager-client2 (= ${binary:Version})
182 Description: Ubuntu Download Manager Plugin
183 This package contains a QML Plugin to handle downloads from a pure QML
184 application, without the need to write any C++ code.
185
186=== renamed file 'debian/libubuntu-download-manager-client1.install' => 'debian/libubuntu-download-manager-client2.install'
187--- debian/libubuntu-download-manager-client1.install 2015-07-23 14:02:27 +0000
188+++ debian/libubuntu-download-manager-client2.install 2015-07-31 10:23:21 +0000
189@@ -1,1 +1,1 @@
190-usr/lib/*/libubuntu-download-manager-client.so.1*
191+usr/lib/*/libubuntu-download-manager-client.so.2*
192
193=== renamed file 'debian/libubuntu-download-manager-client1.symbols' => 'debian/libubuntu-download-manager-client2.symbols'
194--- debian/libubuntu-download-manager-client1.symbols 2015-07-24 16:44:28 +0000
195+++ debian/libubuntu-download-manager-client2.symbols 2015-07-31 10:23:21 +0000
196@@ -1,4 +1,4 @@
197-libubuntu-download-manager-client.so.1 libubuntu-download-manager-client1 #MINVER#
198+libubuntu-download-manager-client.so.2 libubuntu-download-manager-client2 #MINVER#
199 (c++)"Ubuntu::DownloadManager::NetworkError::errorString()@Base" 0.4+14.10.20140618
200 (c++)"Ubuntu::DownloadManager::NetworkError::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.4+14.10.20140618
201 (c++)"Ubuntu::DownloadManager::NetworkError::qt_metacast(char const*)@Base" 0.4+14.10.20140618
202@@ -94,9 +94,6 @@
203 (c++)"Ubuntu::DownloadManager::AuthError::metaObject() const@Base" 0.4+14.10.20140618
204 (c++)"Ubuntu::DownloadManager::DBusError::metaObject() const@Base" 0.4+14.10.20140618
205 (c++)"Ubuntu::DownloadManager::HttpError::metaObject() const@Base" 0.4+14.10.20140618
206- (c++)"std::function<void (Ubuntu::DownloadManager::DownloadsList*)>::operator()(Ubuntu::DownloadManager::DownloadsList*) const@Base" 0.4+14.10.20140618
207- (c++)"std::function<void (Ubuntu::DownloadManager::GroupDownload*)>::operator()(Ubuntu::DownloadManager::GroupDownload*) const@Base" 0.4+14.10.20140618
208- (c++)"std::function<void (Ubuntu::DownloadManager::Download*)>::operator()(Ubuntu::DownloadManager::Download*) const@Base" 0.4+14.10.20140618
209 (c++)"std::function<void (Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
210 (c++)"std::function<void (Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
211 (c++)"std::function<void (Ubuntu::DownloadManager::GroupDownload*)>::function(std::function<void (Ubuntu::DownloadManager::GroupDownload*)> const&)@Base" 0.4+14.10.20140618
212
213=== renamed file 'debian/libubuntu-download-manager-common1.install' => 'debian/libubuntu-download-manager-common2.install'
214--- debian/libubuntu-download-manager-common1.install 2015-07-23 14:02:27 +0000
215+++ debian/libubuntu-download-manager-common2.install 2015-07-31 10:23:21 +0000
216@@ -1,1 +1,1 @@
217-usr/lib/*/libubuntu-download-manager-common.so.1*
218+usr/lib/*/libubuntu-download-manager-common.so.2*
219
220=== renamed file 'debian/libubuntu-download-manager-common1.symbols' => 'debian/libubuntu-download-manager-common2.symbols'
221--- debian/libubuntu-download-manager-common1.symbols 2015-07-23 14:02:27 +0000
222+++ debian/libubuntu-download-manager-common2.symbols 2015-07-31 10:23:21 +0000
223@@ -1,4 +1,4 @@
224-libubuntu-download-manager-common.so.1 libubuntu-download-manager-common1 #MINVER#
225+libubuntu-download-manager-common.so.2 libubuntu-download-manager-common2 #MINVER#
226 (c++)"Ubuntu::DownloadManager::DownloadStruct::getHeaders()@Base" 0.4+14.10.20140618
227 (c++)"Ubuntu::DownloadManager::DownloadStruct::getMetadata()@Base" 0.4+14.10.20140618
228 (c++)"Ubuntu::DownloadManager::DownloadStruct::getAlgorithm()@Base" 0.4+14.10.20140618
229@@ -21,8 +21,6 @@
230 (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(QString const&, QString const&, QString const&)@Base" 0.4+14.10.20140618
231 (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(Ubuntu::DownloadManager::GroupDownloadStruct const&)@Base" 0.4+14.10.20140618
232 (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct()@Base" 0.4+14.10.20140618
233- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::~GroupDownloadStruct()@Base" 0.4+14.10.20140618
234- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::~GroupDownloadStruct()@Base" 0.4+14.10.20140618
235 (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::operator=(Ubuntu::DownloadManager::GroupDownloadStruct const&)@Base" 0.4+14.10.20140618
236 (c++)"Ubuntu::DownloadManager::operator<<(QDBusArgument&, Ubuntu::DownloadManager::DownloadStruct const&)@Base" 0.4+14.10.20140618
237 (c++)"Ubuntu::DownloadManager::operator<<(QDBusArgument&, Ubuntu::DownloadManager::GroupDownloadStruct const&)@Base" 0.4+14.10.20140618
238
239=== renamed file 'debian/libubuntu-upload-manager-common1.install' => 'debian/libubuntu-upload-manager-common2.install'
240--- debian/libubuntu-upload-manager-common1.install 2015-07-23 14:02:27 +0000
241+++ debian/libubuntu-upload-manager-common2.install 2015-07-31 10:23:21 +0000
242@@ -1,1 +1,1 @@
243-usr/lib/*/libubuntu-upload-manager-common.so.1*
244+usr/lib/*/libubuntu-upload-manager-common.so.2*
245
246=== renamed file 'debian/libubuntu-upload-manager-common1.symbols' => 'debian/libubuntu-upload-manager-common2.symbols'
247--- debian/libubuntu-upload-manager-common1.symbols 2015-07-23 14:02:27 +0000
248+++ debian/libubuntu-upload-manager-common2.symbols 2015-07-31 10:23:21 +0000
249@@ -1,4 +1,4 @@
250-libubuntu-upload-manager-common.so.1 libubuntu-upload-manager-common1 #MINVER#
251+libubuntu-upload-manager-common.so.2 libubuntu-upload-manager-common2 #MINVER#
252 (c++)"Ubuntu::UploadManager::UploadStruct::getHeaders()@Base" 0.4+14.10.20140618
253 (c++)"Ubuntu::UploadManager::UploadStruct::getFilePath()@Base" 0.4+14.10.20140618
254 (c++)"Ubuntu::UploadManager::UploadStruct::getMetadata()@Base" 0.4+14.10.20140618
255
256=== renamed file 'debian/libudm-common1.install' => 'debian/libudm-common2.install'
257--- debian/libudm-common1.install 2015-07-23 14:02:27 +0000
258+++ debian/libudm-common2.install 2015-07-31 10:23:21 +0000
259@@ -1,1 +1,1 @@
260-usr/lib/*/libudm-common.so.1*
261+usr/lib/*/libudm-common.so.2*
262
263=== renamed file 'debian/libudm-common1.symbols' => 'debian/libudm-common2.symbols'
264--- debian/libudm-common1.symbols 2015-07-24 16:44:28 +0000
265+++ debian/libudm-common2.symbols 2015-07-31 10:23:21 +0000
266@@ -1,4 +1,4 @@
267-libudm-common.so.1 libudm-common1 #MINVER#
268+libudm-common.so.2 libudm-common2 #MINVER#
269 (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(Ubuntu::Transfers::Errors::AuthErrorStruct const&)@Base" 0.4+14.10.20140618
270 (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct()@Base" 0.4+14.10.20140618
271 (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(Ubuntu::Transfers::Errors::AuthErrorStruct const&)@Base" 0.4+14.10.20140618
272@@ -56,7 +56,7 @@
273 (c++)"Ubuntu::Transfers::System::Logger::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.4+14.10.20140618
274 (c++)"Ubuntu::Transfers::System::Logger::qt_metacast(char const*)@Base" 0.4+14.10.20140618
275 (c++)"Ubuntu::Transfers::System::Logger::setLogLevel(QtMsgType)@Base" 0.4+14.10.20140618
276- (c++)"Ubuntu::Transfers::System::Logger::toStdString(QString const&)@Base" 0.4+14.10.20140618
277+ (c++)"Ubuntu::Transfers::System::Logger::toStdString[abi:cxx11](QString const&)@Base" 0replaceme
278 (c++)"Ubuntu::Transfers::System::Logger::setupLogging(QString)@Base" 0.4+14.10.20140618
279 (c++)"Ubuntu::Transfers::System::Logger::staticMetaObject@Base" 0.4+14.10.20140618
280 (c++)"Ubuntu::Transfers::System::Logger::getLogDir()@Base" 0.4+14.10.20140618
281
282=== renamed file 'debian/libudm-priv-common1.install' => 'debian/libudm-priv-common2.install'
283--- debian/libudm-priv-common1.install 2015-07-23 14:02:27 +0000
284+++ debian/libudm-priv-common2.install 2015-07-31 10:23:21 +0000
285@@ -1,1 +1,1 @@
286-usr/lib/*/libudm-priv-common.so.1*
287+usr/lib/*/libudm-priv-common.so.2*

Subscribers

People subscribed via source and target branches