diff -pruN 33/Makefile 34/Makefile --- 33/Makefile 2024-10-28 09:50:41.000000000 +0000 +++ 34/Makefile 2025-10-02 17:48:22.000000000 +0000 @@ -17,7 +17,6 @@ install: mkdir -p $(DESTDIR)/$(DH_LUA_HOME)/template/ mkdir -p $(DESTDIR)/$(DH_LUA_HOME)/make/ 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/5.4/ mkdir -p $(DESTDIR)/$(DH_HOME)/Buildsystem/ @@ -28,7 +27,6 @@ install: cp template/* $(DESTDIR)/$(DH_LUA_HOME)/template/ cp make/* $(DESTDIR)/$(DH_LUA_HOME)/make/ 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/5.4/* $(DESTDIR)/$(DH_LUA_HOME)/test/5.4/ cp data/configure.ac $(DESTDIR)/$(DH_LUA_HOME)/ @@ -44,6 +42,3 @@ man/lua-any.1: man/lua-any.1.txt txt2man -d "`dpkg-parsechangelog -S date`"\ -v "" -r "lua-any" -t "lua-any 1" \ $< > $@ - -upload: all - scp doc/html/* alioth.debian.org:pkg-lua/ diff -pruN 33/bin/lua-any 34/bin/lua-any --- 33/bin/lua-any 2024-10-28 09:50:41.000000000 +0000 +++ 34/bin/lua-any 2025-10-02 17:41:15.000000000 +0000 @@ -3,12 +3,12 @@ # This scripts enables shebang lines like # # #!/usr/bin/env lua-any -# -- Lua-Versions: 5.1 5.2 +# -- Lua-Versions: 5.1 5.4 # -- Lua-Root: /usr/bin/lua # -- Lua-Args: -l foo # # That will pick the first installed interpreter among /usr/bin/lua5.1 and -# /usr/bin/lua5.2 and pass to if '-l foo' as well ass the name of the script +# /usr/bin/lua5.4 and pass to if '-l foo' as well ass the name of the script # containing the shebang and the extra arguments # # License: MIT/X diff -pruN 33/bin/lua-create-gitbuildpackage-layout 34/bin/lua-create-gitbuildpackage-layout --- 33/bin/lua-create-gitbuildpackage-layout 2024-10-28 09:50:41.000000000 +0000 +++ 34/bin/lua-create-gitbuildpackage-layout 2025-10-13 22:13:01.000000000 +0000 @@ -13,7 +13,7 @@ PKG=$1 mkdir $PKG/ cd $PKG git init -git remote add origin ssh://git.debian.org/git/pkg-lua/$PKG.git +git remote add origin git@salsa.debian.org:lua-team/$PKG.git [ ! -z "$DEBFULLNAME" ] && git config user.name "$DEBFULLNAME" [ ! -z "$DEBEMAIL" ] && git config user.email "<$DEBEMAIL>" cd .. @@ -22,13 +22,6 @@ mkdir $PKG/debian/patches mkdir $PKG/debian/source mkdir $PKG/debian/tests -cat > $PKG//debian/watch < $PKG/debian/source/format touch $PKG/debian/patches/series cp /usr/share/dh-lua/template/dh-lua.conf $PKG/debian/ @@ -42,17 +35,3 @@ chmod a+x $PKG/debian/rules cd $PKG git add debian/ cd .. - -cat > init-repo-$PKG.sh < description -mv hooks/post-update.sample hooks/post-update -chmod a+x hooks/post-update -EOT - -echo "Now run: scp init-repo-$PKG.sh git.debian.org: && ssh git.debian.org sh init-repo-$PKG.sh" - diff -pruN 33/bin/lua-create-svnbuildpackage-layout 34/bin/lua-create-svnbuildpackage-layout --- 33/bin/lua-create-svnbuildpackage-layout 2024-10-28 09:50:41.000000000 +0000 +++ 34/bin/lua-create-svnbuildpackage-layout 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -#!/bin/sh -# Copyright: © 2012 Enrico Tassi -# License: MIT - -echo -echo '******************************************************************' -echo You should consider using lua-create-gitbuildpackage-layout instead -echo '******************************************************************' -echo -sleep 2 - -if [ -z "$1" -o "$1" = "-h" -o "$1" = "--help" ]; then - echo Give as a unique argument the name of the source package - echo that will be the name of the root directory of the package. - echo Be sure to start this script from your packages/ directory. - exit 1 -fi - -PKG=$1 - -SVN= -if [ -x /usr/bin/svn ]; then - SVN=/usr/bin/svn -else - echo warning: No /usr/bin/svn found - echo warning: The directory structure will be created, but no items - echo warning: will be added to the svn repository nor svn properties - echo warning: will be set. -fi - -$SVN mkdir $PKG -$SVN mkdir $PKG/trunk -$SVN mkdir $PKG/tags -$SVN mkdir $PKG/build-area -$SVN mkdir $PKG/tarballs -$SVN mkdir $PKG/trunk/debian -$SVN mkdir $PKG/trunk/debian/patches -$SVN mkdir $PKG/trunk/debian/source - -cat > $PKG/trunk/debian/watch < $PKG/trunk/debian/source/format -touch $PKG/trunk/debian/patches/series -cp /usr/share/dh-lua/template/dh-lua.conf $PKG/trunk/debian/ -cp /usr/share/dh-lua/template/rules $PKG/trunk/debian/ -cp /usr/share/dh-lua/template/copyright $PKG/trunk/debian/ -cp /usr/share/dh-lua/template/control $PKG/trunk/debian/ -chmod a+x $PKG/trunk/debian/rules - -if [ ! -z "$SVN" ]; then - $SVN propset svn:ignore '*' $PKG/build-area - $SVN propset mergeWithUpstream 1 $PKG/trunk/debian - $SVN add $PKG/trunk/debian/patches/series - $SVN add $PKG/trunk/debian/watch - $SVN add $PKG/trunk/debian/dh-lua.conf - $SVN add $PKG/trunk/debian/rules - $SVN add $PKG/trunk/debian/copyright - $SVN add $PKG/trunk/debian/control - $SVN add $PKG/trunk/debian/source/format -fi diff -pruN 33/debian/changelog 34/debian/changelog --- 33/debian/changelog 2024-10-28 09:50:41.000000000 +0000 +++ 34/debian/changelog 2025-10-13 22:24:01.000000000 +0000 @@ -1,3 +1,18 @@ +dh-lua (34) unstable; urgency=medium + + * Team upload + * d/copyright: Convert to machine-readable format + * Remove lua-create-svnbuildpackage-layout + * Update pkg template + * Drop make target 'upload' which references alioth + * Drop lua5.2 support. debian/lua5.2*.conf files are ignored. + The affected packages are all at the bottom of the lua5.2 dependency tree. + + [ Alexandre Detiste ] + * replace obsolete pkg-config with pkgconf + + -- Bastian Germann Tue, 14 Oct 2025 00:24:01 +0200 + dh-lua (33) unstable; urgency=medium * Team upload. diff -pruN 33/debian/control 34/debian/control --- 33/debian/control 2024-10-28 09:50:41.000000000 +0000 +++ 34/debian/control 2025-10-02 16:58:35.000000000 +0000 @@ -2,8 +2,14 @@ Source: dh-lua Section: interpreters Priority: optional Maintainer: Debian Lua Team -Uploaders: Sergei Golovan -Build-Depends: debhelper-compat (= 13), python3-markdown, perl, txt2man +Uploaders: + Sergei Golovan , + Victor Seva , +Build-Depends: + debhelper-compat (= 13), + perl, + python3-markdown, + txt2man, Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/lua-team/dh-lua.git Vcs-Browser: https://salsa.debian.org/lua-team/dh-lua @@ -11,20 +17,33 @@ Homepage: https://salsa.debian.org/lua-t Package: dh-lua Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, debhelper (>= 8.0.0), dctrl-tools, libtool, pkg-config, libfile-find-rule-perl, - liblua5.4-dev, lua5.4, - liblua5.3-dev, lua5.3, - liblua5.2-dev, lua5.2, - liblua5.1-0-dev, lua5.1 -Provides: dh-sequence-lua -Recommends: dpkg-dev +Depends: + dctrl-tools, + debhelper (>= 8.0.0), + libfile-find-rule-perl, + liblua5.1-0-dev, + liblua5.3-dev, + liblua5.4-dev, + libtool, + lua5.1, + lua5.3, + lua5.4, + pkgconf, + ${misc:Depends}, + ${perl:Depends}, +Provides: + dh-sequence-lua, +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. Package: lua-any Architecture: all -Depends: ${misc:Depends}, lua5.1 | lua +Depends: + lua5.1 | lua, + ${misc:Depends}, Description: helper script for shebang lines in Lua scripts Some Lua script do actually work with many, but not all, Lua versions in the Debian archive. This package contains the lua-any interpreter to be diff -pruN 33/debian/copyright 34/debian/copyright --- 33/debian/copyright 2024-10-28 09:50:41.000000000 +0000 +++ 34/debian/copyright 2025-10-02 17:00:49.000000000 +0000 @@ -1,26 +1,22 @@ -This is dh-lua, written and maintained by Enrico Tassi -. - -The original source can always be found at: - https://deb.debian.org/debian/pool/main/d/dh-lua/ - -Copyright © 2012 Enrico Tassi. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Files: * +Copyright: © 2012 Enrico Tassi. +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff -pruN 33/debian/dh-lua.install 34/debian/dh-lua.install --- 33/debian/dh-lua.install 2024-10-28 09:50:41.000000000 +0000 +++ 34/debian/dh-lua.install 2025-10-13 22:03:35.000000000 +0000 @@ -1,5 +1,4 @@ -/usr/share/perl5/ -/usr/share/dh-lua/ -/usr/bin/lua-create-svnbuildpackage-layout /usr/bin/dh_lua /usr/bin/lua-create-gitbuildpackage-layout +/usr/share/dh-lua/ +/usr/share/perl5/ diff -pruN 33/doc/policy.txt 34/doc/policy.txt --- 33/doc/policy.txt 2024-10-28 09:50:41.000000000 +0000 +++ 34/doc/policy.txt 2025-10-13 22:05:02.000000000 +0000 @@ -29,7 +29,7 @@ Conventions 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 `5.4` + - `{LUA_VERSION}` The Lua major version, like `5.1`, `5.3`, or `5.4` - `{PKG_NAME}` The name of the library, like `expat`, `lpeg` and `sql` - `{LUA_MODNAME}` The string used to `require` the module, like `lxp` @@ -139,7 +139,7 @@ utility: - `lua-create-gitbuildpackage-layout` should be used to create the git repository of the debian packages. It builds a git-buildpackage ready - layout, adding the standard `debian/rules` file, a `debian/watch` template + layout, adding the standard `debian/rules` file and a `debian/dh-lua.conf` template. Then it is necessary to edit `debian/dh-lua.conf`, create a @@ -151,8 +151,8 @@ and `debian/copyright` files. You will find a template file called `dh-lua.conf` in the `dh-lua` package (see `/usr/share/dh-lua/template/`). -Note that if you used the `lua-create-svnbuildpackage-layout` -utility to create the package svn repository, you will find a template +Note that if you used the `lua-create-gitbuildpackage-layout` +utility to create the package repository, you will find a template in `debian/`. The `LUA_VERSION` field is *mandatory*, unless you name the `dh-lua` @@ -230,7 +230,7 @@ dpkg-parsechangelog | grep ^Ver | cut -d ### The `rules` file -If you used the `lua-create-svnbuildpackage-layout` a standard +If you used the `lua-create-gitbuildpackage-layout` a standard file is placed in `debian/` for you. If not, you can use this one: 
@@ -308,16 +308,16 @@ the control file.
 
   - `${lua:Versions}` is substituted in the control file of
     any package that has in its binary stanza the field `XB-Lua-Versions`.
-    The value is going to be something like `5.1 5.2`, or `5.1`, depending
+    The value is going to be something like `5.1 5.4`, or `5.1`, depending
     on how many versions of the module exist (see also the following section).
 
   - `${lua:Provides}` should be used in the `Provides` field.
     Its value is the list of (versioned) virtual packages.
     For example the package `lua-lpeg` that compiles for both 
-    Lua 5.1 and 5.2 will provide `lua5.1-lpeg` and `lua5.2-lpeg`.
+    Lua 5.1 and 5.4 will provide `lua5.1-lpeg` and `lua5.4-lpeg`.
 
-In this way `apt-cache search 5.2 lpeg` finds the `lua-lpeg` package.
-Moreover a software can just declare a dependency over `lua5.2-lpeg` if 
+In this way `apt-cache search 5.4 lpeg` finds the `lua-lpeg` package.
+Moreover a software can just declare a dependency over `lua5.4-lpeg` if
 sufficient.
 
 ### Multiple packages from the same source 
@@ -342,11 +342,11 @@ while the former is used to infer the de
 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.4`, `5.3`, `5.2` and `5.1`.
+Supported values are `5.4`, `5.3`, 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
-named like `debian/lua5.2.lpeg.dh-lua.conf`. Of course this trick can be used
+named like `debian/lua5.4.lpeg.dh-lua.conf`. Of course this trick can be used
 only if the library is agnostic and works out of the box with both versions of
 Lua with no modifications.
 
@@ -463,13 +463,13 @@ Example of shebang line:
 
 
 #!/usr/bin/env lua-any
--- Lua-Versions: 5.1 5.2
+-- Lua-Versions: 5.1 5.4
 

 
 Example of control file:
 
 
-Depends: lua-any, lua5.1 | lua5.2
+Depends: lua-any, lua5.1 | lua5.4
 

 
 For more details, refer to the `lua-any` man page.
diff -pruN 33/make/dh-lua.Makefile.multiple 34/make/dh-lua.Makefile.multiple
--- 33/make/dh-lua.Makefile.multiple	2024-10-28 09:50:41.000000000 +0000
+++ 34/make/dh-lua.Makefile.multiple	2025-10-09 19:42:59.000000000 +0000
@@ -2,7 +2,7 @@
 # License: MIT/X
 # vim: ft=make
 
-MODULES=$(sort $(wildcard debian/*dh-lua.conf))
+MODULES=$(sort $(filter-out debian/lua5.2.%,$(wildcard debian/*dh-lua.conf)))
 LUA_SINGLE_MAKEFILE=/usr/share/dh-lua/make/dh-lua.Makefile.single
 H=@
 
diff -pruN 33/make/dh-lua.Makefile.single 34/make/dh-lua.Makefile.single
--- 33/make/dh-lua.Makefile.single	2024-10-28 09:50:41.000000000 +0000
+++ 34/make/dh-lua.Makefile.single	2025-10-02 17:40:33.000000000 +0000
@@ -30,9 +30,6 @@ ifeq "$(LUA_VERSION)" ""
 LUA_VERSION:=$(if $(shell echo $(CONFIGURATION_FILE) | grep ^debian/lua5\.3),5.3)
 endif
 ifeq "$(LUA_VERSION)" ""
-LUA_VERSION:=$(if $(shell echo $(CONFIGURATION_FILE) | grep ^debian/lua5\.2),5.2)
-endif
-ifeq "$(LUA_VERSION)" ""
 LUA_VERSION:=$(if $(shell echo $(CONFIGURATION_FILE) | grep ^debian/lua5\.1),5.1)
 endif
 ifeq "$(LUA_VERSION)" ""
@@ -133,11 +130,6 @@ DEB_INST_DEV_TEMPL=$(DH_LUA_SUPPORT_FILE
 # where to find stuff
 LUA_INIT=' package.path="$(UID)/?.lua;$(UID)/?/init.lua;"..package.path; package.cpath="$(UID)/?.so;"..package.cpath; '
 
-# lua5.2 specific
-ifeq "$(LUA_VERSION)" "5.2"
-	LUA_TEST := $(subst /usr/bin/shake,,$(LUA_TEST))
-endif
-
 # test
 LUA_TEST_KIND:=fake
 ifneq "$(LUA_TEST)" ""
diff -pruN 33/man/lua-any.1.txt 34/man/lua-any.1.txt
--- 33/man/lua-any.1.txt	2024-10-28 09:50:41.000000000 +0000
+++ 34/man/lua-any.1.txt	2025-10-02 17:02:22.000000000 +0000
@@ -17,9 +17,9 @@ DESCRIPTION
 	and selects a valid Lua interpreter. Example:
 
 		#!/usr/bin/env lua-any
-		-- Lua-Versions: 5.1 5.2
+		-- Lua-Versions: 5.1 5.3
 
-	lua-any tests in turn the existence of lua5.1 and lua5.2 and
+	lua-any tests in turn the existence of lua5.1 and lua5.3 and
 	executes the script with the first existing interpreter.
 
 SYNTAX
@@ -49,7 +49,7 @@ DEBIAN NOTES
 	A package using lua-any should declare its dependencies on Lua
 	interpreters using a disjunction. Example:
 
-		Depends: lua-any, lua5.1 | lua5.2
+		Depends: lua-any, lua5.1 | lua5.3
 
 AUTHOR
 	Enrico Tassi 
diff -pruN 33/man/lua-create-svnbuildpackage-layout.1 34/man/lua-create-svnbuildpackage-layout.1
--- 33/man/lua-create-svnbuildpackage-layout.1	2024-10-28 09:50:41.000000000 +0000
+++ 34/man/lua-create-svnbuildpackage-layout.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH lua-create-svnbuildpackage-layout 1 "Feb 2012"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp     insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-lua-create-svnbuildpackage-layout \- program to
-create an svn-buildpackage compliat repository for a lua package.
-.SH SYNOPSIS
-.B lua-create-svnbuildpackage-layout
-\fIPKG\fR
-.SH DESCRIPTION
-.\" TeX users may be more comfortable with the \fB\fP and
-.\" \fI\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBlua-create-svnbuildpackage-layout\fP is a program that creates a
-standard filesystem layout for svn-buildpackage and adds some templates
-files for dh-lua.
-.SH AUTHOR
-lua-create-svnbuildpackage-layout was written by Enrico Tassi.
-.PP
-This manual page was written by Enrico Tassi ,
-for the Debian project (but may be used by others).
diff -pruN 33/template/control 34/template/control
--- 33/template/control	2024-10-28 09:50:41.000000000 +0000
+++ 34/template/control	2025-10-13 22:12:04.000000000 +0000
@@ -1,12 +1,12 @@
 Source: lua-
 Section: interpreters
 Priority: optional
-Maintainer: Enrico Tassi 
-Build-Depends: debhelper (>= 9),  dh-lua
+Maintainer: Debian Lua Team 
+Build-Depends: debhelper (= 13), dh-lua
 Standards-Version: 3.9.3
 Homepage: 
-Vcs-Git: git://git.debian.org/git/pkg-lua/lua-.git
-Vcs-Browser: http://git.debian.org/?p=pkg-lua/lua-.git
+Vcs-Git: https://salsa.debian.org/lua-team/dh-lua.git
+Vcs-Browser: https://salsa.debian.org/lua-team/dh-lua
 
 Package: lua-
 Architecture: any