about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-01-21 16:47:39 +0100
committerMichael Biebl <biebl@debian.org>2018-01-21 19:37:31 +0100
commitaefcc4b86fc7ade5101c5247d8fb2a565453df2d (patch)
tree67c1628792146276754c455da263a22ed4debb5c /debian
parent501572d74779fdf0fc240e01eb82843e9417322c (diff)
Revert "Bump debhelper compat level to 11"
There are currently too many issues with dh_installsystemd, so switch
back to compat 10 using dh_systemd_enable and dh_systemd_start for the
time being.

This reverts commit ac717b686e40bc8c365e2f3eae7315f4ad239ae7.
Diffstat (limited to 'debian')
-rw-r--r--debian/compat2
-rw-r--r--debian/control2
-rw-r--r--debian/network-manager.examples2
-rwxr-xr-xdebian/rules1
4 files changed, 4 insertions, 3 deletions
diff --git a/debian/compat b/debian/compat
index b4de3947..f599e28b 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-11
+10
diff --git a/debian/control b/debian/control
index 76517185..2b0cf8cc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.
 Uploaders: Michael Biebl <biebl@debian.org>,
  Sjoerd Simons <sjoerd@debian.org>,
  Aron Xu <aron@debian.org>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper (>= 10.3),
                automake (>= 1.12),
                dpkg-dev (>= 1.17.14),
                pkg-config,
diff --git a/debian/network-manager.examples b/debian/network-manager.examples
index 9decc509..a1fc8a10 100644
--- a/debian/network-manager.examples
+++ b/debian/network-manager.examples
@@ -1 +1 @@
-usr/share/doc/NetworkManager/examples/server.conf
+debian/tmp/usr/share/doc/NetworkManager/examples/server.conf
diff --git a/debian/rules b/debian/rules
index 7583feb4..a224a16a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,7 @@ override_dh_auto_configure:
 
 override_dh_install:
 	find debian/tmp -name '*.la' -print -delete
+	rm debian/tmp/usr/share/doc/NetworkManager/examples/server.conf
 	dh_install
 
 override_dh_missing: