Merge lp:~ampelbein/dee-qt/lp-765994 into lp:dee-qt/0.2

Proposed by Andreas Moog
Status: Rejected
Rejected by: Florian Boucault
Proposed branch: lp:~ampelbein/dee-qt/lp-765994
Merge into: lp:dee-qt/0.2
Diff against target: 45 lines (+11/-1)
2 files modified
debian/changelog (+7/-0)
debian/libqtdee2.symbols (+4/-1)
To merge this branch: bzr merge lp:~ampelbein/dee-qt/lp-765994
Reviewer Review Type Date Requested Status
Luke Yelavich (community) Disapprove
Florian Boucault Pending
Review via email: mp+65694@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Luke Yelavich (themuso) wrote :

Unfortunately the Ubuntu devs cannot review this branch, because it is under the unity-2d team. Only a member of the unity-2d team can review this branch, so I suggest you add the unity-2d team as a reviewer.

review: Disapprove
Revision history for this message
Andreas Moog (ampelbein) wrote :

Added unity-2d. It seems to me that this whole UDD lacks the usability of the plain old "Attach a debdiff to the bug". :-(

Revision history for this message
Florian Boucault (fboucault) wrote :

Thanks a lot for raising the issue Andreas! I added the symbols in trunk like you suggested. I also marked all the weak symbols that are not meant to be exposed by the library as optional.
The build should be fixed now (it works here).

Revision history for this message
Florian Boucault (fboucault) wrote :

(I marked the merge request as 'rejected': it seems there is no other clean manner to get it out of the way)

Unmerged revisions

39. By Andreas Moog

debian/libqtdee2.symbols: (LP: #765994)
update symbols-file to fix FTBFS in oneiric

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 2011-03-23 18:03:00 +0000
3+++ debian/changelog 2011-06-23 16:48:35 +0000
4@@ -1,3 +1,10 @@
5+libqtdee (0.2.2-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/libqtdee2.symbols: (LP: #765994)
8+ update symbols-file to fix FTBFS in oneiric
9+
10+ -- Andreas Moog <amoog@ubuntu.com> Thu, 23 Jun 2011 16:40:57 +0000
11+
12 libqtdee (0.2.2-0ubuntu1) natty; urgency=low
13
14 * New upstream bugfix release
15
16=== modified file 'debian/libqtdee2.symbols'
17--- debian/libqtdee2.symbols 2011-02-10 02:46:02 +0000
18+++ debian/libqtdee2.symbols 2011-06-23 16:48:35 +0000
19@@ -6,6 +6,8 @@
20 _ZN12DeeListModel11qt_metacastEPKc@Base 0.1
21 _ZN12DeeListModel16staticMetaObjectE@Base 0.1
22 _ZN12DeeListModel19synchronizedChangedEb@Base 0.1
23+ _ZN12DeeListModel3getEi@Base 0.2.2
24+ _ZN12DeeListModel5countEv@Base 0.2.2
25 _ZN12DeeListModel7setNameERK7QString@Base 0.1
26 _ZN12DeeListModelC1EP7QObject@Base 0.1
27 _ZN12DeeListModelC2EP7QObject@Base 0.1
28@@ -23,8 +25,8 @@
29 _ZN19DeeListModelPrivateC2EP12DeeListModel@Base 0.1
30 _ZN19DeeListModelPrivateD1Ev@Base 0.1
31 _ZN19DeeListModelPrivateD2Ev@Base 0.1
32+ _ZN4QMapI7QString8QVariantE13detach_helperEv@Base 0.2.2
33 _ZN5QHashIi10QByteArrayE11deleteNode2EPN9QHashData4NodeE@Base 0.1
34- _ZN5QHashIi10QByteArrayE13detach_helperEv@Base 0.1
35 _ZN5QHashIi10QByteArrayE13duplicateNodeEPN9QHashData4NodeEPv@Base 0.1
36 _ZN5QHashIi10QByteArrayED1Ev@Base 0.1
37 _ZN5QHashIi10QByteArrayED2Ev@Base 0.1
38@@ -35,6 +37,7 @@
39 _ZNK12DeeListModel4dataERK11QModelIndexi@Base 0.1
40 _ZNK12DeeListModel4nameEv@Base 0.1
41 _ZNK12DeeListModel8rowCountERK11QModelIndex@Base 0.1
42+ _ZNK5QHashIi10QByteArrayE8findNodeERKiPj@Base 0.2.2
43 _ZTI12DeeListModel@Base 0.1
44 _ZTS12DeeListModel@Base 0.1
45 _ZTV12DeeListModel@Base 0.1

Subscribers

People subscribed via source and target branches