Merge lp://qastaging/~noskcaj/ubuntu/trusty/gtk2-engines/merge into lp://qastaging/ubuntu/trusty/gtk2-engines
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/gtk2-engines/merge |
| Merge into: | lp://qastaging/ubuntu/trusty/gtk2-engines |
| Diff against target: |
1246 lines (+79/-922) 29 files modified
.pc/01_libm.patch/engines/clearlooks/Makefile.am (+0/-50) .pc/01_libm.patch/engines/crux/Makefile.am (+0/-25) .pc/01_libm.patch/engines/glide/Makefile.am (+0/-40) .pc/01_libm.patch/engines/hc/Makefile.am (+0/-44) .pc/01_libm.patch/engines/industrial/Makefile.am (+0/-45) .pc/01_libm.patch/engines/lua/Makefile.am (+0/-117) .pc/01_libm.patch/engines/mist/Makefile.am (+0/-22) .pc/01_libm.patch/engines/redmond/Makefile.am (+0/-43) .pc/01_libm.patch/engines/thinice/Makefile.am (+0/-24) .pc/01_libm.patch/test/Makefile.am (+0/-153) .pc/02_glib-single-include.patch/engines/clearlooks/src/animation.c (+0/-341) .pc/applied-patches (+0/-2) debian/changelog (+18/-0) debian/control (+0/-1) debian/control.in (+0/-1) debian/patches/03_automake1.14.patch (+49/-0) debian/patches/series (+1/-0) debian/rules (+0/-3) engines/clearlooks/Makefile.am (+1/-1) engines/clearlooks/src/animation.c (+1/-1) engines/crux/Makefile.am (+1/-1) engines/glide/Makefile.am (+1/-1) engines/hc/Makefile.am (+1/-1) engines/industrial/Makefile.am (+1/-1) engines/lua/Makefile.am (+1/-1) engines/mist/Makefile.am (+1/-1) engines/redmond/Makefile.am (+1/-1) engines/thinice/Makefile.am (+1/-1) test/Makefile.am (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/gtk2-engines/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian, they fixed the automake FTBFS better than we did.
To post a comment you must log in.
Revision history for this message
| Jackson Doak (noskcaj) wrote | # |
Unmerged revisions
- 74. By Jackson Doak
-
* Merge from debian, remaining changes:
- debian/control: Build depend on gnome-common, so we can get a .pot file
to use for launchpad translations
- debian/rules: build translations template
- Update watch file to only track GNOME 2.20 as gtk-engines was then
ported to gtk3 and finally abandoned.
* Drop our automake fix, debian now supports the new version
* Fix FTBS due to automake bug (Closes: #713353) - 73. 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
The last lines of the bzr commit was from debcommit.