Merge lp://qastaging/~yolanda.robla/ubuntu/saucy/rrdtool/lua5.2 into lp://qastaging/ubuntu/saucy/rrdtool
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Mathieu Trudel-Lapierre | ||||
Proposed branch: | lp://qastaging/~yolanda.robla/ubuntu/saucy/rrdtool/lua5.2 | ||||
Merge into: | lp://qastaging/ubuntu/saucy/rrdtool | ||||
Diff against target: |
278 lines (+124/-35) 10 files modified
debian/changelog (+15/-0) debian/control (+11/-26) debian/liblua5.1-rrd-dev.install (+0/-3) debian/liblua5.1-rrd0.install (+0/-2) debian/liblua5.2-rrd-dev.install (+3/-0) debian/liblua5.2-rrd0.install (+2/-0) debian/patches/fix-makefile-tcl.patch (+14/-0) debian/patches/rrdtool-1.4.7-lua-5.2.patch (+72/-0) debian/patches/series (+2/-0) debian/rules (+5/-4) |
||||
To merge this branch: | bzr merge lp://qastaging/~yolanda.robla/ubuntu/saucy/rrdtool/lua5.2 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email:
|
Description of the change
Updated to lua 5.2
Unmerged revisions
- 41. By Yolanda Robla
-
* Dropping ruby 1.9 dependency:
- debian/control: dropped ruby 1.8 deps and librdd-ruby1.8 package
- debian/rules: not building for 1.8 - 40. By Yolanda Robla
-
* Updating to lua 5.2 version (LP: #1196921):
- debian/rules: build 5.2 version, use autoconf
- debian/control: update lua to 5.2 version, added autoreconf
- debian/liblua5. 2-rrd0. install: updated path to 5.2 version
- debian/liblua5. 2-rrd-dev. install: updated path to 5.2 version
- debian/patches/ rrdtool- 1.4.7-lua- 5.2.patch: fixes for lua 5.2 version - 39. By Yolanda Robla
-
* debian/rules: build 5.2 version, use autoconf
* debian/control: update lua to 5.2 version, added autoreconf
* debian/liblua5. 2-rrd0. install: updated path to 5.2 version
* debian/liblua5. 2-rrd-dev. install: updated path to 5.2 version
* debian/patches/ rrdtool- 1.4.7-lua- 5.2.patch: fixes for lua 5.2 version - 38. By Yolanda Robla
-
applying patches
- 37. By Yolanda Robla
-
* debian/
liblua5. 2-rrd0. install: copying librrd.so.4 version
* debian/liblua5. 2-rrd-dev. install: moved to 5.2 from 5.1 - 36. By Yolanda Robla
-
* debian/
liblua5. 2-rrd0. install: moved to 5.2 from 5.1
* debian/liblua5. 2-rrd-dev. install: moved to 5.2 from 5.1
* debian/rules: build 5.2 version
* debian/control: update lua to 5.2 version
Please recheck