Ubuntu
rubyluabridge package

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

  1. Saucy (13.10)
  2. lua5.2
  3. Merge into saucy
Proposed by Yolanda Robla
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~yolanda.robla/ubuntu/saucy/rubyluabridge/lua5.2
Merge into: lp:ubuntu/saucy/rubyluabridge
Diff against target: 647 lines (+400/-75)
24 files modified
.pc/.quilt_patches (+0/-1)
.pc/.quilt_series (+0/-1)
.pc/.version (+0/-1)
.pc/applied-patches (+0/-1)
.pc/force_ruby1.8/build/extconf_ubuntu.sh (+0/-2)
build/extconf_ubuntu.sh (+1/-1)
debian/changelog (+39/-0)
debian/control (+14/-10)
debian/copyright (+0/-2)
debian/libluabridge-ruby1.8.doc-base (+0/-11)
debian/libluabridge-ruby1.8.docs (+0/-2)
debian/libluabridge-ruby1.8.install (+0/-1)
debian/lintian/ruby-luabridge (+4/-0)
debian/patches/02_Rakefile_update.patch (+21/-0)
debian/patches/03_Readme_Update.patch (+12/-0)
debian/patches/04_extconf_ubuntu.patch (+7/-0)
debian/patches/05_rubyluabridge_ruby19.patch (+128/-0)
debian/patches/06_rubyluabridge_lua52.patch (+111/-0)
debian/patches/force_ruby1.8 (+0/-19)
debian/patches/series (+5/-1)
debian/ruby-luabridge.doc-base (+11/-0)
debian/ruby-luabridge.docs (+2/-0)
debian/ruby-luabridge.install (+2/-0)
debian/rules (+43/-22)
To merge this branch: bzr merge lp:~yolanda.robla/ubuntu/saucy/rubyluabridge/lua5.2
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: [email protected]

Description of the change

Updated changelog

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

https://launchpad.net/ubuntu/+source/rubyluabridge/0.7.0-2ubuntu2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory '.pc'
2=== removed file '.pc/.quilt_patches'
3--- .pc/.quilt_patches 2012-07-10 00:15:48 +0000
4+++ .pc/.quilt_patches 1970-01-01 00:00:00 +0000
5@@ -1,1 +0,0 @@
6-debian/patches
7
8=== removed file '.pc/.quilt_series'
9--- .pc/.quilt_series 2012-07-10 00:15:48 +0000
10+++ .pc/.quilt_series 1970-01-01 00:00:00 +0000
11@@ -1,1 +0,0 @@
12-series
13
14=== removed file '.pc/.version'
15--- .pc/.version 2012-07-10 00:15:48 +0000
16+++ .pc/.version 1970-01-01 00:00:00 +0000
17@@ -1,1 +0,0 @@
18-2
19
20=== removed file '.pc/applied-patches'
21--- .pc/applied-patches 2012-07-10 00:15:48 +0000
22+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
23@@ -1,1 +0,0 @@
24-force_ruby1.8
25
26=== removed directory '.pc/force_ruby1.8'
27=== removed directory '.pc/force_ruby1.8/build'
28=== removed file '.pc/force_ruby1.8/build/extconf_ubuntu.sh'
29--- .pc/force_ruby1.8/build/extconf_ubuntu.sh 2012-07-10 00:15:48 +0000
30+++ .pc/force_ruby1.8/build/extconf_ubuntu.sh 1970-01-01 00:00:00 +0000
31@@ -1,2 +0,0 @@
32-#!/bin/bash
33-ruby extconf.rb --with-lua-include=/usr/include/lua5.1 --with-lualib=lua5.1 $@
34
35=== modified file 'build/extconf_ubuntu.sh'
36--- build/extconf_ubuntu.sh 2012-07-10 00:15:48 +0000
37+++ build/extconf_ubuntu.sh 2013-09-25 14:19:59 +0000
38@@ -1,2 +1,2 @@
39 #!/bin/bash
40-ruby1.8 extconf.rb --with-lua-include=/usr/include/lua5.1 --with-lualib=lua5.1 $@
41+ruby extconf.rb --with-lua-include=/usr/include/lua5.1 --with-lualib=lua5.1 $@
42
43=== modified file 'debian/changelog'
44--- debian/changelog 2012-07-10 00:15:48 +0000
45+++ debian/changelog 2013-09-25 14:19:59 +0000
46@@ -1,3 +1,42 @@
47+rubyluabridge (0.7.0-2ubuntu2) UNRELEASED; urgency=low
48+
49+ * Update to ruby 1.9 (LP: #1226712)
50+ - debian/control: added ruby 1.9.1 as Build-Depends
51+
52+ -- Yolanda Robla <[email protected]> Wed, 25 Sep 2013 16:14:28 +0200
53+
54+rubyluabridge (0.7.0-2ubuntu1) saucy; urgency=low
55+
56+ * Moving ruby to 1.9:
57+ - debian/control: updated dependencies to ruby 1.9,
58+ forcing ruby 1.9
59+ - debian/patches:
60+ removed 01_force_ruby1.8.patch
61+ 05_rubyluabridge_ruby19.patch: fixes for ruby 1.9
62+ - debian/ruby-luabridge.install: updated to 1.9 path
63+ - debian/rules: updated to 1.9 path
64+ - debian/lintian/ruby-luabridge: updated to 1.9 path
65+
66+ * Update to lua 5.2 (LP: #1196921):
67+ - debian/rules: updated to liblua 5.2
68+ - debian/control: updated to liblua 5.2
69+ - debian/patches/06_rubyluabridge_lua52.patch : fixes for lua 5.2
70+
71+ * Drop build dependency on g++-4.6.
72+
73+ -- Yolanda Robla <[email protected]> Fri, 19 Jul 2013 10:34:49 +0200
74+
75+rubyluabridge (0.7.0-2) unstable; urgency=low
76+
77+ * Acknowledge NMU, thanks to Scott Kitterman
78+ * Patch Rakefile to work with newer rake version (Closes: #713148)
79+ * Rename libluabridge-ruby and libluabridge-ruby1.8 to ruby-luabridge
80+ * Build arch:all only when binary-indep called
81+ * Build with hardening options
82+ * Update to Standards-Version 3.9.4 (no changes)
83+
84+ -- Roberto C. Sanchez <[email protected]> Tue, 16 Jul 2013 19:30:48 -0400
85+
86 rubyluabridge (0.7.0-1.1) unstable; urgency=low
87
88 * Non-maintainer upload.
89
90=== modified file 'debian/control'
91--- debian/control 2012-07-10 00:15:48 +0000
92+++ debian/control 2013-09-25 14:19:59 +0000
93@@ -3,27 +3,31 @@
94 Priority: optional
95 Maintainer: Athena Capital Research <[email protected]>
96 Uploaders: Roberto C. Sanchez <[email protected]>
97-Build-Depends: debhelper (>= 5), liblua5.1-0-dev, rake, ruby1.8-dev, rubygems1.8, libboost-dev, g++-4.6
98-Standards-Version: 3.8.4
99+Build-Depends: debhelper (>= 5), liblua5.2-dev, rake, ruby-dev, rubygems,
100+ libboost-dev, ruby1.9.1
101+Standards-Version: 3.9.4
102 Homepage: http://rubyluabridge.rubyforge.org
103 Vcs-Browser: http://rubyluabridge.rubyforge.org/svn/debian/rubyluabridge/trunk
104 Vcs-Svn: svn://rubyforge.org/var/svn/rubyluabridge/debian/rubyluabridge/trunk
105
106-Package: libluabridge-ruby1.8
107+Package: ruby-luabridge
108 Architecture: any
109-Depends: ${shlibs:Depends}, ${misc:Depends}, liblua5.1-0
110-Description: access Lua from Ruby (Ruby 1.8)
111+Depends: ${shlibs:Depends}, ${misc:Depends}, liblua5.2
112+Provides: libluabridge-ruby
113+Replaces: libluabridge-ruby
114+Breaks: libluabridge-ruby
115+Description: access Lua from Ruby
116 RubyLuaBridge is a seamless bridge between Ruby and Lua. It is a C
117 extension that uses the actual Lua C library.
118- .
119- This package is built for Ruby 1.8.
120
121 Package: libluabridge-ruby
122 Architecture: all
123-Depends: libluabridge-ruby1.8, ${misc:Depends}
124-Description: access Lua from Ruby
125+Section: oldlibs
126+Priority: extra
127+Depends: ruby-luabridge, ${misc:Depends}
128+Description: access Lua from Ruby - transitional package
129 RubyLuaBridge is a seamless bridge between Ruby and Lua. It is a C
130 extension that uses the actual Lua C library.
131 .
132- This dummy package depends on the one built against the current Ruby.
133+ This is a dummy transitional package and can safely be removed.
134
135
136=== modified file 'debian/copyright'
137--- debian/copyright 2008-02-14 21:36:41 +0000
138+++ debian/copyright 2013-09-25 14:19:59 +0000
139@@ -30,5 +30,3 @@
140 IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
141 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
142 POSSIBILITY OF SUCH DAMAGE.
143-On Debian systems, the complete text of the BSD License can be
144-found in `/usr/share/common-licenses/BSD'.
145
146=== removed file 'debian/libluabridge-ruby1.8.doc-base'
147--- debian/libluabridge-ruby1.8.doc-base 2008-02-14 21:36:41 +0000
148+++ debian/libluabridge-ruby1.8.doc-base 1970-01-01 00:00:00 +0000
149@@ -1,11 +0,0 @@
150-Document: libluabridge-ruby1.8
151-Title: RubyLuaBridge Manual
152-Author: Evan Wies <[email protected]>
153-Abstract: This manual describes how to use
154- RubyLuaBridge to be able to access Ruby code
155- from Lua and vice versa.
156-Section: Programming/Ruby
157-
158-Format: HTML
159-Index: /usr/share/doc/libluabridge-ruby1.8/html/index.html
160-Files: /usr/share/doc/libluabridge-ruby1.8/html/*.html
161
162=== removed file 'debian/libluabridge-ruby1.8.docs'
163--- debian/libluabridge-ruby1.8.docs 2008-02-14 21:36:41 +0000
164+++ debian/libluabridge-ruby1.8.docs 1970-01-01 00:00:00 +0000
165@@ -1,2 +0,0 @@
166-README
167-doc/html
168
169=== removed file 'debian/libluabridge-ruby1.8.install'
170--- debian/libluabridge-ruby1.8.install 2008-10-11 10:24:54 +0000
171+++ debian/libluabridge-ruby1.8.install 1970-01-01 00:00:00 +0000
172@@ -1,1 +0,0 @@
173-usr/lib/ruby/1.8/*/rubyluabridge.so
174
175=== added directory 'debian/lintian'
176=== added file 'debian/lintian/ruby-luabridge'
177--- debian/lintian/ruby-luabridge 1970-01-01 00:00:00 +0000
178+++ debian/lintian/ruby-luabridge 2013-09-25 14:19:59 +0000
179@@ -0,0 +1,4 @@
180+# This is a false positive
181+ruby-luabridge: hardening-no-fortify-functions usr/lib/ruby/1.9/x86_64-linux/rubyluabridge.so
182+# This is packaged with the documentation, and should be ignored
183+ruby-luabridge: embedded-javascript-library usr/share/doc/ruby-luabridge/html/js/jquery.js
184
185=== added file 'debian/patches/02_Rakefile_update.patch'
186--- debian/patches/02_Rakefile_update.patch 1970-01-01 00:00:00 +0000
187+++ debian/patches/02_Rakefile_update.patch 2013-09-25 14:19:59 +0000
188@@ -0,0 +1,21 @@
189+Description: Replaces references to to obsolete rdoc tasks
190+Author: Roberto C. Sanchez <[email protected]>
191+--- rubyluabridge.hg.orig/Rakefile
192++++ rubyluabridge.hg/Rakefile
193+@@ -1,5 +1,5 @@
194+-require 'rake/rdoctask'
195+-require 'rake/gempackagetask'
196++require 'rdoc/task'
197++require 'rubygems/package_task'
198+ require 'rake/testtask'
199+ require 'rake/clean'
200+ require 'rubygems'
201+@@ -63,7 +63,7 @@
202+
203+ # Adding a new GemPackageTask adds a task named `package`, which generates
204+ # packages as gems, tarball and zip archives.
205+-Rake::GemPackageTask.new(spec) do |pkg|
206++Gem::PackageTask.new(spec) do |pkg|
207+ pkg.need_zip = true
208+ pkg.need_tar_gz = true
209+ end
210
211=== added file 'debian/patches/03_Readme_Update.patch'
212--- debian/patches/03_Readme_Update.patch 1970-01-01 00:00:00 +0000
213+++ debian/patches/03_Readme_Update.patch 2013-09-25 14:19:59 +0000
214@@ -0,0 +1,12 @@
215+--- a/README 2013-07-19 08:32:11.878283000 +0000
216++++ b/README 2013-07-19 08:48:30.317215728 +0000
217+@@ -9,7 +9,7 @@
218+
219+ == Installation
220+
221+-RubyLuaBridge is a C extension that uses the actual Lua C library. It currently targets Lua 5.1 and Ruby 1.8. You must run:
222++RubyLuaBridge is a C extension that uses the actual Lua C library. It currently targets Lua 5.2 and Ruby 1.9. You must run:
223+
224+ % ruby extconf.rb --with-lua-include=/path/to/lua/include --with-lualib=lualibname
225+ % make
226+
227
228=== added file 'debian/patches/04_extconf_ubuntu.patch'
229--- debian/patches/04_extconf_ubuntu.patch 1970-01-01 00:00:00 +0000
230+++ debian/patches/04_extconf_ubuntu.patch 2013-09-25 14:19:59 +0000
231@@ -0,0 +1,7 @@
232+--- a/build/extconf_ubuntu.sh 2013-07-19 08:33:47.000000000 +0000
233++++ b/build/extconf_ubuntu.sh 2013-07-19 08:53:39.209215728 +0000
234+@@ -1,2 +1,2 @@
235+ #!/bin/bash
236+-ruby extconf.rb --with-lua-include=/usr/include/lua5.1 --with-lualib=lua5.1 $@
237++ruby extconf.rb --with-lua-include=/usr/include/lua5.2 --with-lualib=lua5.2 $@
238+
239
240=== added file 'debian/patches/05_rubyluabridge_ruby19.patch'
241--- debian/patches/05_rubyluabridge_ruby19.patch 1970-01-01 00:00:00 +0000
242+++ debian/patches/05_rubyluabridge_ruby19.patch 2013-09-25 14:19:59 +0000
243@@ -0,0 +1,128 @@
244+--- a/rubyluabridge.cc 2013-07-19 08:32:11.878283000 +0000
245++++ b/rubyluabridge.cc 2013-07-19 09:22:26.673215728 +0000
246+@@ -218,10 +218,10 @@
247+ case T_FIXNUM: lua_pushnumber( L, FIX2INT(val) ); break;
248+ case T_BIGNUM: lua_pushnumber( L, NUM2DBL(val) ); break;
249+ case T_FLOAT:
250+- lua_pushnumber( L, (lua_Number)RFLOAT(val)->value );
251++ lua_pushnumber( L, (lua_Number)RFLOAT_VALUE(val));
252+ break;
253+ case T_STRING:
254+- lua_pushlstring( L, RSTRING(val)->ptr, RSTRING(val)->len );
255++ lua_pushlstring( L, RSTRING_PTR(val), RSTRING_LEN(val) );
256+ break;
257+ case T_SYMBOL:
258+ lua_pushstring( L, rb_id2name( SYM2ID(val) ) );
259+@@ -240,9 +240,9 @@
260+ long i;
261+ VALUE array = val;
262+ lua_newtable( L );
263+- for ( i = 0; i < RARRAY(array)->len; i++ )
264++ for ( i = 0; i < RARRAY_LEN(array); i++ )
265+ {
266+- marshal_ruby_to_lua_top( L, RARRAY(array)->ptr[i] );
267++ marshal_ruby_to_lua_top( L, RARRAY_PTR(array)[i] );
268+ lua_rawseti( L, -2, i+1 ); // Lua is 1-based
269+ }
270+ break;
271+@@ -347,13 +347,13 @@
272+ int err = lua_pcall( L, (pushself ? argc : argc-1), LUA_MULTRET, 0 );
273+ if ( err == LUA_ERRRUN ) {
274+ lua_remove( L, -2 );
275+- rb_raise( rb_eRuntimeError, pop_error_to_buffer(L) );
276++ rb_raise( rb_eRuntimeError, "%s", pop_error_to_buffer(L) );
277+ } else if ( err == LUA_ERRMEM ) {
278+ lua_remove( L, -2 );
279+- rb_raise( rb_eNoMemError, pop_error_to_buffer(L) );
280++ rb_raise( rb_eNoMemError, "%s", pop_error_to_buffer(L) );
281+ } else if ( err == LUA_ERRERR ) {
282+ lua_remove( L, -2 );
283+- rb_raise( rb_eFatal, pop_error_to_buffer(L) );
284++ rb_raise( rb_eFatal, "%s", pop_error_to_buffer(L) );
285+ }
286+
287+ // if there is one result, return that alone
288+@@ -651,9 +651,9 @@
289+ else if ( TYPE(libs) == T_ARRAY )
290+ {
291+ int i;
292+- for ( i = 0; i < RARRAY(libs)->len; i++ )
293++ for ( i = 0; i < RARRAY_LEN(libs); i++ )
294+ {
295+- VALUE entry = RARRAY(libs)->ptr[i];
296++ VALUE entry = RARRAY_PTR(libs)[i];
297+ if ( TYPE(entry) == T_SYMBOL )
298+ {
299+ const char* libname = rb_id2name( SYM2ID(entry) );
300+@@ -684,11 +684,11 @@
301+ lua_State* L = pRLState->getState();
302+
303+ // process the string to a chunk
304+- int err = luaL_loadbuffer( L, RSTRING(str)->ptr, RSTRING(str)->len, "Lua::State.eval" );
305++ int err = luaL_loadbuffer( L, RSTRING_PTR(str), RSTRING_LEN(str), "Lua::State.eval" );
306+ if ( err == LUA_ERRMEM )
307+- rb_raise( rb_eNoMemError, pop_error_to_buffer(L) );
308++ rb_raise( rb_eNoMemError, "%s", pop_error_to_buffer(L) );
309+ else if ( err == LUA_ERRSYNTAX )
310+- rb_raise( rb_eSyntaxError, pop_error_to_buffer(L) );
311++ rb_raise( rb_eSyntaxError, "%s", pop_error_to_buffer(L) );
312+
313+ // pcall the chunk, returning only a single argument
314+ // TODO: error handler with stack traceback
315+@@ -696,11 +696,11 @@
316+ // TODO: hmmm... the err handler could even be in Ruby?
317+ err = lua_pcall( L, 0, 1, 0 );
318+ if ( err == LUA_ERRRUN )
319+- rb_raise( rb_eRuntimeError, pop_error_to_buffer(L) );
320++ rb_raise( rb_eRuntimeError, "%s", pop_error_to_buffer(L) );
321+ else if ( err == LUA_ERRMEM )
322+- rb_raise( rb_eNoMemError, pop_error_to_buffer(L) );
323++ rb_raise( rb_eNoMemError, "%s", pop_error_to_buffer(L) );
324+ else if ( err == LUA_ERRERR )
325+- rb_raise( rb_eFatal, pop_error_to_buffer(L) );
326++ rb_raise( rb_eFatal, "%s", pop_error_to_buffer(L) );
327+
328+ // marshal the result to Ruby
329+ VALUE result = marshal_lua_to_ruby( self, L, -1 );
330+@@ -727,11 +727,11 @@
331+ int args_bottom = lua_gettop(L);
332+
333+ // process the string to a chunk
334+- int err = luaL_loadbuffer( L, RSTRING(str)->ptr, RSTRING(str)->len, "Lua::State.eval" );
335++ int err = luaL_loadbuffer( L, RSTRING_PTR(str), RSTRING_LEN(str), "Lua::State.eval" );
336+ if ( err == LUA_ERRMEM )
337+- rb_raise( rb_eNoMemError, pop_error_to_buffer(L) );
338++ rb_raise( rb_eNoMemError, "%s", pop_error_to_buffer(L) );
339+ else if ( err == LUA_ERRSYNTAX )
340+- rb_raise( rb_eSyntaxError, pop_error_to_buffer(L) );
341++ rb_raise( rb_eSyntaxError, "%s", pop_error_to_buffer(L) );
342+
343+ // pcall the chunk, returning only a single argument
344+ // TODO: error handler with stack traceback
345+@@ -739,11 +739,11 @@
346+ // TODO: hmmm... the err handler could even be in Ruby?
347+ err = lua_pcall( L, 0, LUA_MULTRET, 0 );
348+ if ( err == LUA_ERRRUN )
349+- rb_raise( rb_eRuntimeError, pop_error_to_buffer(L) );
350++ rb_raise( rb_eRuntimeError, "%s", pop_error_to_buffer(L) );
351+ else if ( err == LUA_ERRMEM )
352+- rb_raise( rb_eNoMemError, pop_error_to_buffer(L) );
353++ rb_raise( rb_eNoMemError, "%s", pop_error_to_buffer(L) );
354+ else if ( err == LUA_ERRERR )
355+- rb_raise( rb_eFatal, pop_error_to_buffer(L) );
356++ rb_raise( rb_eFatal, "%s", pop_error_to_buffer(L) );
357+
358+ // marshal the result to Ruby
359+ int args_top = lua_gettop(L);
360+
361+--- a/rubyluabridge.h 2013-07-19 08:32:11.878283000 +0000
362++++ b/rubyluabridge.h 2013-07-19 08:57:29.009215728 +0000
363+@@ -66,7 +66,7 @@
364+ /// We use it to persist Lua object beyond its lifetime on the Lua stack.
365+ ///
366+ /// It uses Lua's "standard" reference system:
367+-/// http://www.lua.org/manual/5.1/manual.html#luaL_ref
368++/// http://www.lua.org/manual/5.2/manual.html#luaL_ref
369+ /// We follow the convention of using Lua's registry to store the references.
370+ struct rlua_RefObject
371+ {
372
373=== added file 'debian/patches/06_rubyluabridge_lua52.patch'
374--- debian/patches/06_rubyluabridge_lua52.patch 1970-01-01 00:00:00 +0000
375+++ debian/patches/06_rubyluabridge_lua52.patch 2013-09-25 14:19:59 +0000
376@@ -0,0 +1,111 @@
377+--- a/rubyluabridge.cc 2013-07-19 08:32:11.878283000 +0000
378++++ b/rubyluabridge.cc 2013-07-19 08:55:35.033215728 +0000
379+@@ -572,7 +572,7 @@
380+ Data_Get_Struct( self, rlua_State, pRLState );
381+ lua_State* L = pRLState->getState();
382+
383+- lua_pushvalue( L, LUA_GLOBALSINDEX );
384++ lua_pushglobaltable( L );
385+ VALUE result = marshal_lua_to_ruby( self, L, -1 );
386+ lua_pop( L, 1 );
387+ return result;
388+@@ -778,7 +778,7 @@
389+ ID methodid = SYM2ID( argv[0] );
390+ const char* key = rb_id2name( methodid );
391+
392+- lua_pushvalue( L, LUA_GLOBALSINDEX );
393++ lua_pushglobaltable( L );
394+ return rlua_method_missing_dispatch( L, key, self, argc, argv );
395+ }
396+
397+@@ -795,7 +795,7 @@
398+ lua_State* L = pRLstate->getState();
399+
400+ marshal_ruby_to_lua_top( L, key );
401+- lua_gettable( L, LUA_GLOBALSINDEX );
402++ lua_getglobal( L, lua_tostring(L, -1));
403+
404+ // marshal the result to Ruby
405+ VALUE result = marshal_lua_to_ruby( self, L, -1 );
406+@@ -818,7 +818,7 @@
407+
408+ marshal_ruby_to_lua_top( L, key );
409+ marshal_ruby_to_lua_top( L, val );
410+- lua_settable( L, LUA_GLOBALSINDEX );
411++ lua_pushglobaltable( L );
412+
413+ return val; // return val for chaining
414+ }
415+@@ -839,7 +839,7 @@
416+ lua_newtable( L );
417+
418+ VALUE result = marshal_lua_to_ruby( self, L, -1 );
419+- lua_settable( L, LUA_GLOBALSINDEX );
420++ lua_pushglobaltable( L );
421+
422+ return result;
423+ }
424+@@ -1000,7 +1000,7 @@
425+ *
426+ * Returns the 'length' of the RefObject.
427+ *
428+- * According to the {Lua manual}[http://www.lua.org/manual/5.1/manual.html#lua_objlen]:
429++ * According to the {Lua manual}[http://www.lua.org/manual/5.2/manual.html#lua_objlen]:
430+ * Returns the "length" of the value at the given acceptable index:
431+ * for strings, this is the string length; for tables, this is the result
432+ * of the length operator ('#'); for userdata, this is the size of the
433+@@ -1013,7 +1013,7 @@
434+ lua_State* L = pRefObject->getState();
435+
436+ lua_rawgeti( L, LUA_REGISTRYINDEX, pRefObject->Lref );
437+- size_t len = lua_objlen(L, -1);
438++ size_t len = lua_rawlen(L, -1);
439+ lua_pop( L, 1 );
440+
441+ VALUE result = INT2NUM(len);
442+@@ -1180,7 +1180,7 @@
443+ /* call-seq:
444+ * Lua::RefObject.to_s -> string
445+ *
446+- * Invokes the Lua function {tostring}[http://www.lua.org/manual/5.1/manual.html#pdf-tostring]
447++ * Invokes the Lua function {tostring}[http://www.lua.org/manual/5.2/manual.html#pdf-tostring]
448+ * on the object and returns the resulting string.
449+ */
450+ VALUE rlua_RefObject_to_s( VALUE self )
451+@@ -1285,7 +1285,7 @@
452+ lua_State* L = pRefObject->getState();
453+
454+ lua_rawgeti( L, LUA_REGISTRYINDEX, pRefObject->Lref );
455+- int tablelen = lua_objlen( L, -1 );
456++ int tablelen = lua_rawlen( L, -1 );
457+
458+ VALUE array = rb_ary_new2( tablelen );
459+ int i;
460+@@ -1450,7 +1450,7 @@
461+ lua_State* L = pRefObject->getState();
462+
463+ lua_rawgeti( L, LUA_REGISTRYINDEX, pRefObject->Lref );
464+- int tablelen = lua_objlen( L, -1 );
465++ int tablelen = lua_rawlen( L, -1 );
466+ int i;
467+ for ( i = 1; i <= tablelen; ++i )
468+ {
469+@@ -1482,7 +1482,7 @@
470+ lua_State* L = pRefObject->getState();
471+
472+ lua_rawgeti( L, LUA_REGISTRYINDEX, pRefObject->Lref );
473+- int tablelen = lua_objlen( L, -1 );
474++ int tablelen = lua_rawlen( L, -1 );
475+ int i;
476+ for ( i = 1; i <= tablelen; ++i )
477+ {
478+@@ -1512,7 +1512,7 @@
479+ lua_State* L = pRefObject->getState();
480+
481+ lua_rawgeti( L, LUA_REGISTRYINDEX, pRefObject->Lref );
482+- int tablelen = lua_objlen( L, -1 );
483++ int tablelen = lua_rawlen( L, -1 );
484+ int i;
485+ for ( i = 1; i <= tablelen; ++i )
486+ {
487+
488
489=== removed file 'debian/patches/force_ruby1.8'
490--- debian/patches/force_ruby1.8 2012-07-10 00:15:48 +0000
491+++ debian/patches/force_ruby1.8 1970-01-01 00:00:00 +0000
492@@ -1,19 +0,0 @@
493-Description: Force ruby1.8
494- rubyluabridge (0.7.0-1.1) unstable; urgency=low
495- .
496- * Non-maintainer upload.
497- * Force build/extconf_ubuntu.sh to use ruby1.8 explicitly to fix FTBFS now
498- that ruby1.9.1 is default (Closes: #676076)
499-Author: Scott Kitterman <[email protected]>
500-Bug-Debian: http://bugs.debian.org/676076
501-
502----
503-
504-Index: rubyluabridge-0.7.0/build/extconf_ubuntu.sh
505-===================================================================
506---- rubyluabridge-0.7.0.orig/build/extconf_ubuntu.sh 2012-07-10 00:17:01.000000000 -0400
507-+++ rubyluabridge-0.7.0/build/extconf_ubuntu.sh 2012-07-10 00:18:17.468137202 -0400
508-@@ -1,2 +1,2 @@
509- #!/bin/bash
510--ruby extconf.rb --with-lua-include=/usr/include/lua5.1 --with-lualib=lua5.1 $@
511-+ruby1.8 extconf.rb --with-lua-include=/usr/include/lua5.1 --with-lualib=lua5.1 $@
512
513=== modified file 'debian/patches/series'
514--- debian/patches/series 2012-07-10 00:15:48 +0000
515+++ debian/patches/series 2013-09-25 14:19:59 +0000
516@@ -1,1 +1,5 @@
517-force_ruby1.8
518+02_Rakefile_update.patch
519+03_Readme_Update.patch
520+04_extconf_ubuntu.patch
521+05_rubyluabridge_ruby19.patch
522+06_rubyluabridge_lua52.patch
523
524=== added file 'debian/ruby-luabridge.doc-base'
525--- debian/ruby-luabridge.doc-base 1970-01-01 00:00:00 +0000
526+++ debian/ruby-luabridge.doc-base 2013-09-25 14:19:59 +0000
527@@ -0,0 +1,11 @@
528+Document: ruby-luabridge
529+Title: RubyLuaBridge Manual
530+Author: Evan Wies <[email protected]>
531+Abstract: This manual describes how to use
532+ RubyLuaBridge to be able to access Ruby code
533+ from Lua and vice versa.
534+Section: Programming/Ruby
535+
536+Format: HTML
537+Index: /usr/share/doc/ruby-luabridge/html/index.html
538+Files: /usr/share/doc/ruby-luabridge/html/*.html
539
540=== added file 'debian/ruby-luabridge.docs'
541--- debian/ruby-luabridge.docs 1970-01-01 00:00:00 +0000
542+++ debian/ruby-luabridge.docs 2013-09-25 14:19:59 +0000
543@@ -0,0 +1,2 @@
544+README
545+doc/html
546
547=== added file 'debian/ruby-luabridge.install'
548--- debian/ruby-luabridge.install 1970-01-01 00:00:00 +0000
549+++ debian/ruby-luabridge.install 2013-09-25 14:19:59 +0000
550@@ -0,0 +1,2 @@
551+usr/lib/ruby/*/*/rubyluabridge.so
552+usr/share/lintian/overrides/ruby-luabridge
553
554=== modified file 'debian/rules'
555--- debian/rules 2008-10-11 10:24:54 +0000
556+++ debian/rules 2013-09-25 14:19:59 +0000
557@@ -9,13 +9,19 @@
558 # Uncomment this to turn on verbose mode.
559 #export DH_VERBOSE=1
560
561-
562-
563-build: build-stamp
564+# CFLAGS += "-I/usr/include/lua5.2 -fPIC $(shell dpkg-buildflags --get CFLAGS)"
565+# CPPFLAGS += "-I/usr/include/lua5.2 -fPIC $(shell dpkg-buildflags --get CPPFLAGS)"
566+# CXXFLAGS += "-I/usr/include/lua5.2 -fPIC $(shell dpkg-buildflags --get CXXFLAGS)"
567+# LDFLAGS += "-llua5.2 $(shell dpkg-buildflags --get LDFLAGS)"
568+
569+build: build-arch build-indep
570+build-arch: build-stamp
571+build-indep: build-stamp
572 build-stamp:
573 dh_testdir
574 build/extconf_ubuntu.sh
575 rake
576+ #$(MAKE) CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) CXXFLAGS=$(CXXFLAGS) LDFLAGS=$(LDFLAGS)
577 $(MAKE)
578
579 clean:
580@@ -33,33 +39,48 @@
581 dh_clean -k
582 dh_installdirs
583 $(MAKE) DESTDIR=$(CURDIR)/debian/rubyluabridge install
584- mkdir -p $(CURDIR)/debian/rubyluabridge/usr/lib/ruby/1.8/
585- mv $(CURDIR)/debian/rubyluabridge/usr/local/lib/site_ruby/1.8/* $(CURDIR)/debian/rubyluabridge/usr/lib/ruby/1.8/
586+ install -d $(CURDIR)/debian/rubyluabridge/usr/share/lintian/overrides
587+ cp $(CURDIR)/debian/lintian/* $(CURDIR)/debian/rubyluabridge/usr/share/lintian/overrides/
588+ mkdir -p $(CURDIR)/debian/rubyluabridge/usr/lib/ruby/
589+ mv $(CURDIR)/debian/rubyluabridge/usr/local/lib/site_ruby/* $(CURDIR)/debian/rubyluabridge/usr/lib/ruby/
590 rm -rf $(CURDIR)/debian/rubyluabridge/usr/local
591
592
593 # Build architecture-independent files here.
594 binary-indep: build install
595-# We have nothing to do by default.
596+ dh_testdir -i
597+ dh_testroot -i
598+ dh_installchangelogs -i
599+ dh_installdocs -i
600+ dh_installexamples -i
601+ dh_install -i --sourcedir=$(CURDIR)/debian/rubyluabridge
602+ dh_installman -i
603+ dh_link -i
604+ dh_compress -i
605+ dh_fixperms -i
606+ dh_installdeb -i
607+ dh_gencontrol -i
608+ dh_md5sums -i
609+ dh_builddeb -i
610
611 # Build architecture-dependent files here.
612 binary-arch: build install
613- dh_testdir
614- dh_testroot
615- dh_installchangelogs
616- dh_installdocs
617- dh_installexamples
618- dh_install --sourcedir=$(CURDIR)/debian/rubyluabridge
619- dh_installman
620- dh_link
621- dh_strip
622- dh_compress
623- dh_fixperms
624- dh_installdeb
625- dh_shlibdeps
626- dh_gencontrol
627- dh_md5sums
628- dh_builddeb
629+ dh_testdir -a
630+ dh_testroot -a
631+ dh_installchangelogs -a
632+ dh_installdocs -a
633+ dh_installexamples -a
634+ dh_install -a --sourcedir=$(CURDIR)/debian/rubyluabridge
635+ dh_installman -a
636+ dh_link -a
637+ dh_strip -a
638+ dh_compress -a
639+ dh_fixperms -a
640+ dh_installdeb -a
641+ dh_shlibdeps -a
642+ dh_gencontrol -a
643+ dh_md5sums -a
644+ dh_builddeb -a
645
646 binary: binary-indep binary-arch
647 .PHONY: build clean binary-indep binary-arch binary install configure

Subscribers

People subscribed via source and target branches

to all changes: