Merge lp://qastaging/~noskcaj/ubuntu/utopic/libgtkdatabox/merge into lp://qastaging/ubuntu/utopic/libgtkdatabox
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/utopic/libgtkdatabox/merge |
| Merge into: | lp://qastaging/ubuntu/utopic/libgtkdatabox |
| Diff against target: |
19142 lines (+77/-18740) 23 files modified
.pc/01_libglage_example.patch/examples/basics_libglade.c (+0/-222) .pc/04_missing_includes.patch/gtk/gtkdatabox_graph.c (+0/-502) .pc/04_missing_includes.patch/gtk/gtkdatabox_markers.c (+0/-622) .pc/05_explicit_link_libm.patch/examples/Makefile.am (+0/-74) .pc/05_explicit_link_libm.patch/examples/Makefile.in (+0/-661) .pc/06_gladeui-2.0.patch/configure (+0/-15714) .pc/06_gladeui-2.0.patch/configure.ac (+0/-128) .pc/06_gladeui-2.0.patch/glade/Makefile.am (+0/-57) .pc/06_gladeui-2.0.patch/glade/Makefile.in (+0/-689) .pc/applied-patches (+0/-4) configure (+10/-10) configure.ac (+3/-4) debian/changelog (+21/-0) debian/control (+13/-18) debian/libgtkdatabox-0.9.2-0.lintian-overrides (+1/-1) debian/rules (+2/-4) examples/Makefile.am (+2/-4) examples/Makefile.in (+2/-4) examples/basics_libglade.c (+19/-0) glade/Makefile.am (+2/-6) glade/Makefile.in (+2/-8) gtk/gtkdatabox_graph.c (+0/-4) gtk/gtkdatabox_markers.c (+0/-4) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/libgtkdatabox/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian. Improves multiarch support
To post a comment you must log in.
Unmerged revisions
- 20. By Jackson Doak
-
* Sync with Debian. Remaining change:
- Use dh-autoreconf for newer arches. - 19. By Jackson Doak
-
Merging shared upstream rev into target branch.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.