diff -Nru dh-lua-24/bin/dh_lua dh-lua-25/bin/dh_lua --- dh-lua-24/bin/dh_lua 2016-11-18 06:31:57.000000000 +0000 +++ dh-lua-25/bin/dh_lua 2018-04-16 12:28:48.000000000 +0000 @@ -96,11 +96,6 @@ print "deduplicating $what\n"; doit("ln","-sf", mklorig($what), $dest); } - $dest=mklfn($tmp,"sandbox",$what); - if (compare($src, $dest) == 0) { - print "deduplicating $what\n"; - doit("ln","-sf", mklorig($what), $dest); - } } } diff -Nru dh-lua-24/debian/changelog dh-lua-25/debian/changelog --- dh-lua-24/debian/changelog 2016-12-01 05:59:10.000000000 +0000 +++ dh-lua-25/debian/changelog 2018-04-16 12:28:48.000000000 +0000 @@ -1,3 +1,17 @@ +dh-lua (25) unstable; urgency=medium + + * Team upload. + * Drop support for luasandbox as it's soon going away (see #891191). + * Update Vcs-* fields for migration to salsa. + * Bump debhelper compat level to 11. + * Bump Standards-Version to 4.1.4. + * Update URL in copyright file. + * Add execute permission to /usr/share/dh-lua/template/rules + * Add recommends on dpkg-dev to avoid lintian warning about missing + dependency on make (as used by the template/rules file). + + -- Raphaël Hertzog Mon, 16 Apr 2018 14:28:48 +0200 + dh-lua (24) unstable; urgency=medium * Team upload diff -Nru dh-lua-24/debian/compat dh-lua-25/debian/compat --- dh-lua-24/debian/compat 2016-10-23 14:21:00.000000000 +0000 +++ dh-lua-25/debian/compat 2018-04-16 12:28:48.000000000 +0000 @@ -1 +1 @@ -7 +11 diff -Nru dh-lua-24/debian/control dh-lua-25/debian/control --- dh-lua-24/debian/control 2016-11-18 06:31:57.000000000 +0000 +++ dh-lua-25/debian/control 2018-04-16 12:28:48.000000000 +0000 @@ -2,15 +2,16 @@ Section: interpreters Priority: optional Maintainer: Enrico Tassi -Build-Depends: debhelper (>= 8.0.0), markdown, perl, txt2man -Standards-Version: 3.9.6 -Vcs-Git: git://git.debian.org/git/pkg-lua/dh-lua.git -Vcs-Browser: http://git.debian.org/?p=pkg-lua/dh-lua.git +Build-Depends: debhelper (>= 11~), markdown, perl, txt2man +Standards-Version: 4.1.4 +Vcs-Git: https://salsa.debian.org/lua-team/dh-lua.git +Vcs-Browser: https://salsa.debian.org/lua-team/dh-lua Homepage: http://pkg-lua.alioth.debian.org/ Package: dh-lua Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, debhelper (>= 8.0.0), dctrl-tools, libtool, libtool-bin, pkg-config, liblua5.3-dev, lua5.3, liblua5.2-dev, lua5.2, liblua5.1-0-dev, lua5.1, libluasandbox-dev (>= 1.2.1-2~), libluasandbox-bin (>= 1.2.1-2~), libfile-find-rule-perl +Depends: ${misc:Depends}, ${perl:Depends}, debhelper (>= 8.0.0), dctrl-tools, libtool, libtool-bin, pkg-config, liblua5.3-dev, lua5.3, liblua5.2-dev, lua5.2, liblua5.1-0-dev, lua5.1, libfile-find-rule-perl +Recommends: dpkg-dev Description: helper tools for maintaining Lua-related packages This package contains the Debian policy for the Debian packages relative to the Lua scripting language, as well as some tools to help build them. diff -Nru dh-lua-24/debian/copyright dh-lua-25/debian/copyright --- dh-lua-24/debian/copyright 2016-10-23 14:21:00.000000000 +0000 +++ dh-lua-25/debian/copyright 2018-04-16 12:28:48.000000000 +0000 @@ -2,7 +2,7 @@ . The original source can always be found at: - ftp://ftp.debian.org/dists/unstable/main/source/ + https://deb.debian.org/debian/pool/main/d/dh-lua/ Copyright © 2012 Enrico Tassi. diff -Nru dh-lua-24/doc/policy.txt dh-lua-25/doc/policy.txt --- dh-lua-24/doc/policy.txt 2016-11-18 06:31:57.000000000 +0000 +++ dh-lua-25/doc/policy.txt 2018-04-16 12:28:48.000000000 +0000 @@ -29,7 +29,7 @@ In the following we shall write `{VARIABLE}` to mean a schema of file names. The following ones are the most relevant: - - `{LUA_VERSION}` The Lua major version, like `5.1`, `5.2`, `5.3` or `sandbox` + - `{LUA_VERSION}` The Lua major version, like `5.1`, `5.2`, or `5.3` - `{PKG_NAME}` The name of the library, like `expat`, `lpeg` and `sql` - `{LUA_MODNAME}` The string used to `require` the module, like `lxp` @@ -342,7 +342,7 @@ A special case is when the the configuration file name starts with `lua${LUA_VERSION}`. In that case the `LUA_VERSION` variable can be omitted and it is automatically set to the value extracted from the file name. -Supported values are `5.3`, `5.2`, `5.1` and `sandbox`. +Supported values are `5.3`, `5.2` and `5.1`. This makes it possible to use one single conf file to build the library for many Lua version. It is sufficient to name the file like `debian/lua5.1.lpeg.dh-lua.conf` and add a symlink to it diff -Nru dh-lua-24/make/dh-lua.Makefile.single dh-lua-25/make/dh-lua.Makefile.single --- dh-lua-24/make/dh-lua.Makefile.single 2016-11-18 06:31:57.000000000 +0000 +++ dh-lua-25/make/dh-lua.Makefile.single 2018-04-16 12:28:48.000000000 +0000 @@ -32,9 +32,6 @@ ifeq "$(LUA_VERSION)" "" LUA_VERSION:=$(if $(shell echo $(CONFIGURATION_FILE) | grep ^debian/luajit),jit) endif -ifeq "$(LUA_VERSION)" "" -LUA_VERSION:=$(if $(shell echo $(CONFIGURATION_FILE) | grep ^debian/luasandbox),sandbox) -endif # UID for the LUA_VERSION UID=$(shell pwd)/$(LUA_VERSION)-$(PKG_NAME) diff -Nru dh-lua-24/Makefile dh-lua-25/Makefile --- dh-lua-24/Makefile 2016-11-18 06:31:57.000000000 +0000 +++ dh-lua-25/Makefile 2018-04-16 12:28:48.000000000 +0000 @@ -19,7 +19,6 @@ mkdir -p $(DESTDIR)/$(DH_LUA_HOME)/test/5.1/ mkdir -p $(DESTDIR)/$(DH_LUA_HOME)/test/5.2/ mkdir -p $(DESTDIR)/$(DH_LUA_HOME)/test/5.3/ - mkdir -p $(DESTDIR)/$(DH_LUA_HOME)/test/sandbox/ mkdir -p $(DESTDIR)/$(DH_HOME)/Buildsystem/ mkdir -p $(DESTDIR)/$(DH_HOME)/Sequence/ mkdir -p $(DESTDIR)/usr/bin/ @@ -30,7 +29,6 @@ cp test/5.1/* $(DESTDIR)/$(DH_LUA_HOME)/test/5.1/ cp test/5.2/* $(DESTDIR)/$(DH_LUA_HOME)/test/5.2/ cp test/5.3/* $(DESTDIR)/$(DH_LUA_HOME)/test/5.3/ - cp test/sandbox/* $(DESTDIR)/$(DH_LUA_HOME)/test/sandbox/ cp debhelper7/buildsystem/* $(DESTDIR)/$(DH_HOME)/Buildsystem/ cp debhelper7/sequence/* $(DESTDIR)/$(DH_HOME)/Sequence/ cat doc/policy.txt | sed 's/@@V@@/$(POLICY_VERSION)/' \ diff -Nru dh-lua-24/test/sandbox/app.c dh-lua-25/test/sandbox/app.c --- dh-lua-24/test/sandbox/app.c 2016-11-18 06:31:57.000000000 +0000 +++ dh-lua-25/test/sandbox/app.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -// Copyright: © 2012 Enrico Tassi -// License: MIT/X - -#include -#include -#include - -#include -#include - -// this should include all the needed libraries and -// define -// static void app_open(lua_State* L) -#include "app.c.conf" - -int main(int argn,char** argv){ - int rc; - int i; - const char *init = getenv("LUA_INIT"); - - // create a lua VM - lua_State* L = lua_open(); - if (L == NULL) { - fprintf(stderr,"Unable to allocate a lua_State"); - return 1; - } - - // load stdlib - lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */ - luaL_openlibs(L); /* open libraries */ - lua_gc(L, LUA_GCRESTART, 0); - - // LUA_INIT - if (init != NULL && luaL_dostring(L, init)) { - const char* error = NULL; - error = lua_tostring(L,-1); - fprintf(stderr,"app.c: %s\n",error); - return 1; - } - - // here the specific luaopen_MODULENAME - app_open(L); - - // LOAD - if (argn < 2 || !strcmp("-", argv[1])) { - rc = luaL_loadfile(L, NULL); - } - else { - rc = luaL_loadfile(L,argv[1]); - } - - // check for errors - if (rc != 0){ - const char* error = NULL; - error = lua_tostring(L,-1); - fprintf(stderr,"app.c: %s\n",error); - return 1; - } - - // RUN! - lua_newtable(L); - for(i=1;i 2 ? argn-2 : 0),LUA_MULTRET,0); - - // check for errors - if (rc != 0){ - const char* error = NULL; - error = lua_tostring(L,-1); - fprintf(stderr,"app.c: %s\n",error); - return 1; - } - - // shutdown lua VM - lua_close(L); - - // bye! - return (rc == 0 ? EXIT_SUCCESS : 1); -} diff -Nru dh-lua-24/test/sandbox/app.c.conf.in dh-lua-25/test/sandbox/app.c.conf.in --- dh-lua-24/test/sandbox/app.c.conf.in 2016-11-18 06:31:57.000000000 +0000 +++ dh-lua-25/test/sandbox/app.c.conf.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -// Copyright: © 2012 Enrico Tassi -// License: MIT/X - -#include "@@LUA_HEADER@@" - -static void app_open(lua_State* L){ - lua_getglobal(L,"package"); - lua_getfield(L,-1,"preload"); - lua_pushcfunction(L,luaopen_@@LUA_MODNAME_CPART_UNDERSCORE@@); - lua_setfield(L,-2,"@@LUA_MODNAME_CPART@@"); -}