Merge lp://staging/~noskcaj/ubuntu/trusty/gtk-doc/1.20 into lp://staging/ubuntu/trusty/gtk-doc

Proposed by Jackson Doak
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp://staging/~noskcaj/ubuntu/trusty/gtk-doc/1.20
Merge into: lp://staging/ubuntu/trusty/gtk-doc
Diff against target: 34087 lines (+17101/-5168)
96 files modified
Makefile.am (+9/-18)
Makefile.in (+16/-22)
NEWS (+74/-0)
TODO (+24/-5)
acinclude.m4 (+0/-55)
aclocal.m4 (+2/-1)
configure (+115/-60)
configure.ac (+24/-2)
debian/changelog (+14/-0)
examples/Makefile.am (+1/-1)
gtk-doc.dsl (+464/-0)
gtk-doc.dsl.in (+8/-8)
gtk-doc.flat.make (+27/-14)
gtk-doc.m4 (+32/-15)
gtk-doc.make (+27/-14)
gtk-doc.notmpl-flat.make (+24/-11)
gtk-doc.notmpl.make (+24/-11)
gtk-doc.pc.in (+1/-1)
gtk-doc.spec (+1/-1)
gtk-doc.xsl (+168/-198)
gtkdoc-common.pl (+543/-0)
gtkdoc-fixxref.in (+2/-2)
gtkdoc-mkdb.in (+1296/-495)
gtkdoc-mkhtml.in (+4/-3)
gtkdoc-scan.in (+87/-38)
gtkdoc-scangobj.in (+5/-5)
gtkdocize.in (+35/-7)
help/Makefile.in (+7/-4)
help/manual/C/index.docbook (+149/-37)
help/manual/Makefile.am (+3/-1)
help/manual/Makefile.in (+9/-6)
help/manual/bn_IN/index.docbook (+146/-34)
help/manual/de/de.po (+1382/-1158)
help/manual/de/fdl-appendix.xml (+29/-227)
help/manual/de/index.docbook (+258/-401)
help/manual/el/el.po (+1080/-750)
help/manual/el/index.docbook (+169/-38)
help/manual/en_GB/index.docbook (+152/-35)
help/manual/es/es.po (+1300/-778)
help/manual/es/index.docbook (+109/-39)
help/manual/fr/index.docbook (+163/-27)
help/manual/gu/index.docbook (+151/-34)
help/manual/pt_BR/fdl-appendix.xml (+233/-0)
help/manual/pt_BR/index.docbook (+1529/-0)
help/manual/pt_BR/pt_BR.po (+5360/-0)
help/manual/sl/index.docbook (+147/-35)
help/manual/sv/index.docbook (+147/-35)
help/manual/ta/index.docbook (+151/-34)
help/manual/te/index.docbook (+151/-34)
help/manual/zh_CN/index.docbook (+165/-38)
m4/gtkdoc_jh_check_xml_catalog.m4 (+16/-0)
m4/gtkdoc_jh_path_xml_catalog.m4 (+61/-0)
style.css (+0/-266)
style/style.css (+461/-0)
tests/Makefile.am (+2/-0)
tests/Makefile.in (+9/-4)
tests/annotations/Makefile.in (+7/-4)
tests/annotations/docs/Makefile.in (+21/-15)
tests/annotations/docs/tester-sections.txt (+1/-0)
tests/annotations/src/Makefile.in (+7/-4)
tests/annotations/src/tester.c (+10/-0)
tests/annotations/src/tester.h (+2/-0)
tests/bugs/Makefile.in (+7/-4)
tests/bugs/docs/Makefile.am (+1/-1)
tests/bugs/docs/Makefile.in (+22/-16)
tests/bugs/docs/tester-sections.txt (+3/-0)
tests/bugs/src/Makefile.in (+7/-4)
tests/bugs/src/tester.c (+30/-0)
tests/bugs/src/tester.h (+8/-0)
tests/empty.sh (+5/-0)
tests/empty/Makefile.in (+7/-4)
tests/empty/docs/Makefile.in (+21/-15)
tests/empty/docs/tester-sections.txt (+3/-0)
tests/empty/src/Makefile.in (+7/-4)
tests/empty/src/tester.c (+12/-0)
tests/empty/src/tester.h (+10/-0)
tests/fail/Makefile.in (+7/-4)
tests/fail/docs/Makefile.in (+21/-15)
tests/fail/src/Makefile.in (+7/-4)
tests/gobject/Makefile.in (+7/-4)
tests/gobject/docs-tmpl/Makefile.in (+24/-18)
tests/gobject/docs-tmpl/tester-docs.xml (+1/-0)
tests/gobject/docs-tmpl/tester-sections.txt (+13/-0)
tests/gobject/docs/Makefile.in (+21/-15)
tests/gobject/docs/tester-docs.xml (+1/-0)
tests/gobject/docs/tester-sections.txt (+13/-0)
tests/gobject/docs/tester.types (+2/-0)
tests/gobject/src/Makefile.in (+7/-4)
tests/gobject/src/gobject.c (+143/-4)
tests/gobject/src/gobject.h (+15/-0)
tests/gobject/src/gtypes.c (+13/-0)
tests/gobject/src/gtypes.h (+14/-0)
tests/gtk-doc.make (+17/-14)
tests/gtk-doc.notmpl.make (+14/-11)
tests/gtkdoctest.sh (+2/-1)
tests/sanity.sh (+2/-1)
To merge this branch: bzr merge lp://staging/~noskcaj/ubuntu/trusty/gtk-doc/1.20
Reviewer Review Type Date Requested Status
Iain Lane (community) Approve
Review via email: mp+206807@code.staging.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

Just did this myself, then I thought about checking the queue & I saw your one here. Uploaded!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: