lp:~stefanor/gnome-python-desktop/merge-2.30.0-3
- Get this branch:
- bzr branch lp:~stefanor/gnome-python-desktop/merge-2.30.0-3
Branch merges
- Daniel Holbach (community): Approve
-
Diff: 388 lines (+111/-32)5 files modifieddebian/changelog (+48/-0)
debian/control (+15/-16)
debian/control.in (+15/-16)
debian/patches/01_wnck_enums.patch (+32/-0)
debian/patches/series (+1/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
- 50. By Stefano Rivera
-
* Merge from Debian unstable (LP: #403078). Remaining changes:
- debian/control:
+ Remove bug-buddy build-depend
+ Add Vcs-Bzr link
+ python-evince suggest evince
+ Replace libevince-dev (which does not exist in Ubuntu) with our split
libevview-dev/libevdocum ent-dev.
+ Add libtool build dependency.
- debian/rules:
+ Run autotools on build
- debian/python- evince. examples:
+ Add examples for evince
- debian/watch:
+ Watch unstable series
- 90_autotools.patch:
+ Not required, autotools now run on build
- evince-2.32.patch:
+ To build against current evince.
* Dropped changes:
- Use Ubuntu version for gnome-python-desktop conflicts, predates lucid.
* debian/patches/ 01_wnck_ enums.patch:
- Patch from upstream bugzilla, fix flags in the wnck module that were
declared as enums. Closes: #597414.
* debian/control.in:
- Build depend on libgnome-media-dev on Hurd now that it's built there.
Thus build the python-mediaprofiles package.
- Build depend on bug-buddy on Hurd too since it's built there now.
* Use Replaces instead of Conflicts to ease APT finding the correct
upgrade path. - 49. By Robert Ancell
-
* evince-2.32.patch:
- Remove get_selection_map, which doesn't exist any more (LP: #632272) - 48. By Robert Ancell
-
* Rebuild to pick up libbrasero-media1. (LP: #631204)
* Add evince-2.32.patch to build against current evince. - 44. By Martin Pitt
-
debian/control.in: Replace libevince-dev (which does not exist in Ubuntu)
with our split libevview-dev/libevdocume nt-dev. Rebuild debian/control. - 43. By Robert Ancell
-
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
- Remove bug-buddy build-depend
- Add Vcs-Bzr link
- Use Ubuntu version for gnome-python-desktop conflicts
- python-evince suggest evince
* debian/rules:
- Run autotools on build
* debian/python- evince. examples:
- Add examples for evince
* debian/patches/ 90_autotools. patch:
- Not requires, autotools now run on build
* debian/watch:
- Watch unstable series
Branch metadata
- Branch format:
- Branch format 6
- Repository format:
- Bazaar pack repository format 1 (needs bzr 0.92)