[debian-edu-commits] debian-edu/ 01/01: Drop unused bin/debian-edu-current-codename workaround.

[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-config.

commit 478cd4c55e9ab52f28c935db0995392cb77335f9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Sep 11 14:59:13 2016 +0200

    Drop unused bin/debian-edu-current-codename workaround.
    
    Drop bin/debian-edu-current-codename workaround which was only used by
    auto-addfirmware which was replaced by isenkram-autoinstall-firmware
    in debian-edu-config 1.810.
---
 Makefile                        |  1 -
 bin/debian-edu-current-codename | 13 -------------
 debian/changelog                |  3 +++
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index f8bf049..04d95e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 PACKAGE = debian-edu-config
 
 PROGS = \
-	debian-edu-current-codename \
 	debian-edu-ldapserver \
 	ltsp-arch-debian-edu \
 	update-ini-file
diff --git a/bin/debian-edu-current-codename b/bin/debian-edu-current-codename
deleted file mode 100755
index 26cb951..0000000
--- a/bin/debian-edu-current-codename
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-codename=$(lsb_release -sc)
-
-# Workaround for bad lsb_release behaviour when only a CD/DVD APT
-# source is listed in /etc/sources.list, or when installing from
-# testing/unstable.
-
-if [ "n/a" = "$codename" ] ; then
-    codename=stretch
-fi
-
-echo $codename
diff --git a/debian/changelog b/debian/changelog
index a36bae0..706da9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ debian-edu-config (1.911) UNRELEASED; urgency=medium
   * Remove unused (and outdated) files etc/ldap/slapd-debian-edu.conf
     and etc/ldap/slapd-lenny_debian-edu.conf and add code in postinst
     to remove the now obsolete conffiles. (Thanks to Wolfgang Schweer.)
+  * Drop bin/debian-edu-current-codename workaround which was only used by
+    auto-addfirmware which was replaced by isenkram-autoinstall-firmware in
+    debian-edu-config 1.810.
 
  -- Holger Levsen <holger at debian.org>  Sat, 10 Sep 2016 17:06:45 +0200
 

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