Merge lp://staging/~noskcaj/ubuntu/trusty/garcon/git-snapshot into lp://staging/ubuntu/trusty/garcon
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~noskcaj/ubuntu/trusty/garcon/git-snapshot |
Merge into: | lp://staging/ubuntu/trusty/garcon |
Diff against target: |
74885 lines (+4988/-66207) 148 files modified
ChangeLog (+0/-5846) INSTALL (+0/-370) Makefile.am (+1/-1) Makefile.in (+0/-898) NEWS.libxfce4menu (+37/-0) aclocal.m4 (+0/-11301) autogen.sh (+37/-0) compile (+0/-347) config.guess (+0/-1535) config.h.in (+0/-134) config.sub (+0/-1790) configure (+0/-18212) configure.ac (+0/-163) configure.ac.in (+162/-0) data/Makefile.in (+0/-667) data/xfce/Makefile.in (+0/-590) debian/changelog (+12/-0) debian/control (+4/-3) debian/libgarcon-1-0-dev.install (+1/-1) debian/libgarcon-1-0.symbols (+12/-0) debian/rules (+3/-0) depcomp (+0/-790) docs/Makefile.in (+0/-652) docs/reference/Makefile.in (+0/-815) docs/reference/garcon-sections.txt (+242/-247) docs/reference/gdesktopmenu-sections.txt (+317/-0) docs/reference/gdesktopmenu.types (+11/-0) docs/reference/html/api-index-full.html (+0/-670) docs/reference/html/garcon-Desktop-Environment-Configuration.html (+0/-101) docs/reference/html/garcon-GarconMenu.html (+0/-490) docs/reference/html/garcon-GarconMenuDirectory.html (+0/-460) docs/reference/html/garcon-GarconMenuElement.html (+0/-140) docs/reference/html/garcon-GarconMenuItem.html (+0/-460) docs/reference/html/garcon-GarconMenuItemCache.html (+0/-131) docs/reference/html/garcon-GarconMenuMerger.html (+0/-89) docs/reference/html/garcon-GarconMenuParser.html (+0/-85) docs/reference/html/garcon-GarconMenuSeparator.html (+0/-85) docs/reference/html/garcon-GarconMenuTreeProvider.html (+0/-85) docs/reference/html/garcon-Version-Information.html (+0/-285) docs/reference/html/garcon-garcon-menu-item-pool.html (+0/-157) docs/reference/html/garcon-garcon-menu-node.html (+0/-446) docs/reference/html/garcon-garcon.html (+0/-63) docs/reference/html/garcon-menus.html (+0/-56) docs/reference/html/garcon-miscellaneous.html (+0/-44) docs/reference/html/garcon-parsing.html (+0/-47) docs/reference/html/garcon.devhelp2 (+0/-184) docs/reference/html/index.html (+0/-99) docs/reference/html/index.sgml (+0/-215) docs/reference/html/object-tree.html (+0/-35) docs/reference/html/pt01.html (+0/-49) docs/reference/html/style.css (+0/-266) docs/reference/tmpl/garcon-config.sgml (+0/-102) docs/reference/tmpl/garcon-environment.sgml (+0/-41) docs/reference/tmpl/garcon-marshal.sgml (+0/-37) docs/reference/tmpl/garcon-menu-directory.sgml (+0/-158) docs/reference/tmpl/garcon-menu-element.sgml (+0/-102) docs/reference/tmpl/garcon-menu-item-cache.sgml (+0/-78) docs/reference/tmpl/garcon-menu-item-pool.sgml (+0/-110) docs/reference/tmpl/garcon-menu-item.sgml (+0/-403) docs/reference/tmpl/garcon-menu-merger.sgml (+0/-53) docs/reference/tmpl/garcon-menu-node.sgml (+0/-354) docs/reference/tmpl/garcon-menu-parser.sgml (+0/-51) docs/reference/tmpl/garcon-menu-separator.sgml (+0/-40) docs/reference/tmpl/garcon-menu-tree-provider.sgml (+0/-51) docs/reference/tmpl/garcon-menu.sgml (+0/-151) docs/reference/tmpl/garcon-private.sgml (+0/-31) docs/reference/tmpl/garcon.sgml (+0/-31) docs/reference/tmpl/stamp-garcon-marshal.sgml (+0/-24) docs/reference/version.xml (+0/-1) garcon-gtk/Makefile.am (+82/-0) garcon-gtk/garcon-gtk-menu.c (+871/-0) garcon-gtk/garcon-gtk-menu.h (+80/-0) garcon-gtk/garcon-gtk.h (+33/-0) garcon-gtk/garcon-gtk2-1.pc.in (+13/-0) garcon/Makefile.in (+0/-1019) garcon/garcon-config.h (+0/-94) garcon/garcon-environment.c (+27/-0) garcon/garcon-environment.h (+15/-2) garcon/garcon-marshal.c (+0/-89) garcon/garcon-marshal.h (+0/-23) garcon/garcon-menu-directory.c (+6/-5) garcon/garcon-menu-item-cache.c (+1/-5) garcon/garcon-menu-item-pool.c (+1/-5) garcon/garcon-menu-item.c (+1/-5) garcon/garcon-menu-merger.c (+1/-5) garcon/garcon-menu-parser.c (+1/-5) garcon/garcon-menu.c (+1/-5) garcon/garcon-menu.h (+4/-0) gtk-doc.make (+0/-280) install-sh (+0/-527) ltmain.sh (+0/-9655) missing (+0/-215) po/Makefile.in.in (+0/-223) po/POTFILES.in (+1/-0) po/ar.po (+46/-46) po/bg.po (+44/-34) po/ca.po (+47/-62) po/cs.po (+49/-60) po/da.po (+46/-61) po/de.po (+48/-60) po/el.po (+47/-57) po/en_AU.po (+159/-0) po/en_GB.po (+48/-46) po/eo.po (+47/-34) po/es.po (+49/-59) po/eu.po (+44/-58) po/fi.po (+49/-35) po/fr.po (+52/-60) po/gl.po (+47/-58) po/he.po (+48/-44) po/hr.po (+49/-46) po/hu.po (+46/-57) po/id.po (+48/-59) po/is.po (+46/-33) po/it.po (+48/-52) po/ja.po (+27/-15) po/kk.po (+43/-44) po/ko.po (+48/-38) po/lt.po (+49/-35) po/ms.po (+159/-0) po/nb.po (+63/-41) po/nb_NO.po (+0/-150) po/nl.po (+48/-46) po/nn.po (+46/-32) po/oc.po (+159/-0) po/pl.po (+43/-52) po/pt.po (+48/-37) po/pt_BR.po (+49/-63) po/pt_PT.po (+0/-146) po/ro.po (+46/-35) po/ru.po (+50/-35) po/sl.po (+59/-45) po/sq.po (+63/-52) po/sr.po (+48/-32) po/sv.po (+62/-61) po/te.po (+44/-42) po/th.po (+159/-0) po/tr.po (+49/-61) po/ug.po (+46/-32) po/uk.po (+47/-59) po/ur.po (+0/-146) po/uz.po (+160/-0) po/zh_CN.po (+53/-39) po/zh_HK.po (+160/-0) po/zh_TW.po (+47/-47) tests/Makefile.in (+0/-717) tests/gdb-test-display-menu (+3/-0) tests/run-test-display-menu.sh (+26/-0) |
To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/trusty/garcon/git-snapshot |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach | Approve | ||
Review via email: mp+202576@code.staging.launchpad.net |
Description of the change
New upstream git snapshot. Needed for xubuntu 14.04's gtk3 indicators
To post a comment you must log in.
Unmerged revisions
- 25. By Jackson Doak
-
Update symbols
- 24. By Jackson Doak
-
Don't try to install garcon gtk-doc, it's not available in snapshots
- 23. By Jackson Doak
-
Build-depend on libxfce4ui-1-dev (>= 4.10.0)
- 22. By Jackson Doak
-
Update maintainer
- 21. By Jackson Doak
-
* New git snapshot
* Bump standards version to 3.9.5
* debian/rules: Use disable-silent- rules
Thanks. Uploaded.