Merge lp://staging/~ubuntu-branches/ubuntu/oneiric/pygobject/oneiric-201105050613 into lp://staging/ubuntu/oneiric/pygobject
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/oneiric/pygobject/oneiric-201105050613 |
| Merge into: | lp://staging/ubuntu/oneiric/pygobject |
| Diff against target: |
11 lines (+2/-0) 2 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/oneiric/pygobject/oneiric-201105050613 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/pygobject now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/pygobject/oneiric-201105050613. A merge should be performed if necessary.
Unmerged revisions
- 84. By Martin Pitt
-
releasing version 2.28.3-1ubuntu2
- 83. By Martin Pitt
-
debian/
patches/ 21_fix_ symbol_ names_to_ be_locale_ independent. patch:
Case conversion issue, that proved to break language-selector for
Turkish users in Natty, fixed.
(LP: #747796; https://bugzilla. gnome.org/ show_bug. cgi?id= 649165) - 82. By Martin Pitt
-
Add 00git-fix-
abi-break. patch: Backport upstream commit cc0e8423 to
restore ABI compatibility with previous versions, to unbreak metaclass
hackery done in a lot of applications. Thanks to Johan Dahlin for pointing
this out. (Note, we can't upgrade to 2.28.4 release yet, as this still
needs a new g-i release first) (LP: #765398)
