[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f7b2ad7271655ae78f7d7eece72b6355408f6438)

Jaka Kranjc scm at mail.sourcemage.org
Mon Jan 8 12:27:53 EST 2007


GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 utils/iso-codes/DETAILS       |    2 +-
 utils/iso-codes/HISTORY       |    4 ++++
 utils/iso-codes/iso-codes.gpg |binary
 utils/kbd/HISTORY             |    3 +++
 utils/kbd/init.d/keymap.sh    |    2 +-
 5 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit f7b2ad7271655ae78f7d7eece72b6355408f6438
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    iso-codes: fix #13311

commit 7b9195212263a6ae195968c36fde406b3e7fb92a
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    kbd: beauty fix the init script

diff --git a/utils/iso-codes/DETAILS b/utils/iso-codes/DETAILS
index be4898e..93d19e3 100755
--- a/utils/iso-codes/DETAILS
+++ b/utils/iso-codes/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SP
    SOURCE_URL[0]=ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${SOURCE}
   SOURCE2_URL[0]=${SOURCE_URL}.sig
   SOURCE2_IGNORE=signature
-      SOURCE_GPG="iso-codes.gpg:${SOURCE}.sig"
+      SOURCE_GPG="iso-codes.gpg:${SOURCE}.sig:UPSTREAM_KEY"
       LICENSE[0]=LGPL
          ENTERED=20050726
         KEYWORDS="iso utils"
diff --git a/utils/iso-codes/HISTORY b/utils/iso-codes/HISTORY
index 76f4d69..980de51 100644
--- a/utils/iso-codes/HISTORY
+++ b/utils/iso-codes/HISTORY
@@ -1,3 +1,7 @@
+2007-01-08 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* iso-codes.gpg: refreshed and added other signing developers listed on
+	  their site #13311
+
 2006-09-30 Robin Cook <rcook at wyrms.net>
 	* DETAILS: added vendor key
 
diff --git a/utils/iso-codes/iso-codes.gpg b/utils/iso-codes/iso-codes.gpg
index 145fab8..ad7c8e4 100644
Binary files a/utils/iso-codes/iso-codes.gpg and b/utils/iso-codes/iso-codes.gpg differ
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index eb8cec5..c836bb2 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,6 @@
+2007-01-08 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* keymap.sh: fixed stop() to not give errors (it worked nonetheless) 
+
 2007-01-06 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* keymap.conf: add example for TTY_NUMS
 
diff --git a/utils/kbd/init.d/keymap.sh b/utils/kbd/init.d/keymap.sh
index 922cce4..874c8ac 100755
--- a/utils/kbd/init.d/keymap.sh
+++ b/utils/kbd/init.d/keymap.sh
@@ -81,7 +81,7 @@ stop()
     echo "Unloading settings for $DEV_TTY$n..."
     [[ "$UNICODE_START" ]] && /bin/echo -ne '\033%@' > /dev/$DEV_TTY$n
     if [[ "$SETFONT_ARGS" ]]; then
-      /usr/bin/setfont -C /dev/$DEV_TTY$n
+      /usr/bin/setfont default8x16 -C /dev/$DEV_TTY$n
       evaluate_retval
     fi
   done



More information about the SM-Commit mailing list