Ubuntu
qtbase-opensource-src package

Merge lp://qastaging/~mitya57/ubuntu/saucy/qtbase-opensource-src/merge into lp://qastaging/ubuntu/saucy/qtbase-opensource-src

  1. Saucy (13.10)
  2. merge
  3. Merge into saucy
Proposed by Dmitry Shachnev
Status: Merged
Merged at revision: 8
Proposed branch: lp://qastaging/~mitya57/ubuntu/saucy/qtbase-opensource-src/merge
Merge into: lp://qastaging/ubuntu/saucy/qtbase-opensource-src
Diff against target: 626 lines (+254/-51)
22 files modified
debian/README.source (+8/-0)
debian/changelog (+74/-0)
debian/control (+39/-9)
debian/copyright (+33/-34)
debian/libqt5concurrent5.lintian-overrides (+3/-0)
debian/libqt5core5.install (+1/-0)
debian/libqt5dbus5.lintian-overrides (+3/-0)
debian/libqt5gui5.install-armhf (+1/-0)
debian/libqt5gui5.lintian-overrides (+3/-0)
debian/libqt5network5.lintian-overrides (+3/-0)
debian/libqt5opengl5.lintian-overrides (+3/-0)
debian/libqt5printsupport5.lintian-overrides (+3/-0)
debian/libqt5sql5.lintian-overrides (+3/-0)
debian/libqt5test5.lintian-overrides (+3/-0)
debian/libqt5widgets5.lintian-overrides (+3/-0)
debian/libqt5xml5.lintian-overrides (+3/-0)
debian/mark_private_symbols.sh (+30/-0)
debian/patches/Rename-qAbs-Function-for-timeval.patch (+3/-2)
debian/patches/series (+1/-1)
debian/qtbase5-doc-html.install (+12/-0)
debian/qtbase5-doc.install (+12/-0)
debian/rules (+10/-5)
To merge this branch: bzr merge lp://qastaging/~mitya57/ubuntu/saucy/qtbase-opensource-src/merge
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Ubuntu branches Pending
Review via email: mp+172053@code.qastaging.launchpad.net

Description of the change

This is a merge from Debian, which needs to be done to unblock landing of new qtmultimedia and qtdoc packages.

It's all committed to the bzr branch (though it has 5.1 beta, not 5.0.2).

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good to me, only nitpick being that all of it is yet in ~kubuntu-packaging's branch.

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

(ie could be pushed to lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src_5.0.2 while 5.1 is being worked on in the main pkging branch - but the main branch is the same as this one, just adopted to 5.1 work I did earlier)

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

@Sebastien: Thanks for uploading this!

@Timo: Sorry, I didn't know that such a branch exists, and my merge was not based on it. I've rebased both branches against my upload now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches