Merge lp://staging/~noskcaj/ubuntu/trusty/libpeas/merge into lp://staging/ubuntu/trusty/libpeas
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~noskcaj/ubuntu/trusty/libpeas/merge |
| Merge into: | lp://staging/ubuntu/trusty/libpeas |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/trusty/libpeas/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Unmerged revisions
- 43. By Jackson Doak
-
* 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
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.