Ubuntu
qtdeclarative-opensource-src package

Merge lp://staging/~mitya57/ubuntu/saucy/qtdeclarative-opensource-src/merge into lp://staging/ubuntu/saucy/qtdeclarative-opensource-src

  1. Saucy (13.10)
  2. merge
  3. Merge into saucy
Proposed by Dmitry Shachnev
Status: Merged
Merged at revision: 7
Proposed branch: lp://staging/~mitya57/ubuntu/saucy/qtdeclarative-opensource-src/merge
Merge into: lp://staging/ubuntu/saucy/qtdeclarative-opensource-src
Diff against target: 423 lines (+190/-37)
6 files modified
debian/changelog (+80/-0)
debian/control (+52/-29)
debian/copyright (+42/-2)
debian/qtdeclarative5-doc-html.install (+2/-0)
debian/qtdeclarative5-doc.install (+2/-0)
debian/rules (+12/-6)
To merge this branch: bzr merge lp://staging/~mitya57/ubuntu/saucy/qtdeclarative-opensource-src/merge
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Ubuntu branches Pending
Review via email: mp+172054@code.staging.launchpad.net

Description of the change

This is a merge from Debian, started by Timo and finished by me. This is needed to unblock landing of new qtdoc package.

The only difference from what is in bzr now is a "dch -r" call.

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

Looks good, the documentation packages will be very welcome.

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

Addendum: I added two cherry-picked patches requested by Florian on top of the packaging branch lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src - those were tested to be functional (https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1198830) and would be good to include as well.

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

That now also at https://code.launchpad.net/~timo-jyrinki/ubuntu/saucy/qtdeclarative-opensource-src/merge_continued/+merge/173448

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