Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jaka Kranjc (0bfbb4baa136828b92e854e50a0a0048f27785c4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jaka Kranjc (0bfbb4baa136828b92e854e50a0a0048f27785c4)
  • Date: Tue, 9 Jan 2007 11:44:54 -0600

GIT changes to stable-rc-0.6 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

smgl/init.d/CONFIGURE | 6 +++++-
smgl/init.d/HISTORY | 4 ++++
utils/console-tools/HISTORY | 3 +++
utils/console-tools/init.d/keymap.sh | 4 ++--
utils/iso-codes/DETAILS | 2 +-
utils/iso-codes/HISTORY | 4 ++++
utils/iso-codes/iso-codes.gpg |binary
7 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 0bfbb4baa136828b92e854e50a0a0048f27785c4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

iso-codes: fix #13311

commit 70f95e6a207ae9262b17b841015bd2a5999e1e0b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

console-tools: fix old #9250

Conflicts:

utils/console-tools/HISTORY

commit a4042802297fa08f207314947eb2637ac4d8ff58
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

fix #9772 for good

Conflicts:

smgl/init.d/CONFIGURE
smgl/init.d/HISTORY

diff --git a/smgl/init.d/CONFIGURE b/smgl/init.d/CONFIGURE
index 8e0facd..ba5b6e7 100755
--- a/smgl/init.d/CONFIGURE
+++ b/smgl/init.d/CONFIGURE
@@ -16,7 +16,11 @@ if grep -q devfs /proc/filesystems &&
message "\n${MESSAGE_COLOR}NOTICE: Switching from devfs to udev or static
currently needs manual editing of /etc/fstab.${DEFAULT_COLOR}\n"
fi &&

-config_query_list DEVICES "Choose /dev management mode:" $DEVICES_LIST &&
+# default to the previously selected option #9772 - only a problem on the
very
+# second cast. Adding it to the start of the list makes it the default in
+# the next query.
+. /etc/sysconfig/devices &&
+config_query_list DEVICES "Choose /dev management mode:" $DEVICES
${DEVICES_LIST/$DEVICES/}
if [[ "$DEVICES" != "devfs" ]]
then
config_query CREATE_DEV_TREE "check for/create static /dev tree" y
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index ca6c706..c233143 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,7 @@
+2007-01-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: fix #9772, restore the DEVICE settings for the second
cast
+ added missing &&
+
2006-10-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* init.d/devices: fix #7311, proc not showing in /etc/mtab
* DETAILS: PATCHLEVEL++
diff --git a/utils/console-tools/HISTORY b/utils/console-tools/HISTORY
index dd5ea40..830b92a 100755
--- a/utils/console-tools/HISTORY
+++ b/utils/console-tools/HISTORY
@@ -1,3 +1,6 @@
+2007-01-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * keymap.sh: added -v to consolechars calls #9250
+
2006-12-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD: source is_depends_enabled and fix #13264
* INSTALL: don't install the 4 man templates
diff --git a/utils/console-tools/init.d/keymap.sh
b/utils/console-tools/init.d/keymap.sh
index b45fe94..1b1babc 100755
--- a/utils/console-tools/init.d/keymap.sh
+++ b/utils/console-tools/init.d/keymap.sh
@@ -48,7 +48,7 @@ start()
for n in $TTY_NUMS; do
echo "Loading settings for $DEV_TTY$n..."
if [[ "$CONSOLECHARS_ARGS" ]]; then
- /usr/bin/consolechars $CONSOLECHARS_ARGS --tty=/dev/$DEV_TTY$n
+ /usr/bin/consolechars -v $CONSOLECHARS_ARGS --tty=/dev/$DEV_TTY$n
evaluate_retval
fi
[[ "$UNICODE_START" ]] && /bin/echo -ne "\033%G" > /dev/$DEV_TTY$n
@@ -80,7 +80,7 @@ stop()
echo "Unloading settings for $DEV_TTY$n..."
[[ "$UNICODE_START" ]] && /bin/echo -ne '\033%@' > /dev/$DEV_TTY$n
if [[ "$CONSOLECHARS_ARGS" ]]; then
- /usr/bin/consolechars -d --tty=/dev/$DEV_TTY$n
+ /usr/bin/consolechars -v -d --tty=/dev/$DEV_TTY$n
evaluate_retval
fi
done
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




Archive powered by MHonArc 2.6.24.

Top of Page