From 4909aa5f8056f16ef049fd8914a347811e314de7 Mon Sep 17 00:00:00 2001 From: Alexandre Erwin Ittner Date: Thu, 22 Feb 2007 22:32:11 +0000 Subject: [PATCH] Changes to fix Debian packaging. git-svn-id: file:///var/svn/lua-iconv/trunk@39 9538949d-8f27-0410-946f-ce01ef448559 --- Makefile | 12 +++++++----- debian/Makefile.Debian.conf | 2 +- debian/control | 2 +- luaiconv.c | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 10fdd88..bffecd5 100644 --- a/Makefile +++ b/Makefile @@ -40,18 +40,20 @@ LIBS = `pkg-config $(LUAPKG) --libs` #LIBS = -llua5.1 #INSTALL_PATH = /usr/lib/lua/5.1 +all: iconv.so -iconv.so: luaiconv.c - $(CC) -o iconv.so -shared $(LIBS) $(CFLAGS) luaiconv.c +iconv.lo: luaiconv.c + $(CC) -o iconv.lo -c $(CFLAGS) luaiconv.c + +iconv.so: iconv.lo + $(CC) -o iconv.so -shared $(LIBS) iconv.lo install: iconv.so make test install -s iconv.so $(INSTALL_PATH) clean: - $(RM) iconv.so + $(RM) iconv.so iconv.lo test: iconv.so test_iconv.lua lua test_iconv.lua - -all: iconv.so diff --git a/debian/Makefile.Debian.conf b/debian/Makefile.Debian.conf index 2175e8b..d912f68 100644 --- a/debian/Makefile.Debian.conf +++ b/debian/Makefile.Debian.conf @@ -3,7 +3,7 @@ PKG_NAME=iconv ### things relative to the C library part CLIB_CFLAGS= CLIB_LDFLAGS= -CLIB_OBJS= iconv.lo +CLIB_OBJS=iconv.lo VERSION_INFO=0:0:0 ### things relative to the lua library part diff --git a/debian/control b/debian/control index c490372..4d7d766 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: lua-iconv Section: interpreters Priority: optional Maintainer: Alexandre Erwin Ittner -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, lua5.1-policy-dev (>= 6) +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, lua5.1-policy-dev (>= 8) Standards-Version: 3.7.2 XS-X-Vcs-svn: svn://svn.debian.org/pkg-lua/packages/lua-iconv diff --git a/luaiconv.c b/luaiconv.c index d4c3901..4cc7cf6 100644 --- a/luaiconv.c +++ b/luaiconv.c @@ -37,7 +37,7 @@ #include #define LIB_NAME "iconv" -#define LIB_VERSION LIB_NAME " r3" +#define LIB_VERSION LIB_NAME " r4" #define ICONV_TYPENAME "iconv_t"