Merge lp://qastaging/~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201103250149 into lp://qastaging/ubuntu/natty/gobject-introspection
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201103250149 |
| Merge into: | lp://qastaging/ubuntu/natty/gobject-introspection |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201103250149 |
| 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/natty/gobject-introspection now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201103250149. A merge should be performed if necessary.
Unmerged revisions
- 46. By Emilio Pozuelo Monfort <email address hidden>
-
New upstream release.
- 45. By Emilio Pozuelo Monfort <email address hidden>
-
* New upstream release.
+ debian/libgirepository -1.0-1. symbols:
- Updated for the new symbols.
+ debian/rules:
- Fail the build if the symbols file is outdated.
- Make the shlibs file always depend on the latest upstream version.
* debian/dh_girepository :
+ Look for libraries in private directories. Closes: #612148. - 44. By Martin Pitt
-
releasing version 0.10.2-0ubuntu1
- 43. By Martin Pitt
-
New upstream release.
- 42. By Martin Pitt
-
releasing version 0.10.1+
git20110201- 0ubuntu1 - 41. By Martin Pitt
-
debian/
libgirepository -1.0-1. symbols: Add new symbols. - 40. By Martin Pitt
-
Update to current git head, as this is a build dependency for newer
pygobject. - 39. By Martin Pitt
-
Drop 0001-Preserve-
the-c-type- of-array- elements. patch, upstream now.
