Ubuntu
rrdtool package

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

Saucy (13.10)
lua5.2
Merge into saucy

Proposed by Yolanda Robla on 2013-07-18

Status:

Rejected

Rejected by:

Mathieu Trudel-Lapierre on 2013-08-29

Proposed branch:

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

Merge into:

lp: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:~yolanda.robla/ubuntu/saucy/rrdtool/lua5.2

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu branches		2013-07-18	Pending
Review via email: [email protected]

Description of the change

Updated to lua 5.2

lp:~yolanda.robla/ubuntu/saucy/rrdtool/lua5.2 updated on 2013-07-19

40. By Yolanda Robla on 2013-07-18: * 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 on 2013-07-19: * 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 on 2013-07-23:

Please recheck

Revision history for this message

Mathieu Trudel-Lapierre (cyphermox) wrote on 2013-08-29:

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 on 2013-07-19: * 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 on 2013-07-18: * 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 on 2013-07-18: * 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 on 2013-07-18: applying patches
37. By Yolanda Robla on 2013-07-17: * 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 on 2013-07-17: * 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

Subscribers

People subscribed via source and target branches

to all changes:

Ubuntu branches

Yolanda Robla

 === modified file 'debian/changelog'
 --- debian/changelog	2013-04-02 09:48:24 +0000
 +++ debian/changelog	2013-07-19 14:18:28 +0000
@@ -1,3 +1,18 @@
++rrdtool (1.4.7-2ubuntu2) saucy; urgency=low
++
++  * 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
++
++  * Dropping ruby 1.9 dependency:
++    - debian/control: dropped ruby 1.8 deps and librdd-ruby1.8 package
++    - debian/rules: not building for 1.8
++
++ -- Yolanda Robla <[email protected]>  Wed, 17 Jul 2013 13:02:00 +0200
++
  rrdtool (1.4.7-2ubuntu1) raring; urgency=low
    * Configure for the Tcl 8.5 multiarch installation.
 === modified file 'debian/control'
 --- debian/control	2012-08-01 10:23:39 +0000
 +++ debian/control	2013-07-19 14:18:28 +0000
@@ -11,9 +11,8 @@
   tcl-dev (>= 8), tcl-dev (<= 9),
   perl (>= 5.8.0),
   python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~),
-- ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
-- liblua5.1-0-dev, lua5.1
--Build-Conflicts: lua50
++ ruby1.9.1, ruby1.9.1-dev, liblua5.2-dev, lua5.2, dh-autoreconf
++Build-Conflicts: lua50, lua5.1
  Homepage: http://oss.oetiker.ch/rrdtool/
  Vcs-Browser: http://git.snow-crash.org/?p=pkg-rrdtool.git;a=summary
  Vcs-Git: git://git.snow-crash.org/pkg-rrdtool.git/
@@ -56,8 +55,8 @@
   ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
  Recommends: librrds-perl (= ${binary:Version}),
   rrdtool-tcl (= ${binary:Version}), python-rrdtool (= ${binary:Version}),
-- librrd-ruby1.8 (= ${binary:Version}), librrd-ruby1.9.1 (= ${binary:Version}),
-- python-all-dbg, liblua5.1-rrd0 (= ${binary:Version})
++ librrd-ruby1.9.1 (= ${binary:Version}), python-all-dbg,
++ liblua5.2-rrd0 (= ${binary:Version})
  Description: time-series data storage and display system (debugging symbols)
   The Round Robin Database Tool (RRDtool) is a system to store and display
   time-series data (e.g. network bandwidth, machine-room temperature,
@@ -178,20 +177,6 @@
   This is a dummy package which depends on the package for Debian's default
   Ruby version.
--Package: librrd-ruby1.8
--Architecture: any
--Section: ruby
--Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: time-series data storage and display system (Ruby 1.8 interface)
-- The Round Robin Database Tool (RRDtool) is a system to store and display
-- time-series data (e.g. network bandwidth, machine-room temperature,
-- server load average). It stores the data in Round Robin Databases (RRDs),
-- a very compact way that will not expand over time. RRDtool processes the
-- extracted data to enforce a certain data density, allowing for useful
-- graphical representation of data values.
-- .
-- This package contains a Ruby 1.8 interface to RRDs.
--
  Package: librrd-ruby1.9.1
  Architecture: any
  Section: ruby
@@ -206,11 +191,11 @@
+  .
   This package contains a Ruby 1.9.1 interface to RRDs.
--Package: liblua5.1-rrd0
++Package: liblua5.2-rrd0
  Architecture: any
  Section: interpreters
  Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: time-series data storage and display system (Lua 5.1 interface)
++Description: time-series data storage and display system (Lua 5.2 interface)
   The Round Robin Database Tool (RRDtool) is a system to store and display
   time-series data (e.g. network bandwidth, machine-room temperature,
   server load average). It stores the data in Round Robin Databases (RRDs),
@@ -218,13 +203,13 @@
   extracted data to enforce a certain data density, allowing for useful
   graphical representation of data values.
+  .
-- This package contains a Lua 5.1 interface to RRDs.
++ This package contains a Lua 5.2 interface to RRDs.
--Package: liblua5.1-rrd-dev
++Package: liblua5.2-rrd-dev
  Architecture: any
  Section: libdevel
--Depends: ${shlibs:Depends}, ${misc:Depends}, liblua5.1-rrd0 (= ${binary:Version})
--Description: time-series data storage and display system (Lua 5.1 development)
++Depends: ${shlibs:Depends}, ${misc:Depends}, liblua5.2-rrd0 (= ${binary:Version})
++Description: time-series data storage and display system (Lua 5.2 development)
   The Round Robin Database Tool (RRDtool) is a system to store and display
   time-series data (e.g. network bandwidth, machine-room temperature,
   server load average). It stores the data in Round Robin Databases (RRDs),
@@ -232,4 +217,4 @@
   extracted data to enforce a certain data density, allowing for useful
   graphical representation of data values.
+  .
-- This package contains development files for the Lua 5.1 interface to RRDs.
++ This package contains development files for the Lua 5.2 interface to RRDs.
 === removed file 'debian/liblua5.1-rrd-dev.install'
 --- debian/liblua5.1-rrd-dev.install	2011-06-26 18:40:41 +0000
 +++ debian/liblua5.1-rrd-dev.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
--usr/lib/lua/5.1/rrd.a
--usr/lib/lua/5.1/rrd.so
--../lua-rrd.h usr/include/lua5.1
 === removed file 'debian/liblua5.1-rrd0.install'
 --- debian/liblua5.1-rrd0.install	2009-10-05 22:27:13 +0000
 +++ debian/liblua5.1-rrd0.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
--usr/lib/lua/5.1/rrd.so.0
--usr/lib/lua/5.1/rrd.so.0.0.0
 === added file 'debian/liblua5.2-rrd-dev.install'
 --- debian/liblua5.2-rrd-dev.install	1970-01-01 00:00:00 +0000
 +++ debian/liblua5.2-rrd-dev.install	2013-07-19 14:18:28 +0000
@@ -0,0 +1,3 @@
++usr/lib/lua/5.2/rrd.a
++usr/lib/lua/5.2/rrd.so
++../lua-rrd.h usr/include/lua5.2
 === added file 'debian/liblua5.2-rrd0.install'
 --- debian/liblua5.2-rrd0.install	1970-01-01 00:00:00 +0000
 +++ debian/liblua5.2-rrd0.install	2013-07-19 14:18:28 +0000
@@ -0,0 +1,2 @@
++usr/lib/lua/5.2/rrd.so.0
++usr/lib/lua/5.2/rrd.so.0.0.0
 === added file 'debian/patches/fix-makefile-tcl.patch'
 --- debian/patches/fix-makefile-tcl.patch	1970-01-01 00:00:00 +0000
 +++ debian/patches/fix-makefile-tcl.patch	2013-07-19 14:18:28 +0000
@@ -0,0 +1,14 @@
++--- a/bindings/tcl/Makefile.am	2013-07-17 10:44:54.844364000 +0000
+++++ b/bindings/tcl/Makefile.am	2013-07-18 08:02:49.685215728 +0000
++@@ -27,8 +27,8 @@
++ tclpkg_DATA = pkgIndex.tcl
++ tclpkg_SCRIPTS = ifOctets.tcl
++ else
++-pkglib_DATA = pkgIndex.tcl
++-pkglib_SCRIPTS = ifOctets.tcl
+++pkgdata_DATA = pkgIndex.tcl
+++pkgdata_SCRIPTS = ifOctets.tcl
++ endif
++
++ # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
++
 === added file 'debian/patches/rrdtool-1.4.7-lua-5.2.patch'
 --- debian/patches/rrdtool-1.4.7-lua-5.2.patch	1970-01-01 00:00:00 +0000
 +++ debian/patches/rrdtool-1.4.7-lua-5.2.patch	2013-07-19 14:18:28 +0000
@@ -0,0 +1,72 @@
++Index: b/configure.ac
++===================================================================
++--- a/configure.ac
+++++ b/configure.ac
++@@ -744,8 +744,8 @@
++       LIBS=
++       lua_havelib=no
++       LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
++-      AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua,
++-        [AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
+++      RRD_SEARCH_LIBS(lua_call, [#include <${lua_headerdir:+$lua_headerdir/}lua.h>], [0, 0, 0], lua$lua_vdot lua$lua_vndot lua,
+++        [AC_SEARCH_LIBS(luaL_openlibs, lua$lua_vdot lua$lua_vndot lua,
++           [lua_havelib=LUA$lua_vndot],
++           [AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,
++             [lua_havelib=$lua_vndot; $LUA -l compat-5.1 2>/dev/null;
++Index: b/m4/acinclude.m4
++===================================================================
++--- a/m4/acinclude.m4
+++++ b/m4/acinclude.m4
++@@ -610,3 +610,31 @@
++                 fi
++         fi
++ ])
+++
+++dnl Like AC_SEARCH_LIBS, but allowing specifying a prologue and arguments so
+++dnl that macros expand correctly.
+++AC_DEFUN([RRD_SEARCH_LIBS],
+++[AS_VAR_PUSHDEF([rrd_Search], [rrd_cv_search_$1])dnl
+++AC_CACHE_CHECK([for library containing $1], [rrd_Search],
+++[rrd_func_search_save_LIBS=$LIBS
+++AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$1 ($3);])])
+++for rrd_lib in '' $4; do
+++  if test -z "$rrd_lib"; then
+++    rrd_res="none required"
+++  else
+++    rrd_res=-l$rrd_lib
+++    LIBS="-l$rrd_lib $7 $rrd_func_search_save_LIBS"
+++  fi
+++  AC_LINK_IFELSE([], [AS_VAR_SET([rrd_Search], [$rrd_res])])
+++  AS_VAR_SET_IF([rrd_Search], [break])
+++done
+++AS_VAR_SET_IF([rrd_Search], , [AS_VAR_SET([rrd_Search], [no])])
+++rm conftest.$ac_ext
+++LIBS=$rrd_func_search_save_LIBS])
+++AS_VAR_COPY([rrd_res], [rrd_Search])
+++AS_IF([test "$rrd_res" != no],
+++  [test "$rrd_res" = "none required" || LIBS="$rrd_res $LIBS"
+++  $5],
+++      [$6])
+++AS_VAR_POPDEF([rrd_Search])dnl
+++])
++--- a/bindings/lua/rrdlua.c	2013-07-17 10:44:54.844364000 +0000
+++++ b/bindings/lua/rrdlua.c	2013-07-18 08:36:24.705215728 +0000
++@@ -342,7 +342,7 @@
++
++ /**********************************************************/
++
++-static const struct luaL_reg rrd[] = {
+++static const struct luaL_Reg rrd[] = {
++   {"create", lua_rrd_create},
++   {"dump", lua_rrd_dump},
++   {"fetch", lua_rrd_fetch},
++@@ -373,7 +373,7 @@
++   /* luaL_module is defined in compat-5.1.c */
++   luaL_module (L, "rrd", rrd, 0);
++ #else
++-  luaL_register (L, "rrd", rrd);
+++  luaL_newlib (L, rrd);
++ #endif
++   set_info (L);
++   return 1;
++
 === modified file 'debian/patches/series'
 --- debian/patches/series	2012-08-01 10:23:39 +0000
 +++ debian/patches/series	2013-07-19 14:18:28 +0000
@@ -7,3 +7,5 @@
  tcl-8.5
  ruby_bindings_format_string.patch
  bts664724-rrdcached-j-segfault
++rrdtool-1.4.7-lua-5.2.patch
++fix-makefile-tcl.patch
 === modified file 'debian/rules'
 --- debian/rules	2013-04-02 09:48:24 +0000
 +++ debian/rules	2013-07-19 14:18:28 +0000
@@ -20,8 +20,8 @@
  #Ruby versions to build for
--RUBY_VERS := 1.8 1.9.1
--RUBY_DEFAULT_VERS := 1.8
++RUBY_VERS := 1.9.1
++RUBY_DEFAULT_VERS := 1.9.1
  PY_VERS := $(shell pyversions -vr)
@@ -77,6 +77,7 @@
  	cp -f /usr/share/misc/config.guess config.guess
  endif
++	autoconf
  	LDFLAGS="$(LINKER_FLAGS)" \
  	CFLAGS="$(CFLAGS)" \
  	RRDDOCDIR=/usr/share/doc/rrdtool \
@@ -224,8 +225,8 @@
  	dh_strip -a --dbg-package=rrdtool-dbg
  	dh_compress -a
  	dh_fixperms -a
--	dh_makeshlibs -a -Nliblua5.1-rrd0 -Nliblua5.1-rrd-dev
--	dh_makeshlibs -pliblua5.1-rrd0 -pliblua5.1-rrd-dev -n
++	dh_makeshlibs -a -Nliblua5.2-rrd0 -Nliblua5.2-rrd-dev
++	dh_makeshlibs -pliblua5.2-rrd0 -pliblua5.2-rrd-dev -n
  	dh_installdeb -a
  	dh_shlibdeps -a
  	dh_gencontrol -a

Ubunturrdtool package