diff -Nru newlisp-10.7.5/debian/changelog newlisp-10.7.5/debian/changelog --- newlisp-10.7.5/debian/changelog 2020-08-24 19:12:04.000000000 +0000 +++ newlisp-10.7.5/debian/changelog 2021-03-07 20:17:34.000000000 +0000 @@ -1,32 +1,16 @@ -newlisp (10.7.5-1build5) groovy; urgency=medium +newlisp (10.7.5-2) unstable; urgency=medium - * No change rebuild against new libffi8ubuntu1 ABI. + * d/p/0009-Fix-shared-library-loading-for-modules.patch: + Adjust patch so that the modules don't try to load a versioned shared + library. + * d/control: Don't recommend hardcoded ABI versions in library packages. + We should recommend the '-dev' packages instead, which will install + the proper .so files that will get loaded by the modules. (Closes: #984686) + * d/p/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch: + Inform newlisp that the common files are installed under + /usr/share/newlisp, not /usr/local/share. - -- Dimitri John Ledkov Mon, 24 Aug 2020 20:12:04 +0100 - -newlisp (10.7.5-1build4) groovy; urgency=medium - - * No change rebuild against new libffi ABI. - - -- Dimitri John Ledkov Thu, 20 Aug 2020 13:40:56 +0100 - -newlisp (10.7.5-1build3) focal; urgency=medium - - * No-change rebuild with fixed binutils on arm64. - - -- Matthias Klose Sat, 08 Feb 2020 11:12:36 +0000 - -newlisp (10.7.5-1build2) focal; urgency=medium - - * No-change rebuild for libffi soname change. - - -- Matthias Klose Sun, 12 Jan 2020 08:29:52 +0000 - -newlisp (10.7.5-1build1) eoan; urgency=medium - - * No-change upload with strops.h and sys/strops.h removed in glibc. - - -- Matthias Klose Thu, 05 Sep 2019 11:04:03 +0000 + -- Sergio Durigan Junior Sun, 07 Mar 2021 15:17:34 -0500 newlisp (10.7.5-1) unstable; urgency=medium diff -Nru newlisp-10.7.5/debian/control newlisp-10.7.5/debian/control --- newlisp-10.7.5/debian/control 2020-08-20 12:40:56.000000000 +0000 +++ newlisp-10.7.5/debian/control 2021-03-07 20:08:21.000000000 +0000 @@ -1,8 +1,7 @@ Source: newlisp Section: lisp Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Sergio Durigan Junior +Maintainer: Sergio Durigan Junior Build-Depends: debhelper-compat (=12), libffi-dev, @@ -18,11 +17,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends} # For newLISP modules. Recommends: - libcrypto++6, - libmysqlclient18, - libpq5, - libsqlite3-0, - zlib1g, + libssl-dev, + default-libmysqlclient-dev, + libpq-dev, + libsqlite3-dev, + zlib1g-dev, sensible-utils, Description: LISP like, general purpose scripting language newLISP is a scripting language for developing web applications and diff -Nru newlisp-10.7.5/debian/patches/0009-Fix-shared-library-loading-for-modules.patch newlisp-10.7.5/debian/patches/0009-Fix-shared-library-loading-for-modules.patch --- newlisp-10.7.5/debian/patches/0009-Fix-shared-library-loading-for-modules.patch 2019-07-20 23:46:32.000000000 +0000 +++ newlisp-10.7.5/debian/patches/0009-Fix-shared-library-loading-for-modules.patch 2021-03-07 20:16:26.000000000 +0000 @@ -22,7 +22,7 @@ 8 files changed, 9 insertions(+), 126 deletions(-) diff --git a/modules/crypto.lsp b/modules/crypto.lsp -index 26d7bda..e52af3a 100644 +index 26d7bda..289a027 100644 --- a/modules/crypto.lsp +++ b/modules/crypto.lsp @@ -41,28 +41,7 @@ @@ -51,7 +51,7 @@ - (throw-error "cannot find crypto library")))) - -(set 'option (if (= ostype "Windows") "cdecl")) -+(set 'library "libcrypto.so.1") ++(set 'library "libcrypto.so") (import library "MD5" option) (import library "RIPEMD160" option) @@ -85,7 +85,7 @@ ; structs are defined but only needed for debugging, instead use "void*" (struct 'complex "double" "double") ; complex numbers diff --git a/modules/mysql.lsp b/modules/mysql.lsp -index 05faded..bd93a21 100644 +index 05faded..20a6093 100644 --- a/modules/mysql.lsp +++ b/modules/mysql.lsp @@ -118,20 +118,7 @@ @@ -106,7 +106,7 @@ -(set 'library (files (or - (find true (map file? files)) - (throw-error "cannot find libmysqlclient library")))) -+(set 'library "libmysqlclient.so.18") ++(set 'library "libmysqlclient.so") (import library "mysql_init") (import library "mysql_real_connect") @@ -125,7 +125,7 @@ ; Constants used, make sure these constants are Ok on your Operating System or Platform. ; Note, that (define var value) is the same as as saying (set 'var value), it is here more diff --git a/modules/postgres.lsp b/modules/postgres.lsp -index 0fe5ec5..c620f92 100644 +index 0fe5ec5..5af0c6c 100644 --- a/modules/postgres.lsp +++ b/modules/postgres.lsp @@ -128,34 +128,7 @@ @@ -160,7 +160,7 @@ -(delete 'pg_config) -(delete 'pg_lib_dir) -(delete 'files) -+(set 'library "libpq.so.5") ++(set 'library "libpq.so") ; import functions and throw error if not found (define (pg_import fun_name) @@ -198,7 +198,7 @@ (import library "sqlite3_open" "cdecl") (import library "sqlite3_close" "cdecl") diff --git a/modules/unix.lsp b/modules/unix.lsp -index 07de71e..13a23bd 100644 +index 07de71e..1d800e7 100644 --- a/modules/unix.lsp +++ b/modules/unix.lsp @@ -39,21 +39,7 @@ @@ -220,12 +220,12 @@ - (find true (map file? files)) - (throw-error "cannot find standard C library (libc)")))) - -+(set 'library "libc.so.6") ++(set 'library "libc.so") (unless module-is-loaded (import library "getuid") diff --git a/modules/zlib.lsp b/modules/zlib.lsp -index 6bdf360..3cf985c 100644 +index 6bdf360..4f12a8e 100644 --- a/modules/zlib.lsp +++ b/modules/zlib.lsp @@ -31,20 +31,7 @@ @@ -246,7 +246,7 @@ -(set 'library (files (or - (find true (map file? files)) - (throw-error "cannot find zlib compression library")))) -+(set 'library "libz.so.1") ++(set 'library "libz.so") (import library "compress") (import library "uncompress") diff -Nru newlisp-10.7.5/debian/patches/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch newlisp-10.7.5/debian/patches/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch --- newlisp-10.7.5/debian/patches/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch 1970-01-01 00:00:00.000000000 +0000 +++ newlisp-10.7.5/debian/patches/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch 2021-03-07 20:17:24.000000000 +0000 @@ -0,0 +1,25 @@ +From: Sergio Durigan Junior +Date: Sun, 7 Mar 2021 15:15:31 -0500 +Subject: Set NEWLISPDIR to /usr/share/newlisp + +NEWLISPDIR is hardcoded to /usr/local/share/newlisp, which is wrong +for our case. + +Forwarded: not-needed +--- + newlisp.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/newlisp.h b/newlisp.h +index 867908c..4cfc279 100644 +--- a/newlisp.h ++++ b/newlisp.h +@@ -37,7 +37,7 @@ + #ifdef NEWCONFIG + #include "config.h" + #else +-#define NEWLISPDIR "/usr/local/share/newlisp" ++#define NEWLISPDIR "/usr/share/newlisp" + #endif + + /* force ISO_C90 restrictions */ diff -Nru newlisp-10.7.5/debian/patches/series newlisp-10.7.5/debian/patches/series --- newlisp-10.7.5/debian/patches/series 2019-07-20 23:41:45.000000000 +0000 +++ newlisp-10.7.5/debian/patches/series 2021-03-07 20:17:24.000000000 +0000 @@ -6,3 +6,4 @@ 0006-Do-not-use-m32-m64-when-building.patch 0007-Support-GNU-kFreeBSD-builds.patch 0009-Fix-shared-library-loading-for-modules.patch +0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch