debian/: Update for Debhelper 10.

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.

diff --git a/Makefile.am b/Makefile.am
index e00e796bf64314cc0f66f3550fccc3794487cae9..046247a7e1a5dee823d1c579affe28b4fc9a91c2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@ SUBDIRS                       += t
 ###--------------------------------------------------------------------------
 ### Package-configuration file.
 
 ###--------------------------------------------------------------------------
 ### Package-configuration file.
 

-pkgconfigdir            = $(libdir)/pkgconfig
+pkgconfigdir            = $(datadir)/pkgconfig

 pkgconfig_DATA          = tripe.pc
 EXTRA_DIST             += tripe.pc.in
 CLEANFILES             += tripe.pc
 pkgconfig_DATA          = tripe.pc
 EXTRA_DIST             += tripe.pc.in
 CLEANFILES             += tripe.pc

diff --git a/debian/compat b/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10

diff --git a/debian/rules b/debian/rules
index b45a6be5e7aad9b12cf94edd4fa3bfe1abd83bb6..9b5065a32ff51befd150d7b5cb74b2f226b00c5c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #! /usr/bin/make -f
 
 #! /usr/bin/make -f
 

-DH_OPTIONS              = --parallel -Bdebian/build
+DH_OPTIONS              = -Bdebian/build

 
 ###--------------------------------------------------------------------------
 ### Configuration.
 
 ###--------------------------------------------------------------------------
 ### Configuration.


@@ -9,6 +9,7 @@ OVERRIDES               += auto_configure
 dh_auto_configure_OPTS  = --
 
 ## Various files and directories.
 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"
 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.
 
 ###--------------------------------------------------------------------------
 ### 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
 
 $(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 d6a2b212a53640a96318fb83270e92cd88eea63c..d0c322cbf55687f4ba5a1ab540b3f1fda2fe855b 100644 (file)
--- 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/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
 
 debian/build/contrib/tripe-ipif                /usr/share/doc/tripe/examples
 debian/build/contrib/ipif-peers                /usr/share/doc/tripe/examples