From 273e441860916146b0069e977c5ee9b58de0ba74 Mon Sep 17 00:00:00 2001
Message-Id: <273e441860916146b0069e977c5ee9b58de0ba74.1714863461.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Mon, 10 Jul 2017 11:31:05 +0100
Subject: [PATCH] debian/: Update for Debhelper 10.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

Possibly controversially: I've forced the libdir back to `/usr/lib',
without an architecture-specific subdirectory.  This makes it easy for
architecture-independent packages to drop things into appropriate
subdirectories, while still /permitting/ architecture-dependent services
and similar.

Relatedly, though, move the `pkg-config' dropping into `/usr/share' by
default.
---
 Makefile.am          | 2 +-
 debian/compat        | 2 +-
 debian/rules         | 5 +++--
 debian/tripe.install | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e00e796b..046247a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@ SUBDIRS			+= t
 ###--------------------------------------------------------------------------
 ### Package-configuration file.
 
-pkgconfigdir		 = $(libdir)/pkgconfig
+pkgconfigdir		 = $(datadir)/pkgconfig
 pkgconfig_DATA		 = tripe.pc
 EXTRA_DIST		+= tripe.pc.in
 CLEANFILES		+= tripe.pc
diff --git a/debian/compat b/debian/compat
index 45a4fb75..f599e28b 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/rules b/debian/rules
index b45a6be5..9b5065a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #! /usr/bin/make -f
 
-DH_OPTIONS		 = --parallel -Bdebian/build
+DH_OPTIONS		 = -Bdebian/build
 
 ###--------------------------------------------------------------------------
 ### Configuration.
@@ -9,6 +9,7 @@ OVERRIDES		+= auto_configure
 dh_auto_configure_OPTS	 = --
 
 ## Various files and directories.
+dh_auto_configure_OPTS	+= --libdir="\$${prefix}/lib"
 dh_auto_configure_OPTS	+= --libexecdir="\$${libdir}/tripe"
 dh_auto_configure_OPTS	+= --with-configdir="/etc/tripe"
 dh_auto_configure_OPTS	+= --with-socketdir="/var/run"
@@ -61,7 +62,7 @@ dh-install-hook::
 ###--------------------------------------------------------------------------
 ### Some machinery for overriding Debhelper in a structured way.
 
-%:; dh $@ $(DH_OPTIONS)
+%:; dh $@ --without autoreconf $(DH_OPTIONS)
 
 $(foreach o, $(sort $(OVERRIDES)), dh-$o-hook)::; @:
 $(foreach o, $(sort $(OVERRIDES)), override_dh_$o): override_dh_%: dh-%-hook
diff --git a/debian/tripe.install b/debian/tripe.install
index d6a2b212..d0c322cb 100644
--- a/debian/tripe.install
+++ b/debian/tripe.install
@@ -6,7 +6,7 @@ debian/tmp/usr/share/man/man7/tripe-service.7tripe
 debian/tmp/usr/share/man/man8/tripe.8tripe
 debian/tmp/usr/lib/tripe/tripe-privhelper
 debian/tmp/usr/share/man/man8/tripe-privhelper.8tripe
-debian/tmp/usr/lib/pkgconfig/tripe.pc
+debian/tmp/usr/share/pkgconfig/tripe.pc
 
 debian/build/contrib/tripe-ipif		/usr/share/doc/tripe/examples
 debian/build/contrib/ipif-peers		/usr/share/doc/tripe/examples
-- 
[mdw]