[debian-edu-commits] debian-edu/ 01/04: Fixed typo introduced fixing skolelinux bug 1196

[Alexander Alemayhu]

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

ccscanf-guest pushed a commit to annotated tag 0.412.0.edu.etch.1+svn34952
in repository debian-edu-config.

commit efc7440471ddc45e6f745fd3718a7daeb6ba9650
Author: Klaus Ade Johnstad <klaus at linuxavdelingen.no>
Date:   Tue Jun 19 22:09:44 2007 +0000

    Fixed typo introduced fixing skolelinux bug  1196
---
 cf/cfengine.conf | 2 +-
 debian/changelog | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cf/cfengine.conf b/cf/cfengine.conf
index 955099f..11ca0ea 100644
--- a/cf/cfengine.conf
+++ b/cf/cfengine.conf
@@ -53,7 +53,7 @@ control:
 
         # Workaround for quote/parantesis problem with cfengine.  See #1196)
         ltsp_arch_cmd           = ( `/bin/sh -c "if [ 'amd64' = $(/usr/bin/dpkg --print-architecture) ] ; then /bin/echo i386 ; else /usr/bin/dpkg --print-architecture ; fi"`)
-        ltsp_arch               = ( ExecResult('${ark}') )
+        ltsp_arch               = ( ExecResult('${ltsp_arch_cmd}') )
 	
 	#
 	# Variables that defines some important cataloges
diff --git a/debian/changelog b/debian/changelog
index 4401479..f1dd647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-debian-edu-config (0.412.0.edu.etch.1+svn34872) terra; urgency=low
+debian-edu-config (0.412.0.edu.etch.1+svn34885) unstable; urgency=low
 
   [ Ronny Aasen and Petter Reinholdtsen ]
   * Fixed a bug in cfengine's ltsp_arch variable, that broke the
     installer.  Based on patch from Klaus Ade Johnstad.  Fixes
     skolelinux bug #1196.
 
- -- Petter Reinholdtsen <pere at debian.org>  Tue, 19 Jun 2007 19:45:35 +0100
+  [ Klaus Ade Johnstad ]
+  * Fixed typo introduced in fix for skolelinux bug #1196
+
+ -- Klaus Ade Johnstad <klaus at skolelinux.no>  Wed, 20 Jun 2007 00:06:58 +0200
 
 debian-edu-config (0.412) unstable; urgency=low
 

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