Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (d2a159a0235cafc0a6aefff85706268ea6111617)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (d2a159a0235cafc0a6aefff85706268ea6111617)
  • Date: Tue, 11 Jul 2006 13:32:37 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

utils/console-tools/DEPENDS | 5 ++++-
utils/console-tools/HISTORY | 4 ++++
utils/kbd/DEPENDS | 3 +++
utils/kbd/HISTORY | 4 ++++
4 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit d2a159a0235cafc0a6aefff85706268ea6111617
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

Fix bug #12830 by adding init.d dependency to console-tools & kbd. This
forces console-tools/kbd to be cast after init.d if both are in the
queue, so that /etc/sysconfig/keymap isn't deleted when it is moved from
init.d to console-tools/kbd spell (fix for bug 12499).

diff --git a/utils/console-tools/DEPENDS b/utils/console-tools/DEPENDS
index 0657016..3ae95c7 100755
--- a/utils/console-tools/DEPENDS
+++ b/utils/console-tools/DEPENDS
@@ -2,4 +2,7 @@ depends console-data &&
depends flex &&
depends gnupg &&
depends perl &&
-depends smgl-fhs
+depends smgl-fhs &&
+
+# to fix bug #12830, should be removed eventually
+depends init.d
diff --git a/utils/console-tools/HISTORY b/utils/console-tools/HISTORY
index 446667c..dd4a2f3 100755
--- a/utils/console-tools/HISTORY
+++ b/utils/console-tools/HISTORY
@@ -1,3 +1,7 @@
+2006-07-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Added depends init.d, fixes bug #12830. Should be
+ removed eventually.
+
2006-07-06 Juuso Alasuutari <iuso AT sourcemage.org>
* init.d/keymap.sh, init.d/keymap.conf: Added, moved from init.d
spell.
diff --git a/utils/kbd/DEPENDS b/utils/kbd/DEPENDS
index 369a8b3..66cbc0d 100755
--- a/utils/kbd/DEPENDS
+++ b/utils/kbd/DEPENDS
@@ -1,6 +1,9 @@
depends gnupg &&
depends smgl-fhs &&

+# to fix bug #12830, should be removed eventually
+depends init.d &&
+
optional_depends gettext \
"--with-nls" \
"--without-nls" \
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index 18549a6..c05f55e 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,7 @@
+2006-07-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Added depends init.d, fixes bug #12830. Should be
+ removed eventually.
+
2006-07-06 Juuso Alasuutari <iuso AT sourcemage.org>
* init.d/keymap.sh, init.d/keymap.conf: Added, moved from init.d
spell.




Archive powered by MHonArc 2.6.24.

Top of Page