diff --git a/debian/changelog b/debian/changelog index 03cc212..45fa499 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ * Update Vcs-* headers for switch to Salsa. * Re-export upstream key minimally; fixes lintian warning public-upstream-key-not-minimal. + * Patch dpid/Makefile.am to install helper binaries dpid and dpidc + outside $PATH. (Closes: #919063) -- Axel Beckert Wed, 16 Jan 2019 19:38:27 +0100 diff --git a/debian/patches/move-helper-tools-to-libexec.patch b/debian/patches/move-helper-tools-to-libexec.patch new file mode 100644 index 0000000..7dd0b76 --- /dev/null +++ b/debian/patches/move-helper-tools-to-libexec.patch @@ -0,0 +1,26 @@ +Description: Move helper binaries from /usr/bin/ to /usr/lib/…/dillo/ +Author: Axel Beckert +Bug-Debian: https://bugs.debian.org/919063 +Forwarded: no + +--- a/dpid/Makefile.am ++++ b/dpid/Makefile.am +@@ -2,7 +2,7 @@ + -I$(top_srcdir) \ + -DDPIDRC_SYS='"$(sysconfdir)/dpidrc"' + +-bin_PROGRAMS = dpid dpidc ++pkglibexec_PROGRAMS = dpid dpidc + dpid_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +--- a/src/IO/Makefile.am ++++ b/src/IO/Makefile.am +@@ -1,6 +1,6 @@ + AM_CPPFLAGS = \ + -I$(top_srcdir) \ +- -DDILLO_BINDIR='"$(bindir)/"' ++ -DDILLO_BINDIR='"$(pkglibexecdir)/"' + AM_CFLAGS = @LIBFLTK_CFLAGS@ + AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@ + diff --git a/debian/patches/series b/debian/patches/series index 558636b..171add4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-OpenSSL-1.1-detection.patch +move-helper-tools-to-libexec.patch