Merge lp:~tiagosh/dee-qt/dee-qt-version-bump into lp:dee-qt/0.2

Proposed by Tiago Salem Herrmann on 2012-02-13
Status: Merged
Approved by: Albert Astals Cid on 2012-02-13
Approved revision: 66
Merged at revision: 63
Proposed branch: lp:~tiagosh/dee-qt/dee-qt-version-bump
Merge into: lp:dee-qt/0.2
Diff against target: 25 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
debian/libqtdee2.symbols (+1/-0)
To merge this branch: bzr merge lp:~tiagosh/dee-qt/dee-qt-version-bump
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) 2012-02-13 Approve on 2012-02-13
Review via email: mp+92751@code.launchpad.net

Description of the change

update changelog and bump release

To post a comment you must log in.
Albert Astals Cid (aacid) wrote :

Building the package gives me a warning about new symbols being added, i think you need to update the libqtdee2.symbols file

review: Needs Fixing
Albert Astals Cid (aacid) wrote :

Works here

review: Approve
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee-qt/8/console reported an error when processing this lp:~tiagosh/dee-qt/dee-qt-version-bump branch.
Not merging it.

Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee-qt/9/console reported an error when processing this lp:~tiagosh/dee-qt/dee-qt-version-bump branch.
Not merging it.

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 2012-01-13 08:08:16 +0000
3+++ debian/changelog 2012-02-13 15:59:07 +0000
4@@ -1,3 +1,9 @@
5+libqtdee (0.2.4-0ubuntu1) precise; urgency=low
6+
7+ * add new method that makes libqtdee able to handle local models
8+
9+ -- Tiago Salem Herrmann <tiago.herrmann@canonical.com> Mon, 13 Feb 2012 10:22:36 -0200
10+
11 libqtdee (0.2.3-0ubuntu2) precise; urgency=low
12
13 * debian/control:
14
15=== modified file 'debian/libqtdee2.symbols'
16--- debian/libqtdee2.symbols 2011-07-27 22:16:14 +0000
17+++ debian/libqtdee2.symbols 2012-02-13 15:59:07 +0000
18@@ -9,6 +9,7 @@
19 _ZN12DeeListModel3getEi@Base 0.2.2
20 _ZN12DeeListModel5countEv@Base 0.2.2
21 _ZN12DeeListModel7setNameERK7QString@Base 0.1
22+ _ZN12DeeListModel8setModelEP9_DeeModel@Base 0.2.4
23 _ZN12DeeListModelC1EP7QObject@Base 0.1
24 _ZN12DeeListModelC2EP7QObject@Base 0.1
25 _ZN12DeeListModelD0Ev@Base 0.1

Subscribers

People subscribed via source and target branches