Please unblock: lua5.2/5.2.1-3
This version of lua5.2 fixes a nasty multiarch related issue
and the mess my previous attempt made.
Debdiff attached (w.r.t the version in weezy).
diff -Nru lua5.2-5.2.1/debian/changelog lua5.2-5.2.1/debian/changelog
--- lua5.2-5.2.1/debian/changelog 2012-06-15 10:08:18.000000000 +0200
+++ lua5.2-5.2.1/debian/changelog 2012-07-23 13:33:44.000000000 +0200
@@ -1,3 +1,18 @@
+lua5.2 (5.2.1-3) unstable; urgency=low
+
+ * Rename lua-deb-multiarch.h into lua5.2-deb-multiarch.h and install it in
+ /usr/include/$DEB_HOST_MULTIARCH/ to make it available with no extra
+ -I directive
+
+ -- Enrico Tassi <gareuselesinge@debian.org> Wed, 18 Jul 2012 18:43:06 +0200
+
+lua5.2 (5.2.1-2) unstable; urgency=low
+
+ * Install architecture dependent .h file in /usr/lib and fix .pc files
+ accordingly to fix multiarch issues
+
+ -- Enrico Tassi <gareuselesinge@debian.org> Fri, 15 Jun 2012 10:13:41 +0200
+
lua5.2 (5.2.1-1) unstable; urgency=low
* New upstream release
diff -Nru lua5.2-5.2.1/debian/lua.pc.in lua5.2-5.2.1/debian/lua.pc.in
--- lua5.2-5.2.1/debian/lua.pc.in 2012-06-15 10:08:11.000000000 +0200
+++ lua5.2-5.2.1/debian/lua.pc.in 2012-07-23 13:33:44.000000000 +0200
@@ -22,4 +22,4 @@
Requires:
Libs: -L${libdir} -l${lib_name}
Libs.private: -lm -ldl
-Cflags: -I${includedir}/${lib_name_include} -DDEB_HOST_MULTIARCH=\"${deb_host_multiarch}\"
+Cflags: -I${includedir}/${lib_name_include}
diff -Nru lua5.2-5.2.1/debian/patches/debian-paths.patch lua5.2-5.2.1/debian/patches/debian-paths.patch
--- lua5.2-5.2.1/debian/patches/debian-paths.patch 2012-05-04 16:33:37.000000000 +0200
+++ lua5.2-5.2.1/debian/patches/debian-paths.patch 2012-07-23 13:33:44.000000000 +0200
@@ -1,9 +1,14 @@
-Index: lua5.2-5.2.0.obsolete.0.298371916710497/src/luaconf.h
+Index: lua5.2-5.2.1/src/luaconf.h
===================================================================
---- lua5.2-5.2.0.obsolete.0.298371916710497.orig/src/luaconf.h 2011-12-06 17:58:36.000000000 +0100
-+++ lua5.2-5.2.0.obsolete.0.298371916710497/src/luaconf.h 2012-05-04 16:27:35.000000000 +0200
-@@ -101,13 +101,19 @@
+--- lua5.2-5.2.1.orig/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200
++++ lua5.2-5.2.1/src/luaconf.h 2012-07-16 12:51:33.000000000 +0200
+@@ -98,16 +98,23 @@
+ LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
+ #else /* }{ */
+-
++/* This defines DEB_HOST_MULTIARCH */
++#include "lua5.2-deb-multiarch.h"
#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT2 "/usr/"
diff -Nru lua5.2-5.2.1/debian/rules lua5.2-5.2.1/debian/rules
--- lua5.2-5.2.1/debian/rules 2012-05-04 16:33:37.000000000 +0200
+++ lua5.2-5.2.1/debian/rules 2012-07-23 13:33:44.000000000 +0200
@@ -9,12 +9,20 @@
override_dh_auto_build:
$(MAKE) linux \
- DEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH) \
- MYCFLAGS="-DDEB_HOST_MULTIARCH=\\\"$(DEB_HOST_MULTIARCH)\\\" $(CFLAGS)" \
+ MYCFLAGS="$(CFLAGS)" \
MYLDFLAGS="$(LDFLAGS)" \
MYLIBS=$(MYLIBS)
PKG_CONFIG_FILE=debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/lua5.2.pc
+LUA_MULTIARCH_INCLUDE = debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/
+LUA_MULTIARCH = lua5.2-deb-multiarch.h
+
+override_dh_auto_configure:
+ echo "#ifndef _LUA_DEB_MULTIARCH_" > src/$(LUA_MULTIARCH)
+ echo "#define _LUA_DEB_MULTIARCH_" >> src/$(LUA_MULTIARCH)
+ echo "#define DEB_HOST_MULTIARCH \"$(DEB_HOST_MULTIARCH)\"" >> \
+ src/$(LUA_MULTIARCH)
+ echo "#endif" >> src/$(LUA_MULTIARCH)
override_dh_auto_install:
dh_auto_install
@@ -27,10 +35,13 @@
cat debian/lua.pc.in >> $(PKG_CONFIG_FILE)
cat doc/lua.1 | sed 's/TH LUA 1/TH LUA5.2 1/' > lua5.2.1
cat doc/luac.1 | sed 's/TH LUAC 1/TH LUAC5.2 1/' > luac5.2.1
+ mkdir -p $(LUA_MULTIARCH_INCLUDE)
+ cp src/$(LUA_MULTIARCH) $(LUA_MULTIARCH_INCLUDE)
override_dh_auto_clean:
dh_auto_clean
rm -f lua5.2.1 luac5.2.1
+ rm -f src/$(LUA_MULTIARCH)
override_dh_strip:
dh_strip --dbg-package=liblua5.2-0-dbg
Reply to: