lp://staging/~attente/gobject-introspection/glib-gio-gir

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/ubuntu/saucy/gobject-introspection

Martin Pitt: Disapprove on 2013-06-24

Diff: 71296 lines (+71170/-4)

8 files modified

.pc/applied-patches (+1/-0)
.pc/update-gir-for-gicon-support.patch/gir/gio-2.0.c (+33538/-0)
.pc/update-gir-for-gicon-support.patch/gir/glib-2.0.c (+33976/-0)
debian/changelog (+7/-0)
debian/patches/series (+1/-0)
debian/patches/update-gir-for-gicon-support.patch (+2064/-0)
gir/gio-2.0.c (+1556/-4)
gir/glib-2.0.c (+27/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

44. By William Hua on 2013-07-08

Cherry pick 70cc4b9479943ec95d3b95b1786b79c9bfd2cce0 from upstream.

43. By William Hua on 2013-07-08

Revert debian/patches/update-gir-for-gicon-support.patch.

42. By William Hua on 2013-06-18

* debian/patches/update-gir-for-gicon-support.patch:
  - Update glib-2.0.gir and gio-2.0.gir from source annotations.

41. By Martin Pitt on 2013-05-08

Merge experimental branch.

40. By Martin Pitt on 2013-03-27

* New upstream release.
* Bump glib build dependency according to configure.ac.
* Bump Standards-Version to 3.9.4. No changes necessary.

39. By Sjoerd Simons on 2013-03-18

[ Martin Pitt ]
* debian/tests/build:
  - Add -Wall -Werror for being more thorough, and fix resulting errors.
  - Don't call deprecated g_type_init() when building with glib >= 2.35.

[ Emilio Pozuelo Monfort ]
* New upstream release.
  + debian/patches/00git_glib_2.34.2_annotations.patch:
    - Removed, included upstream.
  + debian/control.in:
    - Update build dependencies.

[ Sjoerd Simons ]
* Sync with Ubuntu
  + Use the same git snapshot as Ubuntu (1.35.8+git20130220). The official
    tarballs are missing some bits required for testing
  + debian/gobject-introspection.install: Updated
  + debian/libgirepository-1.0-1.symbols: Updated

38. By Martin Pitt on 2013-02-20

* New upstream release, plus current changes from git to fix tests.
* Drop 01_template_path.patch, fixed upstream.
* debian/gobject-introspection.install: Update for moved location of doc
  templates.

37. By Martin Pitt on 2013-01-16

Add debian/patches/01_template_path.patch: Revert installed template path
lookup from upstream commit 8b23c6c as that did not actually change the
destination. Fixes g-ir-doc-tool.

36. By Martin Pitt on 2012-11-13

* New upstream bug fix release.
* Add 00git_glib_2.34.2_annotations.patch: Update glib annotations to
  2.34.2. Also committed to upstream gnome-3-6 branch.

35. By Martin Pitt on 2012-10-22

* New upstream release.
* debian/control.in: Bump glib requirement to >= 2.34.1 according to
  upstream configure.ac.