[debian-edu-commits] debian-edu/ 01/01: Use debian-edu-current-codename instead of lsb_release -cs in auto- addfirmware and testsuite/doc too.

[Petter Reinholdtsen]

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

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

commit 4899d4ab009d14a3f63b7ab575ee3845197b34f6
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Sep 25 22:47:27 2014 +0200

    Use debian-edu-current-codename instead of lsb_release -cs in auto- addfirmware and testsuite/doc too.
---
 debian/changelog                               | 2 ++
 share/debian-edu-config/tools/auto-addfirmware | 2 +-
 testsuite/doc                                  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5770a2b..90d4882 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ debian-edu-config (1.805) UNRELEASED; urgency=low
     the education-tasks package instead.
   * Fix bug in debian-edu-bless failing to clean up the tasksel test
     diverts if the installation succeeds.
+  * Use debian-edu-current-codename instead of lsb_release -cs in auto-
+    addfirmware and testsuite/doc too.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 25 Sep 2014 09:30:23 +0200
 
diff --git a/share/debian-edu-config/tools/auto-addfirmware b/share/debian-edu-config/tools/auto-addfirmware
index f358546..54785cb 100644
--- a/share/debian-edu-config/tools/auto-addfirmware
+++ b/share/debian-edu-config/tools/auto-addfirmware
@@ -3,7 +3,7 @@
 # Find missing firmware files requested by the kernel, and install the
 # binary packages with the files from the non-free section.
 
-dist=$(lsb_release -cs)
+dist=$(debian-edu-current-codename)
 arch=$(dpkg --print-architecture)
 mirror=http://http.debian.net/debian
 aptsourcelist=/etc/apt/sources.list.d/auto-addfirmware.list
diff --git a/testsuite/doc b/testsuite/doc
index 61ab165..c422f12 100755
--- a/testsuite/doc
+++ b/testsuite/doc
@@ -4,7 +4,7 @@
 
 set -e
 
-suite=$(lsb_release -cs)
+suite=$(debian-edu-current-codename)
 capsuite=$(echo $suite | sed 's/\([a-z]\)\([a-zA-Z0-9]*\)/\u\1\2/g')
 
 docfile=/usr/share/doc/debian-edu-doc/en/debian-edu-$suite-manual.html

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