12 files changed, 68 insertions, 93 deletions
diff --git a/debian/changelog b/debian/changelog
index 04bf635..e6cf96d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+itzks-keyring (2018.01.27) unstable; urgency=medium
+
+  * Drop maintainer keys.
+  * Include archive keys of befriended projects:
+    - Arctica Project's archive key: 0xA8680F5598DE3101.
+    - X2Go Project's archive key: 0xC509840B96F89133, 0xE1F958385BFE2B6E.
+  * Use cdbs + debhelper.
+  * Don't use apt-key anymore, rather place files into APT's trusted.gpg.d/
+    directory.
+  * Bump DH version level to 9. Add compat file.
+  * Remove itzks-keyring.gpg from APT's main keyring in preinst for older
+    versions of this package. Re-add that key again as a drop-in file.
+  * debian/control:
+    + Rephrase LONG_DESCRIPTION.
+    + Add B:/R:s for arctica-keyring and x2go-keyring.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sat, 27 Jan 2018 02:15:47 +0100
+
 itzks-keyring (2012.07.21) unstable; urgency=low
 
   * Remove maintainer keys:
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
index d28c739..1151e34 100644
--- a/debian/control
+++ b/debian/control
@@ -4,24 +4,36 @@ Priority: optional
 Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Uploaders:
  ITZKS Packages <debian@it-zukunft-schule.de>
+Build-Depends:
+ cdbs,
+ debhelper (>= 9),
+ gawk,
 Homepage: http://it-zukunft-schule.de/
-Standards-Version: 3.9.2
+Standards-Version: 4.1.3
 Vcs-Git: git://code.it-zukunft-schule.de/itzks-keyring.git
 Vcs-Browser: http://code.it-zukunft-schule.de/gitweb?p=itzks-keyring.git;a=summary
 
 Package: itzks-keyring
 Architecture: all
+Depends: ${misc:Depends},
 Recommends: gnupg (>= 1.0.6-4)
-Description: GnuPG keys of ITZKS developers + archives
+Breaks: arctica-keyring,
+        x2go-keyring,
+Replaces: arctica-keyring,
+          x2go-keyring,
+Description: GnuPG keys for archives used on ITZKS systems
  The Debian project wants developers to digitally sign the
  announcements of their packages with GnuPG, to protect against
  forgeries.
  .
- This package contains GnuPG keyrings all ITZKS developers and the
- ITZKS archives.
+ This package contains GnuPG keyrings for projects utilized on
+ ITZkS systems:
  .
- ITZKS stands for ,,IT-Zukunft-Schule'' and names a Debian Edu
- service partner project in Nothern Germany (Schleswig-Holstein).
-
-
-
+   - all ITZkS developers' and ITZkS archives' keys
+   - all Arctica developers' and Arctica archives' keys
+   - all X2Go developers' and X2Go archives' keys
+   - the geogebra archive's key
+   - the grandorgue archive's key
+ .
+ ITZkS stands for ,,IT-Zukunft-Schule'' and names a Debian Edu
+ service partner project in Northern Germany (Schleswig-Holstein).
diff --git a/debian/copyright b/debian/copyright
index b71f794..68796c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-This is ITZKS's GnuPG keyring of developers keys.
+This is ITZkS's GnuPG keyring of developers keys.
 
 This package was originally derived from Debian mainrainer's keyring 
 <keyring-maint@debian.org>.
diff --git a/debian/files b/debian/files
deleted file mode 100644
index c2eb2f2..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-itzks-keyring_2011.12.07_all.deb misc optional
diff --git a/debian/itzks-keyring.install b/debian/itzks-keyring.install
new file mode 100644
index 0000000..938abd2
--- /dev/null
+++ b/debian/itzks-keyring.install
@@ -0,0 +1 @@
+debian/tmp/usr/
+\ No newline at end of file
diff --git a/debian/itzks-keyring.links b/debian/itzks-keyring.links
new file mode 100644
index 0000000..190e76f
--- /dev/null
+++ b/debian/itzks-keyring.links
@@ -0,0 +1,3 @@
+usr/share/keyrings/arctica-keyring.gpg etc/apt/trusted.gpg.d/arctica-archive-keyring.gpg 
+usr/share/keyrings/itzks-keyring.gpg etc/apt/trusted.gpg.d/itzks-archive-keyring.gpg 
+usr/share/keyrings/x2go-keyring.gpg etc/apt/trusted.gpg.d/x2go-archive-keyring.gpg 
+\ No newline at end of file
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index ca3417a..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-if which apt-key >/dev/null; then
-    echo -n "Updating APT keyring - " && apt-key add /usr/share/keyrings/itzks-keyring.gpg
-fi
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..9b6576e
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if dpkg --compare-versions "$2" le "2018.01.27"; then
+	if which apt-key >/dev/null; then
+		echo -n "Updating APT keyring - " && apt-key add /usr/share/keyrings/itzks-keyring.gpg
+	fi
+fi
+
+#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644
index 9c78000..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-    remove|purge)
-    if which apt-key >/dev/null; then
-      echo -n Removing keyid 0xCBBFF2FC3F8F5540 from APT keyring -" " && apt-key del CBBFF2FC3F8F5540
-    fi
-    ;;
-esac
diff --git a/debian/prerm.template b/debian/prerm.template
deleted file mode 100644
index fd7cee6..0000000
--- a/debian/prerm.template
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-    remove|purge)
-    if which apt-key >/dev/null; then
-        apt-key del XXXXXXXXXX
-    fi
-    ;;
-esac
diff --git a/debian/rules b/debian/rules
index cb8d0ab..da5bb09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,67 +1,22 @@
 #!/usr/bin/make -f
-# debian/rules file - for itzks-keyring
-# Based on sample debian/rules file - for GNU Hello (1.3).
-# Copyright 1994,1995 by Ian Jackson.
-# Copyright 1998-2003 James Troup
-# Copyright 2010 Mike Gabriel
-# I hereby give you perpetual unlimited permission to copy,
-# modify and relicense this file, provided that you do not remove
-# my name from the file itself.  (I assert my moral right of
-# paternity under the Copyright, Designs and Patents Act 1988.)
-# This file may have to be extensively modified
 
-install_dir=install -d -m 755
-install_file=install -m 644
-install_script=install -m 755
-install_binary=install -m 755 -s
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-build:
-	-mkdir -p output/keyrings
-	make
+export PREFIX=/usr
+export DESTDIR=debian/tmp
 
-clean:
-	$(checkdir)
-	make clean
-	-rm -f foo foo.asc *.bak *~ */*~ debian/files* debian/substvars
-	-rm -rf debian/tmp 
+DEB_BUILD_PARALLEL = 1
+DEB_INSTALL_DOCS_ALL = README
 
-binary-indep: checkroot
-	$(checkdir)
-	-rm -rf debian/tmp
-	$(install_dir) debian/tmp/DEBIAN/
+DEB_MAKE_CHECK_TARGET=test
+DEB_MAKE_INSTALL_TARGET=install
 
-	$(install_script) debian/postinst debian/tmp/DEBIAN/
-	$(install_script) debian/prerm debian/tmp/DEBIAN/
+common-install-indep:: remove-cruft
+common-install-arch:: remove-cruft
 
-	$(install_dir) debian/tmp/usr/share/keyrings/
-	$(install_file) output/keyrings/itzks-maintainers.gpg debian/tmp/usr/share/keyrings/
-	$(install_file) output/keyrings/itzks-keyring.gpg debian/tmp/usr/share/keyrings/
+remove-cruft::
+#	Nothing to do here, right now...
 
-	$(install_dir) debian/tmp/usr/share/doc/itzks-keyring/
-	$(install_file) README debian/tmp/usr/share/doc/itzks-keyring/
-	$(install_file) debian/changelog debian/tmp/usr/share/doc/itzks-keyring/changelog
-	gzip -9v debian/tmp/usr/share/doc/itzks-keyring/*
-	$(install_file) debian/copyright debian/tmp/usr/share/doc/itzks-keyring/
-
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-
-	cd debian/tmp && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums 
-
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -d itzks-maintainers-gpg
-	test -d itzks-keyring-gpg
-endef
-
-# Below here is fairly generic really
-
-binary:		binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+get-orig-source:
+	uscan --noconf --force-download --rename --download-current-version --destdir=..