Merge lp://staging/~ari-tczew/webkit/lp-691104 into lp://staging/~ubuntu-desktop/webkit/ubuntu
| Status: | Rejected |
|---|---|
| Rejected by: | Robert Ancell |
| Proposed branch: | lp://staging/~ari-tczew/webkit/lp-691104 |
| Merge into: | lp://staging/~ubuntu-desktop/webkit/ubuntu |
| Diff against target: |
121 lines (+75/-9) 4 files modified
debian/changelog (+52/-9) debian/patches/series (+1/-0) debian/patches/typo_webkitwebsettings.patch (+18/-0) debian/patches/ubuntu-gir-version.patch (+4/-0) |
| To merge this branch: | bzr merge lp://staging/~ari-tczew/webkit/lp-691104 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Desktop | Pending | ||
| Robert Ancell | Pending | ||
|
Review via email:
|
|||
| Robert Ancell (robert-ancell) wrote | # |
Unmerged revisions
- 5. By Artur Rona
-
bzr add
- 4. By Artur Rona
-
Updated DEP3 tag.
- 3. By Artur Rona
-
[ Artur Rona ]
* Merge from debian unstable. Remaining changes: (LP: #691104)
- debian/control: Drop Build-Depends on gir-repository-dev since
we don't have this package in archive.
- debian/patches/ ubuntu- gir-version. patch: Use the 1.2 gobject
introspection abi.
[ David Stansby ]
* debian/patches/ typo_webkitwebs ettings. patch: Fix typo. (LP: #552718)
[ Robert Ancell ]
* debian/control: Add Vcs-Bzr link related to Ubuntu Desktop Team.
* debian/patches/ ubuntu- gir-version. patch:
- Simplify patch to fix FTBFS
* debian/patches/ ubuntu- gir-version. patch:
- Change the alias definitions to work with the latest gobject-introspection
* New upstream release
* debian/patches/ ubuntu- gir-version. patch:
- Use the 1.2 gobject introspection abi
* Resync on Debian,
remaining changes:
* debian/control:
- don't build-depends on gir-repository-dev it's not required
* debian/patches/ ubuntu- gir-version. patch:
- use the current gobject introspection abi
This is now obsolete as we have 1.3.9 uploaded