Control: tags 947583 + patch Control: tags 947583 + pending
Dear maintainer, I've uploadeded an NMU by Mateusz Łukasik for tolua++ (versioned as 1.0.93-3.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru tolua++-1.0.93/debian/changelog tolua++-1.0.93/debian/changelog --- tolua++-1.0.93/debian/changelog 2012-05-09 09:26:33.000000000 +0300 +++ tolua++-1.0.93/debian/changelog 2020-05-20 12:39:04.000000000 +0300 @@ -1,3 +1,12 @@ +tolua++ (1.0.93-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Take from Fedora patch for fix FTBFS with scons 3.1.2. + (Closes: #947583) + * Bump minimal dh version to 9. + + -- Mateusz Łukasik <mat...@linuxmint.pl> Wed, 20 May 2020 11:39:04 +0200 + tolua++ (1.0.93-3) unstable; urgency=low * Adopt package. (Closes: #632654) diff -Nru tolua++-1.0.93/debian/compat tolua++-1.0.93/debian/compat --- tolua++-1.0.93/debian/compat 2012-05-09 08:59:51.000000000 +0300 +++ tolua++-1.0.93/debian/compat 2020-05-20 12:36:35.000000000 +0300 @@ -1 +1 @@ -7 +9 diff -Nru tolua++-1.0.93/debian/control tolua++-1.0.93/debian/control --- tolua++-1.0.93/debian/control 2012-05-09 09:26:13.000000000 +0300 +++ tolua++-1.0.93/debian/control 2020-05-20 12:36:23.000000000 +0300 @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Vincent Cheng <vincentc1...@gmail.com> -Build-Depends: debhelper (>= 7.0.50~), liblua5.1-dev, scons +Build-Depends: debhelper (>= 9), liblua5.1-dev, scons Standards-Version: 3.9.3 Homepage: http://www.codenix.com/~tolua/ Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/tolua++/trunk diff -Nru tolua++-1.0.93/debian/patches/series tolua++-1.0.93/debian/patches/series --- tolua++-1.0.93/debian/patches/series 2012-05-09 09:14:41.000000000 +0300 +++ tolua++-1.0.93/debian/patches/series 2020-05-20 12:34:17.000000000 +0300 @@ -1,2 +1,3 @@ bump_version.patch fix-spelling-errors.patch +tolua++-1.0.93-scons304.patch diff -Nru tolua++-1.0.93/debian/patches/tolua++-1.0.93-scons304.patch tolua++-1.0.93/debian/patches/tolua++-1.0.93-scons304.patch --- tolua++-1.0.93/debian/patches/tolua++-1.0.93-scons304.patch 1970-01-01 02:00:00.000000000 +0200 +++ tolua++-1.0.93/debian/patches/tolua++-1.0.93-scons304.patch 2020-05-20 12:39:02.000000000 +0300 @@ -0,0 +1,33 @@ +Description: Fix FTBFS with scons 3.1.2 +Author: Hans de Goede <hdego...@redhat.com> +Debian-Bug: https://bugs.debian.org/947583 + +--- a/SConstruct 2008-04-21 02:05:35.000000000 +0200 ++++ b/SConstruct 2019-02-18 12:35:13.025336296 +0100 +@@ -16,7 +16,7 @@ elif 'msvc' in env['TOOLS']: + else: + options_file = "posix" + +-opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS) ++opts = Variables(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS) + opts.Add('CC', 'The C compiler.') + opts.Add('CXX', 'The C++ compiler (for the tests)') + opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall']) +@@ -65,7 +65,7 @@ def pkg_scan_dep(self, target, source): + ## TODO: detectar si el archivo existe antes de abrirlo asi nomas + pkg = open(source, "rt") + +- for linea in pkg.xreadlines(): ++ for linea in pkg: + dep = re.search("^[\t\w]*\$[cphl]file\s*\"([^\"]+)\"", linea) + if dep: + self.Depends(target, '#' + dep.groups()[0]); +--- a/src/tests/SCsub 2006-04-10 11:45:44.000000000 +0200 ++++ b/src/tests/SCsub 2020-02-16 14:56:46.732317614 +0100 +@@ -1,5 +1,5 @@ + Import('env') +-env_tests = env.Copy() ++env_tests = env.Clone() + + env_tests.LuaBinding('tclassbind.cpp', 'tclass.pkg', 'tclass', use_own=1, use_typeid=1) +
