Merge lp://qastaging/~noskcaj/ubuntu/trusty/libgnome/merge into lp://qastaging/ubuntu/trusty/libgnome
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/libgnome/merge |
| Merge into: | lp://qastaging/ubuntu/trusty/libgnome |
| Diff against target: |
14748 lines (+109/-14435) 21 files modified
.pc/00_as-needed.patch/ltmain.sh (+0/-9636) .pc/02_path_max.patch/libgnome/gnome-program.c (+0/-2145) .pc/03_multiarch.patch/libgnome/gnome-program.c (+0/-2149) .pc/08_dont_force_a11y_activation.patch/configure.in (+0/-245) .pc/10_sounds_event_list.patch/gnome-data/gnome-2.soundlist.in (+0/-30) .pc/10_sounds_event_list.patch/gnome-data/gtk-events-2.soundlist.in (+0/-14) .pc/11_glib_no_deprecations.patch/libgnome/Makefile.am (+0/-151) .pc/applied-patches (+0/-6) configure.in (+7/-1) debian/changelog (+41/-3) debian/control (+1/-1) debian/libgnome2-common.postrm (+6/-0) debian/libgnome2-common.prerm (+6/-0) debian/patches/04_disable_deprecated.patch (+22/-0) debian/patches/series (+1/-1) debian/watch (+1/-1) gnome-data/gnome-2.soundlist.in (+5/-5) gnome-data/gtk-events-2.soundlist.in (+3/-3) libgnome/Makefile.am (+1/-0) libgnome/gnome-program.c (+15/-30) ltmain.sh (+0/-14) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/libgnome/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
Unmerged revisions
- 79. By Jackson Doak
-
* Merge with debian, remaining changes:
- debian/libgnome2- common. gconf-defaults:
+ changes to default configuration for Ubuntu, drop the keys for
themes which are also set in the ubuntu-artwork defaults
- debian/patches/ 08_dont_ force_a11y_ activation. patch:
+ don't force a11y activation
- debian/patches/ 10_sounds_ event_list. patch:
+ no sound event out of the login one for the default configuration
- debian/control.in: Demote gvfs from Depends to Recommends:. It is
necessary under GNOME for proper xdg-open integration (see Debian
#519263), but not needed when running under e. g. XFCE.
- debian/control.in:
+ Build-depend on gnome-common
+ replaces the last version in ubuntu, not the one in debian
for the multi-arch transition
- Convert to multiarch - 78. By Jackson Doak
-
Merging shared upstream rev into target branch.
Thanks. Uploaded.