lp:~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201101212212

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/natty/gobject-introspection

Ubuntu branches: Pending requested 2011-01-21

Diff: 8790 lines (+2886/-5641) (has conflicts)

12 files modified

.pc/.version (+0/-1)
.pc/0001-Preserve-the-c-type-of-array-elements.patch/giscanner/maintransformer.py (+0/-1130)
.pc/0001-Preserve-the-c-type-of-array-elements.patch/tests/scanner/Annotation-1.0-expected.gir (+0/-814)
.pc/0001-Preserve-the-c-type-of-array-elements.patch/tests/scanner/Foo-1.0-expected.gir (+0/-1170)
.pc/0001-Preserve-the-c-type-of-array-elements.patch/tests/scanner/Regress-1.0-expected.gir (+0/-2497)
.pc/applied-patches (+0/-1)
debian/changelog (+2/-2)
giscanner/maintransformer.py (+5/-0)
giscanner/scannerlexer.c (+2853/-0)
tests/scanner/Annotation-1.0-expected.gir (+7/-7)
tests/scanner/Foo-1.0-expected.gir (+2/-2)
tests/scanner/Regress-1.0-expected.gir (+17/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

39. By Ken VanDine on 2011-01-21

releasing version 0.10.1-1ubuntu1

38. By Ken VanDine on 2011-01-21

releasing version 0.10.1-1ubuntu2

37. By Ken VanDine on 2011-01-21

releasing version 0.10.1-1ubuntu1

36. By Emilio Pozuelo Monfort <email address hidden> on 2011-01-12

* New upstream release.
  - d/p/0001-Avoid-using-namespace-as-identifier-in-public-header.patch,
    d/p/0002-Regenerate-gio-2.0.c-and-gobject-2.0.c-from-current-.patch,
    d/p/0003-Regenerate-gio-2.0.c.patch,
    d/p/0004-scanner-Properly-parse-recursive-list-type-nodes.patch,
    d/p/0005-scanner-Fix-handling-of-property-transfer.patch,
    d/p/0006-scanner-Make-sure-that-vfuncs-made-to-the-GIR.patch:
    + Removed, included upstream.

35. By Robert Ancell on 2010-12-24

* debian/gir1.2-freedesktop.install:
* debian/gir1.2-glib-2.0.install:
  - Correctly rename GIR packages

34. By Rodrigo Moya on 2010-12-23

Re-add changes from 0ubuntu4 to 0ubuntu5

33. By Robert Ancell on 2010-12-23

* New upstream release
* debian/patches/00git_container_typedefs.patch:
  - Applied upstream
* debian/libgirepository1.0-1.symbols:
  - Updated

32. By Sebastien Bacher on 2010-12-16

Rebased on Debian and transitioning to the new abi naming

31. By Robert Ancell on 2010-12-15

* debian/patches/00git_container_typedefs.patch:
  - Support typedefs for container types

30. By Michael Terry on 2010-12-08

* Rebase on Debian's 0.9.12-3 packaging, remaining changes:
  - Git snapshot version and corresponding .symbols changes
* Renamed libgirepository1.0-1 to libgirepository-1.0-1 to match
  Debian and use their kindly provided provides/replaces/conflicts.
* Drop breaks/replaces on libgirepository1.0-0, which was only
  for a specific Ubuntu version during maverick's development.
  Shouldn't be needed anymore.