Updating debhelper files for new upstream version.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 16 insertions, 8 deletions

diff --git a/debian/progress-linux-pgp-keys.install b/debian/progress-linux-pgp-keys.install
index 63abeb7..db4503e 100644
--- a/debian/progress-linux-pgp-keys.install
+++ b/debian/progress-linux-pgp-keys.install
@@ -1 +1 @@
-pgp-keys/*.gpg /usr/share/progress-linux/pgp-keys
+/usr/share/progress-linux/pgp-keys
diff --git a/debian/progress-linux-ssh-keys.install b/debian/progress-linux-ssh-keys.install
index 875d411..e2bac56 100644
--- a/debian/progress-linux-ssh-keys.install
+++ b/debian/progress-linux-ssh-keys.install
@@ -1 +1 @@
-ssh-keys/*.pub /usr/share/progress-linux/ssh-keys
+/usr/share/progress-linux/ssh-keys
diff --git a/debian/progress-linux.install b/debian/progress-linux.install
new file mode 100644
index 0000000..48661b6
--- /dev/null
+++ b/debian/progress-linux.install
@@ -0,0 +1,2 @@
+/usr/share/doc
+/usr/share/man
diff --git a/debian/progress-linux.postinst b/debian/progress-linux.postinst
index b284aac..5dfadfb 100755
--- a/debian/progress-linux.postinst
+++ b/debian/progress-linux.postinst
@@ -33,12 +33,7 @@ Remove_apt_preferences ()
 
 Install_apt_keys ()
 {
-	rm -f "/etc/apt/trusted.gpg.d/${PROJECT}.gpg"
-
-	for KEY in "/usr/share/${PROJECT}/pgp-keys"/*archive-key.gpg
-	do
-		cat "${KEY}" >> "/etc/apt/trusted.gpg.d/${PROJECT}.gpg"
-	done
+	cp -f "/usr/share/${PROJECT}/pgp-keys/apt.${DOMAIN}.gpg" "/etc/apt/trusted.gpg.d/${PROJECT}.gpg"
 }
 
 Remove_apt_keys ()
diff --git a/debian/rules b/debian/rules
index a4977a6..8992c71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,16 @@
 %:
 	dh ${@}
 
+override_dh_auto_build:
+	# disabled
+
 override_dh_auto_test:
 	# disabled
+
+override_dh_auto_install:
+	dh_auto_install
+
+	# removing useless files
+	rm -f debian/tmp/usr/share/doc/*/CHANGELOG.txt
+	rm -f debian/tmp/usr/share/doc/*/LICENSE.txt
+	rm -f debian/tmp/usr/share/doc/*/VERSION.txt