Bug#878099: libhdhomerun: Please make libhdhomerun4 Multi-Arch: same

2017-10-11 Thread Ian Campbell
On Tue, 2017-10-10 at 15:37 -0700, Francois Marier wrote:
> On 2017-10-10 at 21:37:30, Ian Campbell wrote:
> > Sorry, looks like I accidentally missed out a hunk in the orignal
> > patch
> > I sent, see below. Like last time note the mode as well as the
> > content
> > change.
> > 
> > Sorry again for the confusion.
> 
> Thanks. That was the problem.
> 
> I've uploaded the package. Let me know whether it works for you.

Thanks, I upgraded successfully. I don't actually have a hdhomerun, the
library is just a dependency of mythtv. It is up and running happily
with the new library though FWIW.

Ian.



Bug#878099: libhdhomerun: Please make libhdhomerun4 Multi-Arch: same

2017-10-10 Thread Francois Marier
On 2017-10-10 at 21:37:30, Ian Campbell wrote:
> Sorry, looks like I accidentally missed out a hunk in the orignal patch
> I sent, see below. Like last time note the mode as well as the content
> change.
> 
> Sorry again for the confusion.

Thanks. That was the problem.

I've uploaded the package. Let me know whether it works for you.

Francois



Bug#878099: libhdhomerun: Please make libhdhomerun4 Multi-Arch: same

2017-10-10 Thread Ian Campbell
On Tue, 2017-10-10 at 13:13 -0700, Francois Marier wrote:
> On 2017-10-10 at 19:38:18, Ian Campbell wrote:
> > On Tue, 2017-10-10 at 11:20 -0700, Francois Marier wrote:
> > >   E: libhdhomerun4: ldconfig-symlink-missing-for-shlib 
> > > usr/lib/x86_64-linux-gnu/libhdhomerun.so.4 
> > > usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 libhdhomerun.so.4
> > >   W: libhdhomerun4: dev-pkg-without-shlib-symlink 
> > > usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 
> > > usr/lib/x86_64-linux-gnu/libhdhomerun.so
> > 
> > Sorry, I don't know how I missed that. Looking now I only actually see
> > the second one (the warning). It's fixed by the additional patch below
> > (note the mode change as well as the content change).
> > 
> > Not sure about the error though since I don't see it, but perhaps the
> > same patch helps there?
> 
> The warning is indeed fixed by your second patch but the error is still
> there.

Sorry, looks like I accidentally missed out a hunk in the orignal patch
I sent, see below. Like last time note the mode as well as the content
change.

Sorry again for the confusion.

Ian.

diff --git a/debian/libhdhomerun4.links b/debian/libhdhomerun4.links
old mode 100644
new mode 100755
index 074bcaa..43ca729
--- a/debian/libhdhomerun4.links
+++ b/debian/libhdhomerun4.links
@@ -1 +1,2 @@
-/usr/lib/libhdhomerun.so.4.0.0 /usr/lib/libhdhomerun.so.4
+#! /usr/bin/dh-exec
+/usr/lib/${DEB_HOST_MULTIARCH}/libhdhomerun.so.4.0.0 
/usr/lib/${DEB_HOST_MULTIARCH}/libhdhomerun.so.4



Bug#878099: libhdhomerun: Please make libhdhomerun4 Multi-Arch: same

2017-10-10 Thread Ian Campbell
On Tue, 2017-10-10 at 13:13 -0700, Francois Marier wrote:
> On 2017-10-10 at 19:38:18, Ian Campbell wrote:
> > On Tue, 2017-10-10 at 11:20 -0700, Francois Marier wrote:
> > >   E: libhdhomerun4: ldconfig-symlink-missing-for-shlib 
> > > usr/lib/x86_64-linux-gnu/libhdhomerun.so.4 
> > > usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 libhdhomerun.so.4
> > >   W: libhdhomerun4: dev-pkg-without-shlib-symlink 
> > > usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 
> > > usr/lib/x86_64-linux-gnu/libhdhomerun.so
> > 
> > Sorry, I don't know how I missed that. Looking now I only actually see
> > the second one (the warning). It's fixed by the additional patch below
> > (note the mode change as well as the content change).
> > 
> > Not sure about the error though since I don't see it, but perhaps the
> > same patch helps there?
> 
> The warning is indeed fixed by your second patch but the error is still
> there.

Weird. What is the contents of the package you build? Mine is:
drwxr-xr-x root/root 0 2017-10-10 19:34 ./
drwxr-xr-x root/root 0 2017-10-10 19:34 ./usr/
drwxr-xr-x root/root 0 2017-10-10 19:34 ./usr/lib/
drwxr-xr-x root/root 0 2017-10-10 19:34 ./usr/lib/x86_64-linux-gnu/
-rw-r--r-- root/root 79784 2017-10-10 19:34 
./usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0
drwxr-xr-x root/root 0 2017-10-10 19:34 ./usr/share/
drwxr-xr-x root/root 0 2017-10-10 19:34 ./usr/share/doc/
drwxr-xr-x root/root 0 2017-10-10 19:34 
./usr/share/doc/libhdhomerun4/
-rw-r--r-- root/root   503 2017-06-12 20:31 
./usr/share/doc/libhdhomerun4/README.md
-rw-r--r-- root/root  1697 2017-10-10 19:34 
./usr/share/doc/libhdhomerun4/changelog.Debian.gz
-rw-r--r-- root/root 11229 2017-10-10 19:34 
./usr/share/doc/libhdhomerun4/changelog.gz
-rw-r--r-- root/root  1267 2017-10-08 17:56 
./usr/share/doc/libhdhomerun4/copyright
lrwxrwxrwx root/root 0 2017-10-10 19:34 
./usr/lib/x86_64-linux-gnu/libhdhomerun.so.4 -> libhdhomerun.so.4.0.0

If I understand the warning correctly it is complaining that you are
missing that symlink at the end.

Ian.



Bug#878099: libhdhomerun: Please make libhdhomerun4 Multi-Arch: same

2017-10-10 Thread Francois Marier
On 2017-10-10 at 19:38:18, Ian Campbell wrote:
> On Tue, 2017-10-10 at 11:20 -0700, Francois Marier wrote:
> >   E: libhdhomerun4: ldconfig-symlink-missing-for-shlib 
> > usr/lib/x86_64-linux-gnu/libhdhomerun.so.4 
> > usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 libhdhomerun.so.4
> >   W: libhdhomerun4: dev-pkg-without-shlib-symlink 
> > usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 
> > usr/lib/x86_64-linux-gnu/libhdhomerun.so
> 
> Sorry, I don't know how I missed that. Looking now I only actually see
> the second one (the warning). It's fixed by the additional patch below
> (note the mode change as well as the content change).
> 
> Not sure about the error though since I don't see it, but perhaps the
> same patch helps there?

The warning is indeed fixed by your second patch but the error is still
there.

Francois



Bug#878099: libhdhomerun: Please make libhdhomerun4 Multi-Arch: same

2017-10-10 Thread Ian Campbell
On Tue, 2017-10-10 at 11:20 -0700, Francois Marier wrote:
> Thanks for the patch Ian.
> 
> I merged it [1] but then noticed that it introduces two lintian problems:
> 
>   E: libhdhomerun4: ldconfig-symlink-missing-for-shlib 
> usr/lib/x86_64-linux-gnu/libhdhomerun.so.4 
> usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 libhdhomerun.so.4
>   W: libhdhomerun4: dev-pkg-without-shlib-symlink 
> usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 
> usr/lib/x86_64-linux-gnu/libhdhomerun.so

Sorry, I don't know how I missed that. Looking now I only actually see
the second one (the warning). It's fixed by the additional patch below
(note the mode change as well as the content change).

Not sure about the error though since I don't see it, but perhaps the
same patch helps there?

Ian.

diff --git a/debian/libhdhomerun-dev.install b/debian/libhdhomerun-dev.install
old mode 100644
new mode 100755
index 5101440..4d7dbdf
--- a/debian/libhdhomerun-dev.install
+++ b/debian/libhdhomerun-dev.install
@@ -1,2 +1,3 @@
+#! /usr/bin/dh-exec
 *.h /usr/include/libhdhomerun
-*.so /usr/lib
+*.so /usr/lib/${DEB_HOST_MULTIARCH}



Bug#878099: libhdhomerun: Please make libhdhomerun4 Multi-Arch: same

2017-10-10 Thread Francois Marier
Thanks for the patch Ian.

I merged it [1] but then noticed that it introduces two lintian problems:

  E: libhdhomerun4: ldconfig-symlink-missing-for-shlib 
usr/lib/x86_64-linux-gnu/libhdhomerun.so.4 
usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 libhdhomerun.so.4
  W: libhdhomerun4: dev-pkg-without-shlib-symlink 
usr/lib/x86_64-linux-gnu/libhdhomerun.so.4.0.0 
usr/lib/x86_64-linux-gnu/libhdhomerun.so

Francois

[1] 
https://anonscm.debian.org/git/collab-maint/libhdhomerun.git/commit/?id=a90d4674879f2331b7bd331a1136afb8bd1e3587



Bug#878099: libhdhomerun: Please make libhdhomerun4 Multi-Arch: same

2017-10-09 Thread Ian Campbell
Source: libhdhomerun
Version: 20170930-1
Severity: wishlist
Tags: patch

Dear Maintainer,

Please move the libraries to /usr/lib/${DEB_HOST_MULTIARCH} and mark the
package as Multi-Arch: same to allow coinstallation of libhdhomerun4:i386 and
libhdhomerun4:amd64 (for example).

I've tested the attached and it works for me.

Note that I _removed_ the Multi-Arch: same annotation from libhdhomerun-dev,
since this installs files in /usr/include (rather than
/usr/include/${DEB_HOST_MULTIARCH}) I don't think libhdhomerun-dev:amd64 and
libhdhomerun-dev:i386 would be coinstallable as required. I don't need to
coinstall those though so feel free to ignore that change.

Thanks,
Ian.

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel, arm64

Kernel: Linux 4.12.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/control b/debian/control
index a2e8aee..56b81e4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Homepage: https://www.silicondust.com/support/linux/
 Maintainer: Francois Marier 
-Build-Depends: debhelper (>= 10), po-debconf
+Build-Depends: debhelper (>= 10), dh-exec (>=0.3), po-debconf
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/libhdhomerun.git
 Vcs-Browser: https://anonscm.debian.org/git/collab-maint/libhdhomerun.git
@@ -27,6 +27,7 @@ Description: Configuration utility for Silicon Dust HD HomeRun
 Package: libhdhomerun4
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: Library for Silicon Dust HD HomeRun
  This package supports the Silicon Dust HDHomeRun.
  The HDHomeRun is a networked, two tuner digital TV tuner compatible with
@@ -40,7 +41,6 @@ Section: libdevel
 Depends: libhdhomerun4 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
-Multi-Arch: same
 Description: Development library for Silicon Dust HD HomeRun
  This package supports the Silicon Dust HDHomeRun.
  The HDHomeRun is a networked, two tuner digital TV tuner compatible with
diff --git a/debian/libhdhomerun4.install b/debian/libhdhomerun4.install
old mode 100644
new mode 100755
index 6165713..72318fb
--- a/debian/libhdhomerun4.install
+++ b/debian/libhdhomerun4.install
@@ -1 +1,2 @@
-libhdhomerun.so.* /usr/lib
+#! /usr/bin/dh-exec
+libhdhomerun.so.* /usr/lib/${DEB_HOST_MULTIARCH}