lp://staging/~noskcaj/ubuntu/utopic/gtk-doc/1.21

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/utopic/gtk-doc at revision 32

Ubuntu branches: Pending requested 2014-08-02

Diff: 24822 lines (+5101/-6336)

45 files modified

Makefile.am (+7/-2)
Makefile.in (+15/-11)
NEWS (+39/-0)
TODO (+18/-59)
configure (+13/-17)
configure.ac (+6/-5)
debian/changelog (+18/-0)
debian/control (+2/-2)
debian/control.in (+1/-1)
gtk-doc.spec (+1/-1)
gtk-doc.xsl (+13/-13)
gtkdoc-fixxref.in (+10/-18)
gtkdoc-mkdb.in (+145/-165)
gtkdoc-scan.in (+9/-6)
gtkdoc-scanobj.in (+0/-580)
help/manual/C/index.docbook (+105/-213)
help/manual/Makefile.am (+4/-2)
help/manual/Makefile.in (+4/-2)
help/manual/bn_IN/index.docbook (+113/-198)
help/manual/de/index.docbook (+166/-219)
help/manual/el/el.po (+926/-824)
help/manual/el/fdl-appendix.xml (+1/-1)
help/manual/el/index.docbook (+213/-370)
help/manual/en_GB/index.docbook (+108/-184)
help/manual/es/es.po (+1024/-690)
help/manual/es/index.docbook (+56/-168)
help/manual/fr/fr.po (+1/-1)
help/manual/fr/index.docbook (+167/-226)
help/manual/gu/index.docbook (+113/-183)
help/manual/pt_BR/index.docbook (+105/-274)
help/manual/pt_BR/pt_BR.po (+775/-681)
help/manual/sl/index.docbook (+109/-217)
help/manual/sv/index.docbook (+109/-217)
help/manual/ta/index.docbook (+107/-191)
help/manual/te/index.docbook (+108/-178)
help/manual/zh_CN/index.docbook (+180/-256)
style/style.css (+153/-138)
tests/annotations/docs/tester-sections.txt (+5/-0)
tests/annotations/src/tester.c (+77/-1)
tests/annotations/src/tester.h (+22/-16)
tests/bugs/docs/tester-sections.txt (+3/-0)
tests/bugs/src/tester.c (+1/-1)
tests/bugs/src/tester.h (+34/-5)
tests/gobject/docs/tester-sections.txt (+2/-0)
tests/gobject/src/gobject.h (+13/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

32. By Jackson Doak on 2014-08-02

* Merge from debian. Remaining changes:
  - debian/control.in: Drop optional highlight dependency, which is in
    universe.
* Team upload.
* New upstream release
* debian/control: Bump standards-version to 3.9.5 (no changes)

31. By Jackson Doak on 2014-08-02

Merging shared upstream rev into target branch.

30. By Jackson Doak on 2014-02-19

* Merge from debian. Remaining changes:
  - debian/control.in: Drop optional highlight dependency, which is in
    universe.

29. By Jackson Doak on 2013-12-19

* Merge from debian. Remaining changes:
  - debian/control.in: Drop optional highlight dependency, which is in
    universe.

28. By Jeremy Bícha on 2013-07-31

* debian/control.in:
  - Don't build-depend on gnome-doc-utils or scrollkeeper

27. By Robert Ancell on 2013-07-02

* New upstream release
* debian/control:
  - Build-depend on yelp-tools
* debian/patches/01_type_init.patch:
  - Applied upstream

26. By dobey on 2013-01-28

* debian/patches/01_type_init.patch:
  - Generate code to deal with g_type_init being deprecated. (LP: #1103744)
* debian/control.in:
  - Update standards version to 3.9.4.

25. By Martin Pitt on 2013-01-28

releasing version 1.18-2ubuntu2

24. By Martin Pitt on 2013-01-28

* debian/patches/01_type_init.patch:
  - Generate code to deal with g_type_init being deprecated. (LP: #1103744)
* debian/control.in:
  - Update standards version to 3.9.4.

23. By Martin Pitt on 2012-03-19

* Merge with Debian unstable. Remaining Ubuntu changes:
  - debian/control.in: Drop optional highlight dependency, which is in
    universe.