Merge lp://qastaging/~mardy/metacity/command-line-conf into lp://qastaging/ubuntu/oneiric/metacity
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~mardy/metacity/command-line-conf |
| Merge into: | lp://qastaging/ubuntu/oneiric/metacity |
| Diff against target: |
4607 lines (+4393/-0) (has conflicts) 42 files modified
.bzr-builddeb/default.conf (+2/-0) debian/README.Debian (+20/-0) debian/changelog (+1668/-0) debian/compat (+1/-0) debian/control (+106/-0) debian/control.in (+101/-0) debian/copyright (+66/-0) debian/libmetacity-dev.install (+4/-0) debian/libmetacity-private0.install (+1/-0) debian/metacity-common.catalog (+1/-0) debian/metacity-common.gconf-defaults (+4/-0) debian/metacity-common.install (+8/-0) debian/metacity-common.manpages (+4/-0) debian/metacity-common.sgmlcatalogs (+1/-0) debian/metacity-message.1 (+50/-0) debian/metacity-theme-viewer.1 (+43/-0) debian/metacity-window-demo.1 (+25/-0) debian/metacity.1 (+53/-0) debian/metacity.install (+2/-0) debian/metacity.postinst (+16/-0) debian/metacity.prerm (+12/-0) debian/patches/03_gtop_error.patch (+20/-0) debian/patches/03_strict_focus.patch (+68/-0) debian/patches/04_support_drag_drop_with_alt_tab.patch (+19/-0) debian/patches/05_raise_on_click_for_click_mode.patch (+19/-0) debian/patches/06_Add_UXD_shadows_and_borders.patch (+400/-0) debian/patches/100_fade_on_long_title.patch (+45/-0) debian/patches/101_override_gconf_settings.patch (+193/-0) debian/patches/10_no-ws-switcher.patch (+21/-0) debian/patches/11_hide_tooltip_on_decorator.patch (+89/-0) debian/patches/12_dont-show-as-user.patch (+155/-0) debian/patches/13_better_support_for_button_layout.patch (+125/-0) debian/patches/14_wrong_colormap.patch (+24/-0) debian/patches/15_show_maximized_titlebars.patch (+255/-0) debian/patches/16-capture-before-unmap.patch (+337/-0) debian/patches/17-workspace-switcher-cycle.patch (+178/-0) debian/patches/18-auto-maximize-windows.patch (+167/-0) debian/patches/20_do-not-place-windows-over-the-launcher.patch (+56/-0) debian/patches/series (+16/-0) debian/rules (+15/-0) debian/source/format (+1/-0) debian/watch (+2/-0) Conflict adding file debian. Moved existing file to debian.moved. |
| To merge this branch: | bzr merge lp://qastaging/~mardy/metacity/command-line-conf |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Didier Roche-Tolomelli | Needs Resubmitting | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2011-08-25.
Description of the change
Allow overriding GConf settings from command line
Accept a new --conf-file <conf-file> command line option, which loads a
GKeyFile containing overrides for keys stored in GConf.
| Alberto Mardegan (mardy) wrote | # |
| John A Meinel (jameinel) wrote | # |
| Didier Roche-Tolomelli (didrocks) wrote | # |
Unmerged revisions
- 120. By Alberto Mardegan
-
Allow overriding GConf settings from command line
Accept a new --conf-file <conf-file> command line option, which loads a
GKeyFile containing overrides for keys stored in GConf.For a full rationale, please see
https://bugs.launchpad .net/unity- 2d/+bug/ 791205 - 119. By Rodrigo Moya
-
releasing version 1:2.34.1-1ubuntu1
- 118. By Didier Roche-Tolomelli
-
releasing version 1:2.34.0-0ubuntu2
- 117. By Didier Roche-Tolomelli
-
debian/
patches/ 16-capture- before- unmap.patch:
only retrieve scaling down of all the windows' pixmaps when compositor
is in effect (LP: #794080). Thanks Kaleo - 116. By Martin Pitt
-
add bug number
- 115. By Martin Pitt
-
* New upstream release
* debian/patches:
- 02_restart_hint.patch, 19_initialise_ all_workspace_ names.patch
dropped, are upstream - 114. By Oliver Grawert
-
releasing version 1:2.30.3-0ubuntu9
- 113. By Oliver Grawert
-
merge fixes from the unity-2d team
- 112. By Oliver Grawert
-
releasing version 1:2.30.3-0ubuntu8
- 111. By Oliver Grawert
-
merge lp:~uriboni/unity-2d/metacity-capture-before-unmap-not-default to set the proper default
Note: these are the same patches sent to upstream ( https:/