Hi Rolf, Rolf Bensch writes:
> Hi Olaf, > > I tried to build a recent version for zesty some weeks ago with my test > ppa: https://launchpad.net/~rolfbensch/+archive/ubuntu/sane-test/+packages . Thanks for the link! Now I can see the build failures. BTW, it looks like the build does not apply the debian/patches/. Don't know if that's intentional or not. > I'll try to investigate this issue next week. If you can provide a patch > before, I can merge it into the build system very quickly. See the attached. - debian/rules: modified a few configure flags and added one for the API spec (BTW, 6ffeb909 fixed a brain fart for that option) - debian/control: add transfig as a build dependency for the spec (BTW, we do PDF now too but that requires pdflatex and gs as well) - debian/patches/multiarch_dll_searc_path.patch: adjust to upstream changes Note that this only aims to fix the xenial build but the other builds should be mostly identical if not exactly. I've checked debian/rules binary dpkg-buildpackage -b and both complete without a hitch, on xenial (in a Docker container). Hope this helps, -- Olaf Meeuwissen, LPIC-2 FSF Associate Member since 2004-01-27 GnuPG key: F84A2DD9/B3C0 2F47 EA19 64F4 9F13 F43E B8A4 A88A F84A 2DD9 Support Free Software https://my.fsf.org/donate Join the Free Software Foundation https://my.fsf.org/join
diff -ru sane-backends-git20160712/debian/control sane-backends-g6ffeb90/debian/control --- sane-backends-git20160712/debian/control 2016-04-22 02:58:47.000000000 +0900 +++ sane-backends-g6ffeb90/debian/control 2017-05-06 20:25:38.417580064 +0900 @@ -22,6 +22,7 @@ po-debconf, texlive, texlive-latex-extra, + transfig, xutils-dev Homepage: http://www.sane-project.org diff -ru sane-backends-git20160712/debian/patches/multiarch_dll_search_path.patch sane-backends-g6ffeb90/debian/patches/multiarch_dll_search_path.patch --- sane-backends-git20160712/debian/patches/multiarch_dll_search_path.patch 2016-07-03 04:42:43.000000000 +0900 +++ sane-backends-g6ffeb90/debian/patches/multiarch_dll_search_path.patch 2017-05-06 20:57:03.126925833 +0900 @@ -7,21 +7,21 @@ =================================================================== --- sane-backends-1.0.23.orig/backend/dll.c 2012-08-10 12:33:29.000000000 +1200 +++ sane-backends-1.0.23/backend/dll.c 2012-09-20 11:35:03.742380791 +1200 -@@ -430,7 +430,7 @@ +@@ -450,7 +450,7 @@ if (path) { -- src_len = strlen (path) + strlen (LIBDIR) + 1 + 1; -+ src_len = strlen (path) + strlen (DEB_DLL_LIBDIR) + 1 + 1; +- src_len = strlen (path) + strlen (DIR_SEP) + strlen (LIBDIR) + 1; ++ src_len = strlen (path) + strlen (DIR_SEP) + strlen (DEB_DLL_LIBDIR) + 1; src = malloc (src_len); if (!src) { -@@ -438,11 +438,11 @@ +@@ -458,11 +458,11 @@ return SANE_STATUS_NO_MEM; } orig_src = src; -- snprintf (src, src_len, "%s:%s", path, LIBDIR); -+ snprintf (src, src_len, "%s:%s", path, DEB_DLL_LIBDIR); +- snprintf (src, src_len, "%s%s%s", path, DIR_SEP, LIBDIR); ++ snprintf (src, src_len, "%s%s%s", path, DIR_SEP, DEB_DLL_LIBDIR); } else { diff -ru sane-backends-git20160712/debian/rules sane-backends-g6ffeb90/debian/rules --- sane-backends-git20160712/debian/rules 2013-03-13 00:37:25.000000000 +0900 +++ sane-backends-g6ffeb90/debian/rules 2017-05-06 20:20:12.367963271 +0900 @@ -48,15 +48,16 @@ --localstatedir=/var \ --datadir=\$${prefix}/share \ --mandir=\$${prefix}/share/man \ - --with-docdir=\$${prefix}/share/doc/libsane \ + --docdir=\$${prefix}/share/doc/libsane \ --with-snmp=no \ --disable-locking \ --enable-static \ --enable-pthread \ --with-gphoto2 \ - --enable-translations \ + --enable-nls \ --enable-avahi \ - --enable-libusb_1_0 + --with-usb \ + --with-api-spec # generate POT file for translators (cd po && make sane-backends.pot)
-- sane-devel mailing list: [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-devel Unsubscribe: Send mail with subject "unsubscribe your_password" to [email protected]
