Re: [sane-devel] Fix PPA build (was Re: sane-backends release 1.0.26 schedule)

2017-05-10 Thread Olaf Meeuwissen 
Hi Rolf,

Rolf Bensch writes:

> @Olaf: Thanks for your patch. It's working with the ppa.

Good!

> Please have a look at the attached patches. Maybe there are additional
> fixes for SANE (fix_avahi_error_paths.patch) or there are needful
> additional options for configure possible or just keep them inside the ppa?

I will take a look at the patches, maybe this weekend, but unless they
fix bugs on the sane-backends side, they'll have to wait until after the
release.

If other binary package maintainers are listening, I welcome patches in
the Alioth bug tracker (even though I rather dislike that bug tracker
itself ;-).  Feel free to add any that haven't been submitted yet,
assign them to me and, please!, prefix a [PATCH] to the summary line so
I can quickly find them.

> Many thanks for your help.

You're welcome.

Hope this helps,
--
Olaf Meeuwissen, LPIC-2FSF Associate Member since 2004-01-27
 GnuPG key: F84A2DD9/B3C0 2F47 EA19 64F4 9F13  F43E B8A4 A88A F84A 2DD9
 Support Free Softwarehttps://my.fsf.org/donate
 Join the Free Software Foundation  https://my.fsf.org/join

-- 
sane-devel mailing list: sane-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-devel
Unsubscribe: Send mail with subject "unsubscribe your_password"
 to sane-devel-requ...@lists.alioth.debian.org

Re: [sane-devel] Fix PPA build (was Re: sane-backends release 1.0.26 schedule)

2017-05-08 Thread Rolf Bensch 
Hello All,

My Ubuntu ppa (ppa:rolfbensch/sane-git
) is
working again. It distributes pre-built packages for all supported
Ubuntu distributions (amd64, i386 and armhf architectures).

I changed the package names to fit the packages version convention a
little bit more. I hope that this helps to change the package names
provided from Ubuntu.

If you are already using my ppa, you must use the "Force Version"
function of your package manager once to get the updates.

Please report if you may have any problems.

Hope this helps.

Cheers,
Rolf


Am 07.05.2017 um 13:15 schrieb Rolf Bensch:
> Hi,
>
> @Olaf: Thanks for your patch. It's working with the ppa.
>
> Please have a look at the attached patches. Maybe there are additional
> fixes for SANE (fix_avahi_error_paths.patch) or there are needful
> additional options for configure possible or just keep them inside the ppa?
>
> Many thanks for your help.
>
> Cheers,
> Rolf
>
>
> Am 06.05.2017 um 14:00 schrieb Olaf Meeuwissen:
>> 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-2FSF Associate Member since 2004-01-27
>>  GnuPG key: F84A2DD9/B3C0 2F47 EA19 64F4 9F13  F43E B8A4 A88A F84A 2DD9
>>  Support Free Softwarehttps://my.fsf.org/donate
>>  Join the Free Software Foundation  https://my.fsf.org/join
>>

-- 
sane-devel mailing list: sane-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-devel
Unsubscribe: Send mail with subject "unsubscribe your_password"
 to sane-devel-requ...@lists.alioth.debian.org

Re: [sane-devel] Fix PPA build (was Re: sane-backends release 1.0.26 schedule)

2017-05-07 Thread Rolf Bensch 
Hi,

@Olaf: Thanks for your patch. It's working with the ppa.

Please have a look at the attached patches. Maybe there are additional
fixes for SANE (fix_avahi_error_paths.patch) or there are needful
additional options for configure possible or just keep them inside the ppa?

Many thanks for your help.

Cheers,
Rolf


Am 06.05.2017 um 14:00 schrieb Olaf Meeuwissen:
> 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-2FSF Associate Member since 2004-01-27
>  GnuPG key: F84A2DD9/B3C0 2F47 EA19 64F4 9F13  F43E B8A4 A88A F84A 2DD9
>  Support Free Softwarehttps://my.fsf.org/donate
>  Join the Free Software Foundation  https://my.fsf.org/join
> 



patches.tar.gz
Description: application/gzip
-- 
sane-devel mailing list: sane-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-devel
Unsubscribe: Send mail with subject "unsubscribe your_password"
 to sane-devel-requ...@lists.alioth.debian.org

[sane-devel] Fix PPA build (was Re: sane-backends release 1.0.26 schedule)

2017-05-06 Thread Olaf Meeuwissen 
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-2FSF Associate Member since 2004-01-27
 GnuPG key: F84A2DD9/B3C0 2F47 EA19 64F4 9F13  F43E B8A4 A88A F84A 2DD9
 Support Free Softwarehttps://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.0 +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.0 +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.0 +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.0 +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: sane-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-devel
Unsubscribe: Send mail with subject "unsubscribe your_password"
 to sane-devel-requ...@lists.alioth.debian.org