Minor cleanups

5 files changed, 4 insertions, 12 deletions

diff --git a/debian/bird2.bird.init b/debian/bird2.bird.init
index fbd923d8..ac15e698 100644
--- a/debian/bird2.bird.init
+++ b/debian/bird2.bird.init
@@ -12,7 +12,7 @@
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="BIRD Internet Routing Daemon (IPv4)"
+DESC="BIRD Internet Routing Daemon"
 NAME=bird
 DAEMON=/usr/sbin/$NAME
 BIRD_ARGS=""
diff --git a/debian/bird2.bird.service b/debian/bird2.bird.service
index 2ef96027..37e75fb4 100644
--- a/debian/bird2.bird.service
+++ b/debian/bird2.bird.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=BIRD Internet Routing Daemon (IPv4)
+Description=BIRD Internet Routing Daemon
 After=network.target
 
 [Service]
diff --git a/debian/bird2.dirs b/debian/bird2.dirs
deleted file mode 100644
index 19207405..00000000
--- a/debian/bird2.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/bird/
-usr/sbin
-usr/share/bird/
-usr/share/doc/bird/examples/
diff --git a/debian/bird2.install b/debian/bird2.install
index ea1e60ea..a1a1fa05 100644
--- a/debian/bird2.install
+++ b/debian/bird2.install
@@ -1,6 +1,6 @@
 etc/bird2/bird.conf /usr/share/doc/bird2/examples/
-etc/bird2/envvars
-usr/lib/bird2/prepare-environment
+debian/envvars /etc/bird2/
+debian/prepare-environment /usr/lib/bird/
 usr/sbin/bird
 usr/sbin/birdc
 usr/sbin/birdcl
diff --git a/debian/rules b/debian/rules
index 730f168f..11abd9f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,10 +29,6 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp
-	install -d -m 755 debian/tmp/etc/bird2
-	install -m 644 debian/envvars debian/tmp/etc/bird2/
-	install -d -m 755 debian/tmp/usr/lib/bird2
-	install -m 755 debian/prepare-environment debian/tmp/usr/lib/bird2/
 
 override_dh_installinit:
 	dh_installinit --name=bird --restart-after-upgrade