lp://staging/~noskcaj/ubuntu/trusty/libpeas/merge

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/ubuntu/trusty/libpeas

Daniel Holbach: Approve on 2013-12-20

Diff: 1188 lines (+51/-1042)

11 files modified

.pc/0001-Fix-tests-after-glib-string-change.patch/tests/libpeas-gtk/testing/testing.c (+0/-170)
.pc/0001-Fix-tests-after-glib-string-change.patch/tests/libpeas/extension-set.c (+0/-316)
.pc/0001-Fix-tests-after-glib-string-change.patch/tests/libpeas/testing/testing-extension.c (+0/-550)
.pc/applied-patches (+0/-1)
debian/changelog (+20/-0)
debian/patches/0002-Fix-autogen-with-latest-gnome-common.patch (+24/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-0)
tests/libpeas-gtk/testing/testing.c (+1/-1)
tests/libpeas/extension-set.c (+1/-1)
tests/libpeas/testing/testing-extension.c (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

43. By Jackson Doak on 2013-12-19

* Sync with Debian. Remaining changes:
  - debian/control.in:
    + Don't build-depend against seed or gjs since they're in universe
  - debian/rules:
    + Explicitly disable gjs and seed

42. By Jeremy Bícha on 2013-08-01

* Sync with Debian. Remaining changes:
  - debian/control.in:
    + Don't build-depend against seed or gjs since they're in universe
  - debian/rules:
    + Explicitly disable gjs and seed

41. By Iain Lane on 2013-06-17

debian/patches/0001-Fix-tests-after-glib-string-change.patch: Cherry-pick
from upstream to work with `old' and 'new' GLib strings. Fixes FTBFS in
test suite.

40. By Jeremy Bícha on 2013-04-28

* Sync with Debian. (LP: #1173949)
* debian/control.in:
  - Don't build-depend against seed or gjs since they're in universe
* debian/rules:
  - Explicitly disable gjs and seed

39. By Robert Ancell on 2013-01-16

* New upstream release
* debian/control:
  - Use standards version 3.9.4

38. By Robert Ancell on 2013-01-16

* New upstream release (LP: #1032098)
* debian/control:
  - Drop build-dependency on valac-0.14
  - Bump build-dependency on libgtk-3-dev
* debian/libpeas-1.0-0.symbols:
  - Updated

37. By Dimitri John Ledkov on 2012-10-26

Rebuild against python3.3.

36. By Barry Warsaw on 2012-06-21

No change rebuild. LP: #1015868

35. By Barry Warsaw on 2012-06-19

Build the Python 3 plugin, and enable it to exist next to the Python 2
plugin (though only one can be used by an application at a time). Add
Python 3 support to peas-demo.

34. By Robert Ancell on 2012-05-28

* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
* debian/rules:
  - Disable seed as it's not in main