Ubuntu

Merge lp:~amoog/ubuntu/oneiric/libqtbamf/lp-765915 into lp:ubuntu/oneiric/libqtbamf

Proposed by Andreas Moog on 2011-06-19
Status: Merged
Merge reported by: Didier Roche
Merged at revision: not available
Proposed branch: lp:~amoog/ubuntu/oneiric/libqtbamf/lp-765915
Merge into: lp:ubuntu/oneiric/libqtbamf
Diff against target: 52 lines (+10/-3) 2 files modified
To merge this branch: bzr merge lp:~amoog/ubuntu/oneiric/libqtbamf/lp-765915
Reviewer Review Type Date Requested Status
Didier Roche 2011-06-21 Approve on 2011-06-22
Sebastien Bacher 2011-06-19 Needs Fixing on 2011-06-21
Review via email: mp+65132@code.launchpad.net
To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks, why do you delete optional symbols? they should not break the build, note that 0.2.1-0ubuntu1 built fine in oneiric, is that still an issue?

review: Needs Fixing
Andreas Moog (amoog) wrote :

I removed the optional symbols because I consider it good practice to have a symbols file that actually matches the symbols of my library. I readded them now.

And at least in my pbuilder it is still an issue, the build fails due to wrong symbols file.
Also, libqtbamf1 was last built in natty (not oneiric), see https://launchpad.net/ubuntu/+source/libqtbamf/0.2.1-0ubuntu1. It shows as built because for natty the symbols file was indeed correct.

Didier Roche (didrocks) wrote :

Thanks for your work there! Merged :)
Please, in the future, ensure two things:
- check the output of debcheckout or apt-get source which should tell you that there is a Vcs-Bzr tag in debian/control pointing to the branch where the packaging is (I had to put your commit manually to lp:bamf-qt).
- when request a change, let the changelog use "UNRELEASED" instead of distribution, in case we are pending updates to add other changes. Then, the sponsor will change UNRELEASED to the version.

I've pushed your changed to lp:bamf-qt. Thanks a lot for your contribution there! :-)

review: Approve
Andreas Moog (amoog) wrote :

On 06/22/2011 09:58 AM, Didier Roche wrote:
> Review: Approve
> Thanks for your work there! Merged :)
> Please, in the future, ensure two things:
> - check the output of debcheckout or apt-get source which should tell you that there is a Vcs-Bzr tag in debian/control pointing to the
branch where the packaging is (I had to put your commit manually to
lp:bamf-qt).

I use neither of those tools. I use the workflow suggested in
http://people.canonical.com/~dholbach/packaging-guide/html/udd-intro.html#getting-the-source

Maybe lp should automatically let ubuntu:<package> point to the location
specified in the VCS controlfield?

But for the future I will make sure to look at that field first to
ensure I'm not working on a package that has a different workflow than
the suggested one to not make sponsors live harder, like in this case.

> - when request a change, let the changelog use "UNRELEASED" instead of distribution, in case we are pending updates to add other changes. Then, the sponsor will change UNRELEASED to the version.

Ok.

> I've pushed your changed to lp:bamf-qt.

Thank you!

Cheers, Andreas

Didier Roche (didrocks) wrote :

Yeah, pointing directly to the right branch was what we discussed on ubuntu-devel mailing list some weeks ago. However, we have some debian/ only directory and it seems to not fit this case. Anyway I asked Daniel to mention that as you are not the only one to get hit by that, so there is clearly something wrong in our side :)

Thanks again for your work there :-)

Didier Roche (didrocks) wrote :

FYI: https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/800768

Hope that can come to some fixes :)

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-04-19 11:38:45 +0000
3+++ debian/changelog 2011-06-21 15:06:48 +0000
4@@ -1,3 +1,9 @@
5+libqtbamf (0.2.1-0ubuntu2) oneiric; urgency=low
6+
7+ * update symbols file to fix FTBFS (LP: #765915)
8+
9+ -- Andreas Moog <amoog@ubuntu.com> Sun, 19 Jun 2011 17:59:05 +0000
10+
11 libqtbamf (0.2.1-0ubuntu1) natty; urgency=low
12
13 * New API: BamfMatcher::register_favorites(const QStringList& favorites) (LP: #739454)
14
15=== modified file 'debian/libqtbamf1.symbols'
16--- debian/libqtbamf1.symbols 2011-02-22 17:28:41 +0000
17+++ debian/libqtbamf1.symbols 2011-06-21 15:06:48 +0000
18@@ -18,8 +18,6 @@
19 _ZN10BamfWindowD0Ev@Base 0.1
20 _ZN10BamfWindowD1Ev@Base 0.1
21 _ZN10BamfWindowD2Ev@Base 0.1
22- _ZN10QByteArrayD1Ev@Base 0.1
23- _ZN10QByteArrayD2Ev@Base 0.1
24 _ZN10QDBusErrorD1Ev@Base 0.1
25 _ZN10QDBusErrorD2Ev@Base 0.1
26 _ZN11BamfControl11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1
27@@ -57,6 +55,8 @@
28 _ZN11BamfMatcherD0Ev@Base 0.1
29 _ZN11BamfMatcherD1Ev@Base 0.1
30 _ZN11BamfMatcherD2Ev@Base 0.1
31+ _ZN11QStringListD1Ev@Base 0.2.1
32+ _ZN11QStringListD2Ev@Base 0.2.1
33 _ZN12BamfUintList11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1
34 _ZN12BamfUintList11qt_metacastEPKc@Base 0.1
35 _ZN12BamfUintList16staticMetaObjectE@Base 0.1
36@@ -192,7 +192,7 @@
37 (optional=templinst)_ZN5QListIjE13detach_helperEi@Base 0.1
38 (optional=templinst)_ZN5QListIjE13detach_helperEv@Base 0.1
39 (optional=templinst)_ZN5QListIjE18detach_helper_growEii@Base 0.1
40- (optional=templinstr)_ZN5QListIjE5clearEv@Base 0.1
41+ (optional=templinst)_ZN5QListIjE5clearEv@Base 0.1
42 (optional=templinst)_ZN5QListIjE6appendERKj@Base 0.1
43 (optional=templinst)_ZN5QListIjED1Ev@Base 0.1
44 (optional=templinst)_ZN5QListIjED2Ev@Base 0.1
45@@ -230,6 +230,7 @@
46 _ZNK11BamfMatcher12applicationsEv@Base 0.1
47 _ZNK11BamfMatcher13active_windowEv@Base 0.1
48 _ZNK11BamfMatcher18active_applicationEv@Base 0.1
49+ _ZNK11BamfMatcher18register_favoritesERK11QStringList@Base 0.2.1
50 _ZNK11BamfMatcher19application_for_xidEj@Base 0.1
51 _ZNK11BamfMatcher20running_applicationsEv@Base 0.1
52 _ZNK11BamfMatcher22application_is_runningERK7QString@Base 0.1

Subscribers

People subscribed via source and target branches

to all changes: