Merge lp://staging/~ubuntu-branches/ubuntu/natty/dbus-glib/natty-201103250205 into lp://staging/ubuntu/natty/dbus-glib
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/dbus-glib/natty-201103250205 |
| Merge into: | lp://staging/ubuntu/natty/dbus-glib |
| Diff against target: |
94 lines (+72/-0) (has conflicts) 4 files modified
debian/patches/0001-Fix-linking-order.patch (+26/-0) debian/patches/0002-Allow-signal-annotations.patch (+14/-0) debian/patches/0003-Allow-annotation-inside-property-too.patch (+29/-0) debian/patches/series (+3/-0) Conflict adding file debian/patches. Moved existing file to debian/patches.moved. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/dbus-glib/natty-201103250205 |
| 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/dbus-glib now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/dbus-glib/natty-201103250205. A merge should be performed if necessary.
Unmerged revisions
- 23. By Robert Ancell
-
* New upstream release.
* debian/control:
- Use standards version 3.9.1
- Add build-depends on dh-autoreconf
- Bump build-depends on libglib2.0-dev
* debian/libdbus- glib-1- 2.symbols
- Updated
* debian/rules:
- Drop simple-patchsys.mk
- Use autoreconf.mk
- Update SHLIBS
* debian/source:
- Use source version 3.0
* debian/update- patches. mk:
- Drop
* debian/patches/ 0001-Fix- linking- order.patch:
- Fix DSO linking issues
* debian/patches/ 0002-Allow- signal- annotations. patch:
* debian/patches/ 0003-Allow- annotation- inside- property- too.patch:
- Allow annotations inside signals and properties
