lp:~noskcaj/ubuntu/vivid/gnome-desktop3/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/vivid/gnome-desktop3/merge
Branch merges
- Martin Pitt: Approve
-
Diff: 40718 lines (+15533/-20157)112 files modified.pc/04_compute_average_color.patch/libgnome-desktop/gnome-bg.c (+0/-2689)
.pc/applied-patches (+0/-6)
.pc/git_revert_draw_background.patch/libgnome-desktop/gnome-bg.c (+0/-2830)
.pc/git_revert_draw_background.patch/libgnome-desktop/gnome-bg.h (+0/-121)
.pc/realpath-PATH_MAX.patch/libgnome-desktop/libgsystem/gsystem-file-utils.c (+0/-1626)
.pc/tweak_color_computation.patch/libgnome-desktop/gnome-bg.c (+0/-2830)
.pc/ubuntu_language.patch/libgnome-desktop/gnome-languages.c (+0/-1400)
.pc/ubuntu_language_list_from_SUPPORTED.patch/libgnome-desktop/gnome-languages.c (+0/-1444)
.pc/ubuntu_language_list_from_SUPPORTED.patch/libgnome-desktop/gnome-languages.h (+0/-54)
ChangeLog (+472/-10)
Makefile.am (+6/-3)
Makefile.in (+32/-15)
NEWS (+53/-5)
aclocal.m4 (+123/-11)
compile (+347/-0)
config.guess (+97/-64)
config.h.in (+3/-0)
config.sub (+24/-21)
configure (+436/-50)
configure.ac (+12/-3)
debian/changelog (+47/-0)
debian/control (+1/-1)
debian/libgnome-desktop-3-10.symbols (+169/-168)
debian/patches/series (+0/-1)
debian/watch (+1/-1)
desktop-docs/Makefile.in (+13/-6)
desktop-docs/fdl/Makefile.in (+13/-6)
desktop-docs/fdl/sv/index.docbook (+49/-21)
desktop-docs/fdl/sv/sv.po (+891/-250)
desktop-docs/gpl/Makefile.in (+13/-6)
desktop-docs/gpl/sv/index.docbook (+71/-116)
desktop-docs/gpl/sv/sv.po (+713/-217)
desktop-docs/lgpl/Makefile.in (+13/-6)
desktop-docs/lgpl/sv/index.docbook (+78/-156)
desktop-docs/lgpl/sv/sv.po (+1079/-324)
docs/Makefile.in (+13/-6)
docs/reference/Makefile.in (+13/-6)
docs/reference/gnome-desktop3/Makefile.am (+2/-2)
docs/reference/gnome-desktop3/Makefile.in (+47/-25)
docs/reference/gnome-desktop3/gnome-desktop3-sections.txt (+0/-1)
docs/reference/gnome-desktop3/html/GnomeDesktopThumbnailFactory.html (+693/-582)
docs/reference/gnome-desktop3/html/GnomeIdleMonitor.html (+365/-271)
docs/reference/gnome-desktop3/html/GnomeWallClock.html (+184/-130)
docs/reference/gnome-desktop3/html/GnomeXkbInfo.html (+470/-377)
docs/reference/gnome-desktop3/html/background.html (+9/-9)
docs/reference/gnome-desktop3/html/gnome-desktop3-Language-Utilities.html (+446/-347)
docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-bg.html (+563/-363)
docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-pnp-ids.html (+126/-92)
docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr-config.html (+735/-436)
docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr.html (+1492/-937)
docs/reference/gnome-desktop3/html/gnome-desktop3.devhelp2 (+149/-172)
docs/reference/gnome-desktop3/html/idle-monitor.html (+9/-9)
docs/reference/gnome-desktop3/html/index.html (+3/-3)
docs/reference/gnome-desktop3/html/index.sgml (+66/-68)
docs/reference/gnome-desktop3/html/intro.html (+9/-9)
docs/reference/gnome-desktop3/html/languages.html (+9/-9)
docs/reference/gnome-desktop3/html/randr.html (+9/-9)
docs/reference/gnome-desktop3/html/style.css (+223/-28)
docs/reference/gnome-desktop3/html/thumbnail.html (+9/-9)
docs/reference/gnome-desktop3/html/wall-clock.html (+9/-9)
docs/reference/gnome-desktop3/html/xkb-info.html (+9/-9)
docs/reference/gnome-desktop3/tmpl/gnome-rr.sgml (+0/-9)
glib-tap.mk (+135/-0)
gtk-doc.make (+27/-14)
libgnome-desktop/Makefile.am (+10/-3)
libgnome-desktop/Makefile.in (+91/-64)
libgnome-desktop/gnome-bg.c (+2/-170)
libgnome-desktop/gnome-bg.h (+1/-3)
libgnome-desktop/gnome-desktop-thumbnail.c (+15/-14)
libgnome-desktop/gnome-languages.c (+14/-161)
libgnome-desktop/gnome-languages.h (+0/-1)
libgnome-desktop/gnome-rr-debug.c (+15/-1)
libgnome-desktop/gnome-rr.c (+40/-0)
libgnome-desktop/gnome-rr.h (+0/-2)
libgnome-desktop/gnome-wall-clock.c (+99/-53)
libgnome-desktop/gnome-wall-clock.h (+8/-0)
libgnome-desktop/gnome-xkb-info.c (+3/-3)
libgnome-desktop/libgsystem/COPYING (+482/-0)
libgnome-desktop/libgsystem/README (+7/-0)
libgnome-desktop/libgsystem/gsystem-file-utils.c (+3/-8)
libgnome-desktop/meta-dbus-idle-monitor.c (+1/-1)
libgnome-desktop/meta-dbus-idle-monitor.h (+1/-1)
libgnome-desktop/meta-dbus-xrandr.c (+1/-1)
libgnome-desktop/meta-dbus-xrandr.h (+1/-1)
libgnome-desktop/test-wall-clock.c (+1/-1)
m4/glibtests.m4 (+28/-0)
m4/gtk-doc.m4 (+32/-15)
missing (+2/-2)
po/POTFILES.skip (+6/-0)
po/bg.po (+51/-126)
po/bn_IN.po (+95/-128)
po/el.po (+27/-27)
po/gu.po (+129/-150)
po/hi.po (+89/-118)
po/kn.po (+130/-156)
po/mr.po (+132/-158)
po/or.po (+129/-154)
po/sv.po (+109/-117)
po/te.po (+93/-116)
tap-driver.sh (+652/-0)
tap-test (+5/-0)
test-driver (+139/-0)
tests/C.ref.ui (+16/-0)
tests/C.ui (+19/-0)
tests/Makefile.am (+28/-0)
tests/Makefile.in (+1395/-0)
tests/en_US.utf-8.ref.ui (+16/-0)
tests/en_US.utf-8.ui (+19/-0)
tests/gtk-reftest.c (+621/-0)
tests/he_IL.utf8.ref.ui (+16/-0)
tests/he_IL.utf8.ui (+19/-0)
tests/wall-clock.c (+161/-0)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 34. By Jackson Doak
-
* Merge with Debian, Remaining changes:
- debian/patches:
+ 04_compute_average_ color.patch: Compute the avergage color in
gnome-desktop itself, not in unity to fix some races (LP #963140)
+ tweak_color_computation. patch, Patch from Gord, no patch header,
no bug link.
+ git_revert_draw_background .patch
+ ubuntu_language. patch, Ported relevant bits from g-c-c
52_region_ language. patch, as required for gnome 3.8 region panel
+ ubuntu_language_ list_from_ SUPPORTED. patch,
adds api to get list of available languages from SUPPORTED file.
To be used by gnome 3.8 region panel language installation.
- debian/libgnome- desktop- 3-10.symbols:
+ Add symbols included in Ubuntu patches
- debian/control.in:
+ Mark gnome-desktop3-data Multi-Arch: foreign - 32. By Tim Lunn
-
* New upstream release (LP: #1372346)
* Merge with Debian, Remaining changes:
- debian/patches:
+ 04_compute_average_ color.patch: Compute the avergage color in
gnome-desktop itself, not in unity to fix some races (LP #963140)
+ tweak_color_computation. patch, Patch from Gord, no patch header,
no bug link.
+ git_revert_draw_background .patch
+ ubuntu_language. patch, Ported relevant bits from g-c-c
52_region_ language. patch, as required for gnome 3.8 region panel
+ ubuntu_language_ list_from_ SUPPORTED. patch,
adds api to get list of available languages from SUPPORTED file.
To be used by gnome 3.8 region panel language installation.
- debian/rules:
+ drop obsolete --disable-scrollkeeper configure flag
- debian/libgnome- desktop- 3-10.symbols:
+ Add symbols included in Ubuntu patches
- debian/control.in:
+ Mark gnome-desktop3-data Multi-Arch: foreign
* Dropped changes:
- 02_refuse_to_break_ GL_compositors. patch:
+ xrandr code has moved into libunity-settings- daemon now - 31. By Robert Ancell
-
* debian/
patches/ backlight- property- name.patch:
- Use the corrent backlight property name as specified in the XRANDR spec
(LP: #947919) - 30. By Alberto Milone
-
* debian/
patches/ ignore_ errors_ with_primary_ outputs. patch:
- Ignore failures when setting the primary output (LP: 1224254). - 29. By Jeremy Bícha
-
* New upstream bugfix release
- Initialize gettext before constructing a wall clock
- Update pnp.ids from upstream hwdata
- Fix crash when XRRSetCrtcConfig() fails
- Prevent a crash with unknown language/country codes
- Ensure strings from xkeyboard-config are UTF-8
- Translation updates - 28. By Jeremy Bícha
-
* New upstream release
* debian/control.in:
- Drop obsolete gnome-doc-utils and scrollkeeper build dependencies - 27. By Sebastien Bacher
-
* debian/
patches/ git_no_ filename_ warning. patch:
- "gnome-bg: objects without a filename are not slideshows",
that should fix the warnings that are displayed by the appareance
capplet on start (which are due to solid color backgrounds) - 26. By Tim Lunn
-
* New upstream release
* Sync with Debian (LP: #1184812) Remaining changes:
- debian/patches:
+ 04_compute_average_ color.patch: Compute the avergage color in
gnome-desktop itself, not in unity to fix some races (LP #963140)
+ tweak_color_computation. patch, Patch from Gord, no patch header,
no bug link.
+ git_revert_draw_background .patch
+ ubuntu_language. patch, Ported relevant bits from g-c-c
52_region_ language. patch, as required for gnome 3.8 region panel
+ ubuntu_language_ list_from_ SUPPORTED. patch,
adds api to get list of available languages from SUPPORTED file.
To be used by gnome 3.8 region panel language installation.
- debian/control.in:
+ Don't break gnome-shell << 3.7.90
+ Use source:Version for gnome-desktop3-data Depend
+ Add epoch to gnome-desktop3-data's Breaks/Replaces, as our old
gnome-desktop source package introduced an epoch. This needs to be
kept until after 14.04 LTS.
- Install helper tools into a versioned directory (by overriding
libexecdir). They could alternatively be installed in a separate package
* Dropped changes:
- 02_refuse_to_break_ GL_compositors. patch:
+ Doesn't appear to be needed any more
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/vivid/gnome-desktop3