Merge lp://qastaging/~attente/glib/gicon-upstream into lp://qastaging/ubuntu/saucy/glib2.0
Proposed by
William Hua
| Status: | Merged |
|---|---|
| Merge reported by: | Sebastien Bacher |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~attente/glib/gicon-upstream |
| Merge into: | lp://qastaging/ubuntu/saucy/glib2.0 |
| Diff against target: |
27569 lines (+26956/-46) 51 files modified
.pc/applied-patches (+3/-0) .pc/g-variant-get-data-as-bytes.patch/glib/gvariant-core.c (+1104/-0) .pc/g-variant-get-data-as-bytes.patch/glib/tests/gvariant.c (+4339/-0) .pc/g-variant-new-take-string.patch/docs/reference/glib/glib-sections.txt (+3227/-0) .pc/g-variant-new-take-string.patch/glib/gvariant.c (+5328/-0) .pc/g-variant-new-take-string.patch/glib/gvariant.h (+395/-0) .pc/gicon-serialization-support.patch/docs/reference/gio/gio-docs.xml (+306/-0) .pc/gicon-serialization-support.patch/docs/reference/gio/gio-sections.txt (+4024/-0) .pc/gicon-serialization-support.patch/gio/Makefile.am (+786/-0) .pc/gicon-serialization-support.patch/gio/gemblem.c (+359/-0) .pc/gicon-serialization-support.patch/gio/gemblemedicon.c (+423/-0) .pc/gicon-serialization-support.patch/gio/gfileicon.c (+340/-0) .pc/gicon-serialization-support.patch/gio/gicon.c (+449/-0) .pc/gicon-serialization-support.patch/gio/gicon.h (+96/-0) .pc/gicon-serialization-support.patch/gio/gio.h (+164/-0) .pc/gicon-serialization-support.patch/gio/giotypes.h (+473/-0) .pc/gicon-serialization-support.patch/gio/gmenu.c (+1336/-0) .pc/gicon-serialization-support.patch/gio/gmenu.h (+177/-0) .pc/gicon-serialization-support.patch/gio/gmenumodel.h (+276/-0) .pc/gicon-serialization-support.patch/gio/gthemedicon.c (+522/-0) .pc/gicon-serialization-support.patch/gio/gvfs.h (+133/-0) .pc/gicon-serialization-support.patch/gio/tests/g-icon.c (+382/-0) debian/changelog (+11/-0) debian/libglib2.0-0.symbols (+7/-0) debian/patches/g-variant-get-data-as-bytes.patch (+58/-0) debian/patches/g-variant-new-take-string.patch (+66/-0) debian/patches/gicon-serialization-support.patch (+1205/-0) debian/patches/series (+3/-0) docs/reference/gio/gio-docs.xml (+1/-0) docs/reference/gio/gio-sections.txt (+19/-1) docs/reference/glib/glib-sections.txt (+1/-0) gio/Makefile.am (+2/-0) gio/gbytesicon.c (+264/-0) gio/gbytesicon.h (+54/-0) gio/gemblem.c (+21/-0) gio/gemblemedicon.c (+49/-0) gio/gfileicon.c (+9/-0) gio/gicon.c (+277/-39) gio/gicon.h (+7/-0) gio/gio.h (+1/-0) gio/giotypes.h (+1/-0) gio/gmenu.c (+41/-0) gio/gmenu.h (+4/-0) gio/gmenumodel.h (+15/-0) gio/gthemedicon.c (+9/-0) gio/gvfs.h (+2/-1) gio/tests/g-icon.c (+121/-1) glib/gvariant-core.c (+14/-1) glib/gvariant.c (+36/-0) glib/gvariant.h (+2/-0) glib/tests/gvariant.c (+14/-3) |
| To merge this branch: | bzr merge lp://qastaging/~attente/glib/gicon-upstream |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Commit message
* debian/
- Add upstream's g_variant_
* debian/
- Add upstream's GVariant bytes serialization bug fix.
* debian/
- Add upstream's improved GIcon serialization support.
Description of the change
Patch GLib with upstream bug fixes to GVariant and changes to GIcon interface.
To post a comment you must log in.
Revision history for this message
| Sebastien Bacher (seb128) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
thanks, setting as "merged" since we got the new glib