[debian-edu-commits] debian-edu/ 01/01: Drop share/ltsp/plugins/ltsp-build-client/Debian-custom/002-default-apt-keyring.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 28bf1ade97e9fb24752557d840165bc608cf8191
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Oct 4 13:44:41 2016 +0200

    Drop share/ltsp/plugins/ltsp-build-client/Debian-custom/002-default-apt-keyring.
    
    It isn't compatible with the latest LTSP release and isn't needed any more,
    now that the debian-edu-archive-keyring package is gone.
---
 Makefile                                                           | 1 -
 debian/changelog                                                   | 4 ++++
 .../ltsp-build-client/Debian-custom/002-default-apt-keyring        | 7 -------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 2702273..e7d63e0 100644
--- a/Makefile
+++ b/Makefile
@@ -427,7 +427,6 @@ install: install-testsuite
 	set -e ; for f in \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings \
- share/ltsp/plugins/ltsp-build-client/Debian-custom/002-default-apt-keyring \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/010-set-resolver \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/011-http-nopipeline \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/015-edu-apt-source \
diff --git a/debian/changelog b/debian/changelog
index 2c9f492..d8bf52f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ debian-edu-config (1.913) UNRELEASED; urgency=medium
     - testsuite/doc
     Drop share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist
     as it would be redundant after the same replacement.
+  * share/ltsp/plugins/ltsp-build-client/Debian-custom/002-default-apt-keyring
+    isn't compatible with the latest LTSP release and isn't needed any more,
+    now that the debian-edu-archive-keyring package is gone; so it can be
+    dropped.
   * Adjust Makefile.
 
  -- Holger Levsen <holger at debian.org>  Sat, 01 Oct 2016 15:11:32 +0200
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/002-default-apt-keyring b/share/ltsp/plugins/ltsp-build-client/Debian-custom/002-default-apt-keyring
deleted file mode 100644
index c6c0644..0000000
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/002-default-apt-keyring
+++ /dev/null
@@ -1,7 +0,0 @@
-case "$MODE" in
-    configure)
-            if [ -f /etc/apt/trusted.gpg ]; then
-                APT_KEYS="$APT_KEYS /etc/apt/trusted.gpg"
-            fi
-            ;;
-esac

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git