Merge lp://qastaging/~yolanda.robla/ubuntu/saucy/rrdtool/lua5.2 into lp://qastaging/ubuntu/saucy/rrdtool

Proposed by Yolanda Robla
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
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+175474@code.qastaging.launchpad.net

Description of the change

Updated to lua 5.2

To post a comment you must log in.
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

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

Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

Please recheck

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

This was landed already in the archive:
https://launchpad.net/ubuntu/+source/rrdtool/1.4.7-2ubuntu2

Marking rejected to get it off the sponsoring list.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: