Merge lp://staging/~indicator-applet-developers/libappindicator/ubuntu into lp://staging/~ken-vandine/libappindicator/gdbus-ppa
Proposed by
Ted Gould
| Status: | Superseded | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~indicator-applet-developers/libappindicator/ubuntu | ||||||||||||||||||||||||||||
| Merge into: | lp://staging/~ken-vandine/libappindicator/gdbus-ppa | ||||||||||||||||||||||||||||
| Diff against target: |
51142 lines (+10848/-18012) 96 files modified
AUTHORS (+5/-0) ChangeLog (+607/-0) Makefile.am (+2/-0) Makefile.in (+7/-1) aclocal.m4 (+38/-18) bindings/Makefile.am (+8/-1) bindings/Makefile.in (+15/-5) bindings/mono/Makefile.am (+7/-0) bindings/mono/Makefile.in (+13/-1) bindings/mono/examples/IndicatorExample.cs (+8/-1) bindings/mono/examples/Makefile.in (+6/-1) bindings/mono/libappindicator-api.metadata (+8/-0) bindings/mono/libappindicator-api.raw (+41/-1) bindings/python/Makefile.in (+6/-1) bindings/python/appindicator.defs (+74/-47) bindings/vala/Makefile.am (+40/-0) bindings/vala/Makefile.in (+695/-0) bindings/vala/appindicator-0.1-custom.vala (+31/-0) bindings/vala/examples/Makefile.am (+39/-0) bindings/vala/examples/Makefile.in (+604/-0) bindings/vala/examples/indicator-example.vala (+66/-0) config.guess (+120/-105) config.sub (+101/-55) configure (+2924/-2469) configure.ac (+36/-33) debian/changelog (+0/-627) debian/compat (+0/-1) debian/control (+0/-129) debian/copyright (+0/-60) debian/gir1.2-appindicator-0.1.install (+0/-1) debian/gir1.2-appindicator3-0.1.install (+1/-0) debian/libappindicator-dev.install (+0/-5) debian/libappindicator-doc.install (+0/-1) debian/libappindicator0.1-cil-dev.install (+0/-1) debian/libappindicator0.1-cil.install (+0/-1) debian/libappindicator0.1-cil.installcligac (+0/-3) debian/libappindicator1.install (+0/-1) debian/libappindicator1.symbols (+28/-0) debian/libappindicator3-1.install (+1/-0) debian/libappindicator3-1.symbols (+28/-0) debian/libappindicator3-dev.install (+4/-0) debian/python-appindicator.install (+0/-2) debian/rules (+0/-93) debian/watch (+0/-2) docs/Makefile.in (+6/-1) docs/reference/Makefile.am (+9/-1) docs/reference/Makefile.in (+11/-2) docs/reference/html/annotation-glossary.html (+44/-0) docs/reference/html/api-index-deprecated.html (+42/-0) docs/reference/html/api-index-full.html (+0/-253) docs/reference/html/ch01.html (+0/-34) docs/reference/html/index.html (+0/-37) docs/reference/html/index.sgml (+0/-74) docs/reference/html/libappindicator-app-indicator.html (+0/-1397) docs/reference/html/libappindicator.devhelp (+0/-68) docs/reference/html/libappindicator.devhelp2 (+0/-76) docs/reference/html/object-tree.html (+0/-34) docs/reference/html/style.css (+0/-265) docs/reference/libappindicator-docs.sgml (+5/-1) docs/reference/libappindicator-docs.sgml.in (+4/-0) docs/reference/libappindicator-sections.txt (+7/-0) docs/reference/tmpl/app-indicator.sgml (+0/-466) docs/reference/tmpl/libappindicator-unused.sgml (+36/-0) docs/reference/version.xml (+1/-1) docs/reference/xml/annotation-glossary.xml (+26/-0) docs/reference/xml/api-index-deprecated.xml (+0/-8) docs/reference/xml/api-index-full.xml (+0/-65) docs/reference/xml/app-indicator.xml (+0/-1002) example/Makefile.am (+42/-4) example/Makefile.in (+78/-15) example/simple-client-vala.c (+881/-0) example/simple-client-vala.vala (+181/-0) example/simple-client.c (+65/-54) gtk-doc.make (+116/-66) ltmain.sh (+2619/-1390) m4/gtk-doc.m4 (+0/-61) m4/libtool.m4 (+0/-7377) m4/ltoptions.m4 (+0/-368) m4/ltsugar.m4 (+0/-123) m4/ltversion.m4 (+0/-23) m4/lt~obsolete.m4 (+0/-92) src/AppIndicator-0.1.metadata.in (+2/-0) src/AppIndicator3-0.1.metadata.in (+3/-0) src/Makefile.am (+19/-29) src/Makefile.in (+38/-60) src/app-indicator.c (+729/-720) src/app-indicator.h (+167/-145) src/appindicator3-0.1.pc.in (+1/-1) src/application-service-marshal.c (+74/-0) src/application-service-marshal.list (+2/-0) src/dbus-shared.h (+3/-3) src/gen-notification-item.xml.c (+13/-1) src/notification-item.xml (+13/-1) tests/Makefile.am (+15/-8) tests/Makefile.in (+29/-17) tests/test-libappindicator.desktop (+4/-3) |
||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~indicator-applet-developers/libappindicator/ubuntu | ||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-09-28.
Description of the change
VAPI fix, with a brown paper bag thrown in for fun :-/
To post a comment you must log in.
Unmerged revisions
- 292. By Ted Gould
-
releasing version 0.4.1-0ubuntu1~ppa1
- 291. By Ted Gould
-
* New upstream release (0.4.0).
* New upstream release (0.4.1).
* Fix build. - 290. By Ted Gould
-
* New upstream release.
* Fix VAPI file for Vala bindings (LP: #789588) - 289. By Ted Gould
-
Merge U. Desktop
- 288. By Ted Gould
-
releasing version 0.3.91-
0ubuntu1~ ppa1 - 287. By Ted Gould
-
* New upstream release.
* Secondary activate support
* Better GIR file annotations - 286. By Ted Gould
-
Sync to U. Desktop
- 285. By Ted Gould
-
releasing version 0.3.90-
0ubuntu1~ ppa1 - 284. By Ted Gould
-
* New upstream release.
* Fix a memory leak (LP: #)
* Port to libindicator 0.4 - 283. By Ted Gould
-
Sync to U. Desktop
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
