[debian-edu-commits] debian-edu/ 03/04: Stop using our own apt archive on ftp.skolelinux.org, see #836375.

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu.

commit 99a114e016b17a4af4b19db7cfbc4c5fa8651549
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Sep 2 14:51:46 2016 +0200

    Stop using our own apt archive on ftp.skolelinux.org, see #836375.
    
    * Stop using our own apt archive on ftp.skolelinux.org, see #836375:
      - sources.list.jessie: remove allready unused reference to the old repo.
      - tasks/common and tasks/thin-client: stop depending on our keyring
        package.
---
 debian/changelog    | 4 ++++
 sources.list.jessie | 1 -
 tasks/common        | 2 +-
 tasks/thin-client   | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bdc372..17ad45f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ debian-edu (1.906) UNRELEASED; urgency=medium
   * Drop unused pkglists directory in source package, as it only contained
     historical information.
   * Drop sources.list.wheezy-test. 
+  * Stop using our own apt archive on ftp.skolelinux.org, see #836375:
+    - sources.list.jessie: remove allready unused reference to the old repo.
+    - tasks/common and tasks/thin-client: stop depending on our keyring
+      package.
 
  -- Holger Levsen <holger at debian.org>  Fri, 02 Sep 2016 14:42:12 +0200
 
diff --git a/sources.list.jessie b/sources.list.jessie
index 388bc5a..9cad315 100644
--- a/sources.list.jessie
+++ b/sources.list.jessie
@@ -1,3 +1,2 @@
 # Use jessie as final target for Debian Edu meta packages
 deb http://http.debian.net/debian/ jessie main contrib non-free
-#deb http://ftp.skolelinux.org/skolelinux/ jessie-test local
diff --git a/tasks/common b/tasks/common
index c763bca..386d399 100644
--- a/tasks/common
+++ b/tasks/common
@@ -54,7 +54,7 @@ NeedConfig:  no
 
 Depends:     man-db, manpages, ethtool, hdparm, pciutils, \
              nictools-pci, apt-listchanges, \
-             debian-archive-keyring, debian-edu-archive-keyring, \
+             debian-archive-keyring, \
              resolvconf, psmisc, mii-diag, lsscsi, \
              sysfsutils, etherwake, mlocate
 Recommends:  iputils-arping | arping, finger, gdebi-core | gdebi
diff --git a/tasks/thin-client b/tasks/thin-client
index 163e29d..483ed42 100644
--- a/tasks/thin-client
+++ b/tasks/thin-client
@@ -5,7 +5,7 @@ Description: Debian Edu networked thin client packages
  This metapackage depends on various packages required on all
  networked thin client installations in the Debian Edu Blend.
 
-Depends:     ltsp-client, debian-edu-archive-keyring, iputils-ping
+Depends:     ltsp-client, iputils-ping
 Recommends:  alsa-utils, alsa-base, acpi-support-base
 Why:         Packages needed to get the client to work properly with our
              archive, network, sound and ACPI.

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