Merge lp://staging/~dbusmenu-team/libdbusmenu/ubuntu into lp://staging/libdbusmenu/0.5
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~dbusmenu-team/libdbusmenu/ubuntu |
Merge into: | lp://staging/libdbusmenu/0.5 |
Diff against target: |
67319 lines (+66205/-527) 110 files modified
.bzrignore (+0/-229) AUTHORS (+17/-0) ChangeLog (+5918/-0) Makefile.in (+821/-0) aclocal.m4 (+10063/-0) autogen.sh (+0/-12) compile (+143/-0) config.guess (+1502/-0) config.h.in (+86/-0) config.sub (+1714/-0) configure (+16483/-0) debian/changelog (+657/-0) debian/control (+225/-0) debian/copyright (+40/-0) debian/gir1.2-dbusmenu-glib-0.4.install (+1/-0) debian/gir1.2-dbusmenu-gtk-0.4.install (+1/-0) debian/gir1.2-dbusmenu-gtk3-0.4.install (+1/-0) debian/libdbusmenu-glib-dev.install (+6/-0) debian/libdbusmenu-glib-doc.install (+1/-0) debian/libdbusmenu-glib3.install (+1/-0) debian/libdbusmenu-gtk-dev.install (+6/-0) debian/libdbusmenu-gtk-doc.install (+1/-0) debian/libdbusmenu-gtk3-3.install (+1/-0) debian/libdbusmenu-gtk3-dev.install (+5/-0) debian/libdbusmenu-gtk3.install (+1/-0) debian/libdbusmenu-jsonloader-dev.install (+4/-0) debian/libdbusmenu-jsonloader3.install (+1/-0) debian/libdbusmenu-tools.install (+3/-0) debian/rules (+45/-0) debian/source/format (+1/-0) debian/watch (+2/-0) depcomp (+630/-0) docs/Makefile.in (+613/-0) docs/libdbusmenu-glib/Makefile.in (+613/-0) docs/libdbusmenu-glib/reference/Makefile.in (+689/-0) docs/libdbusmenu-glib/reference/html/annotation-glossary.html (+71/-0) docs/libdbusmenu-glib/reference/html/api-index-full.html (+406/-0) docs/libdbusmenu-glib/reference/html/ch01.html (+48/-0) docs/libdbusmenu-glib/reference/html/index.html (+46/-0) docs/libdbusmenu-glib/reference/html/index.sgml (+120/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html (+427/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClientMenuitem.html (+92/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html (+1326/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html (+154/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html (+260/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp (+109/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2 (+109/-0) docs/libdbusmenu-glib/reference/html/object-tree.html (+32/-0) docs/libdbusmenu-glib/reference/html/style.css (+266/-0) docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml (+52/-0) docs/libdbusmenu-glib/reference/tmpl/client.sgml (+168/-0) docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml (+57/-0) docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml (+520/-0) docs/libdbusmenu-glib/reference/tmpl/server.sgml (+112/-0) docs/libdbusmenu-glib/reference/version.xml (+1/-0) docs/libdbusmenu-glib/reference/xml/annotation-glossary.xml (+64/-0) docs/libdbusmenu-glib/reference/xml/api-index-deprecated.xml (+8/-0) docs/libdbusmenu-glib/reference/xml/api-index-full.xml (+105/-0) docs/libdbusmenu-glib/reference/xml/client-menuitem.xml (+70/-0) docs/libdbusmenu-glib/reference/xml/client.xml (+322/-0) docs/libdbusmenu-glib/reference/xml/menuitem-proxy.xml (+103/-0) docs/libdbusmenu-glib/reference/xml/menuitem.xml (+915/-0) docs/libdbusmenu-glib/reference/xml/server.xml (+199/-0) docs/libdbusmenu-gtk/Makefile.in (+613/-0) docs/libdbusmenu-gtk/reference/Makefile.in (+685/-0) docs/libdbusmenu-gtk/reference/html/api-index-full.html (+122/-0) docs/libdbusmenu-gtk/reference/html/ch01.html (+42/-0) docs/libdbusmenu-gtk/reference/html/index.html (+39/-0) docs/libdbusmenu-gtk/reference/html/index.sgml (+33/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html (+316/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html (+169/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html (+256/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp (+36/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp2 (+36/-0) docs/libdbusmenu-gtk/reference/html/object-tree.html (+42/-0) docs/libdbusmenu-gtk/reference/html/style.css (+266/-0) docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-sections.txt (+70/-0) docs/libdbusmenu-gtk/reference/libdbusmenu-gtk.types (+3/-0) docs/libdbusmenu-gtk/reference/tmpl/client.sgml (+115/-0) docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml (+22/-0) docs/libdbusmenu-gtk/reference/tmpl/libdbusmenu-gtk-unused.sgml (+118/-0) docs/libdbusmenu-gtk/reference/tmpl/menu.sgml (+67/-0) docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml (+84/-0) docs/libdbusmenu-gtk/reference/version.xml (+1/-0) docs/libdbusmenu-gtk/reference/xml/api-index-deprecated.xml (+8/-0) docs/libdbusmenu-gtk/reference/xml/api-index-full.xml (+33/-0) docs/libdbusmenu-gtk/reference/xml/client.xml (+214/-0) docs/libdbusmenu-gtk/reference/xml/genericmenuitem.xml (+36/-0) docs/libdbusmenu-gtk/reference/xml/menu.xml (+118/-0) docs/libdbusmenu-gtk/reference/xml/menuitem.xml (+165/-0) install-sh (+520/-0) libdbusmenu-glib/Doxyfile (+0/-257) libdbusmenu-glib/Makefile.in (+958/-0) libdbusmenu-glib/client-marshal.c (+131/-0) libdbusmenu-glib/client-marshal.h (+28/-0) libdbusmenu-glib/dbus-menu-clean.xml.c (+132/-0) libdbusmenu-glib/dbus-menu-clean.xml.h (+1/-0) libdbusmenu-glib/menuitem-marshal.c (+170/-0) libdbusmenu-glib/menuitem-marshal.h (+45/-0) libdbusmenu-glib/server-marshal.c (+164/-0) libdbusmenu-glib/server-marshal.h (+36/-0) libdbusmenu-gtk/Makefile.in (+1005/-0) ltmain.sh (+8413/-0) missing (+376/-0) mkinstalldirs (+162/-0) po/Makefile.in.in (+217/-0) tests/Makefile.in (+2204/-0) tools/Makefile.in (+858/-0) tools/testapp/CMakeLists.txt (+0/-29) tools/testapp/Makefile.in (+619/-0) |
To merge this branch: | bzr merge lp://staging/~dbusmenu-team/libdbusmenu/ubuntu |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Pending | ||
Review via email: mp+47721@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2011-01-27.
Description of the change
0.3.94
Unmerged revisions
- 177. By Sebastien Bacher
-
releasing version 0.5.93-0ubuntu2
- 176. By Sebastien Bacher
-
Backport fix for signal warnings displayed on close (lp: #950762)
- 175. By Sebastien Bacher
-
releasing version 0.5.93-0ubuntu1
- 174. By Sebastien Bacher
-
* New upstream release.
* Setting the ATK Role on menu items (LP: #878708)
* Cleaning up code paths to avoid goto's (LP: #940651)
* Fixing setting an icon multiple times (LP: #934574) - 173. By Sebastien Bacher
-
releasing version 0.5.92-0ubuntu1
- 172. By Sebastien Bacher
-
releasing version 0.5.91-0ubuntu2
- 171. By Sebastien Bacher
-
debian/control: restore gtk2 gir depends until that source is updated
- 170. By Sebastien Bacher
-
releasing version 0.5.91-0ubuntu1
- 169. By Sebastien Bacher
-
* debian/control:
- drop git binaries, the libdev depends on it
- set ubuntu vcs
- use the current vala version
[ Ted Gould ]
* New upstream release.
* Remove unused const on GStrv's
* Only free when there is data to free
* Ensure that we only return once even with error (LP: #929856)
* Fix an error on a failure to send properties (LP: #929707)
* Ensure the hash variant isn't NULL in the comparison (LP: #929710)
* Fix some of the issues with throwing criticals
* Ensure our tests fail if they throw criticals
* Parse and handle a11y descriptions
* Don't pass NULL to ATK
* Non-srcdir build fixes - 168. By Ken VanDine
-
releasing version 0.5.90-0ubuntu1