lp:~noskcaj/ubuntu/vivid/gsettings-desktop-schemas/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/vivid/gsettings-desktop-schemas/merge
Branch merges
- Martin Pitt: Approve
-
Diff: 24301 lines (+9176/-5144)62 files modified.pc/applied-patches (+0/-5)
.pc/git_revert_application_based_key_removal.patch/schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in (+0/-293)
.pc/git_revert_background_key_removal.patch/schemas/org.gnome.desktop.background.gschema.xml.in.in (+0/-58)
.pc/git_revert_menu_icon_key_removal.patch/schemas/gsettings-desktop-schemas.convert (+0/-156)
.pc/git_revert_menu_icon_key_removal.patch/schemas/org.gnome.desktop.interface.gschema.xml.in.in (+0/-224)
.pc/git_revert_notifications_key_removal.patch/schemas/org.gnome.desktop.screensaver.gschema.xml.in.in (+0/-135)
.pc/ubuntu_lock-on-suspend.patch/schemas/org.gnome.desktop.screensaver.gschema.xml.in.in (+0/-145)
Makefile.in (+10/-3)
NEWS (+38/-2)
aclocal.m4 (+734/-623)
compile (+347/-0)
configure (+112/-11)
configure.ac (+1/-1)
debian/changelog (+55/-0)
debian/control (+6/-4)
debian/control.in (+5/-3)
debian/patches/git_revert_application_based_key_removal.patch (+0/-41)
debian/patches/git_revert_menu_icon_key_removal.patch (+0/-95)
headers/Makefile.am (+1/-0)
headers/Makefile.in (+2/-1)
headers/gdesktop-enums.h (+9/-0)
missing (+2/-2)
po/LINGUAS (+1/-0)
po/POTFILES.in (+2/-1)
po/POTFILES.skip (+3/-0)
po/ca.po (+244/-82)
po/ca@valencia.po (+244/-82)
po/cs.po (+140/-86)
po/da.po (+143/-88)
po/de.po (+150/-96)
po/el.po (+440/-374)
po/es.po (+154/-97)
po/eu.po (+108/-105)
po/fi.po (+685/-289)
po/fr.po (+148/-160)
po/gl.po (+142/-88)
po/gu.po (+774/-322)
po/he.po (+142/-86)
po/hu.po (+156/-102)
po/id.po (+143/-88)
po/it.po (+147/-94)
po/lt.po (+146/-89)
po/lv.po (+143/-101)
po/pl.po (+144/-87)
po/pt_BR.po (+154/-90)
po/ru.po (+150/-182)
po/sl.po (+134/-85)
po/sr.po (+152/-99)
po/sr@latin.po (+152/-99)
po/tr.po (+2368/-0)
po/zh_HK.po (+138/-85)
po/zh_TW.po (+143/-85)
schemas/Makefile.am (+1/-0)
schemas/Makefile.in (+2/-1)
schemas/gsettings-desktop-schemas.convert (+0/-4)
schemas/org.gnome.desktop.background.gschema.xml.in.in (+1/-10)
schemas/org.gnome.desktop.interface.gschema.xml.in.in (+1/-39)
schemas/org.gnome.desktop.screensaver.gschema.xml.in.in (+1/-16)
schemas/org.gnome.desktop.search-providers.gschema.xml.in.in (+14/-2)
schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in (+18/-10)
schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in (+2/-18)
schemas/org.gnome.system.location.gschema.xml.in.in (+24/-0)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 23. By Jackson Doak
-
Re-add patches that were wrongly dropped
- git_revert_application_ based_key. patch: this is still
needed by metacity, mutter <= 3.8 and Muffin.
- git_revert_menu_icon_ key_removal. patch, these are still
needed in 3.8 - 21. By Jackson Doak
-
* Merge from debian. Remaining changes:
+ debian/patches:
- git_revert_background_ key_removal. patch, Don't remove background key
- ubuntu_lock-on- suspend. patch: Add key for lock on suspend
- git_revert_notifications_ key_removal. patch: Don't drop this, it's still
used by u-c-c.
* The other ubuntu changes can be dropped as we have newer gnome components
* New upstream release
* New upstream release.
* Upload to unstable.
* New upstream development release.
* New upstream development release.
* Fix typo in package description (Closes: #746315)
- thanks Anders Jonsson
* New upstream release.
* Bump Standards-Version to 3.9.5
* Upload to unstable. - 18. By Tim Lunn
-
[ Tim Lunn ]
* Merge with debian (LP: #1322566), Remaining changes:
- Don't break on gnome-shell, gnome-settings-daemon << 3.10
and nautilus << 3.7.92 missing keys are reverted in ubuntu packaging
+ debian/patches:
- git_revert_application_ based_key. patch: this is still
needed by metacity, mutter <= 3.8 and Muffin.
- git_revert_menu_icon_ key_removal. patch, these are still
needed in 3.8
- git_revert_background_ key_removal. patch, Don't remove background key
- ubuntu_lock-on- suspend. patch: Add key for lock on suspend [ Iain Lane ]
* git_revert_notifications_ key_removal. patch: Don't drop this, it's still
used by u-c-c. - 17. By Tim Lunn
-
* New upstream release (LP: #1263045)
* debian/patches:
- git_revert_application_ based_key. patch: this is still
needed by metacity, mutter <= 3.8 and Muffin.
- git_revert_menu_icon_ key_removal. patch, these are still
needed in 3.8
* Merge change from debian
- debian/control.in:
+ Switch gir1.2-gdesktopenums- 3.0 to section introspection - 16. By Robert Ancell
-
* New upstream release:
- Fix description of "sort-order" key in the search providers schema
- Don't migrate metacity themes from GNOME 2.
- Translation updates
* 01_no_metacity_theme.patch:
- Applied upstream - 15. By Jeremy BĂcha
-
[ Jeremy Bicha ]
* Sync with Debian. Remaining changes:
- ubuntu_overlay- scrollbars. patch
+ we need the deprecated schema for upgrade until 14.04 LTS
in case this package is updated before overlay-scrollbar (so
still referencing the old key) and that a debconf prompt is loaded:
perl-gtk will try to fetch this old schema and crash (LP: #1060249)
- ubuntu_lock-on- suspend. patch:
+ Add a preference whether to lock the screen when suspending
* debian/control.in:
- Don't break gnome-settings-daemon and nautilus since
we're not removing the background key yet
* debian/patches/ git_revert_ notifications_ key_removal. patch:
- Restore notifications key so that the Brightness panel
in System Settings 3.6 can be used without crashing[ Tim Lunn ]
* debian/patches/ git_revert_ background_ key_removal. patch:
- Don't remove background key - 14. By Michael Biebl
-
[ Michael Biebl ]
* New upstream release.
* debian/watch: Track stable releases.
* debian/copyright: Update to the final copyright format 1.0 spec.
* Bump Standards-Versions to 3.9.3.
* Bump debhelper compatibility level to 8.
* Strip debian/tmp/ from .install files.[ Jeremy Bicha ]
* debian/control.in:
- Bump build-depends on glib to 2.31.0.
- Add gobject-introspection build-depends.
- Use arch "any" for gsettings-desktop- schemas- dev
* Add new gir1.2-gdesktopenums- 3.0 package. [ Steve Langasek ]
* Mark gesttings-desktop- schemas Multi-Arch: foreign.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/vivid/gsettings-desktop-schemas