Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a5bf209e02e02e6bf830fd653d189558cd598393)

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 master grimoire by Jaka Kranjc (a5bf209e02e02e6bf830fd653d189558cd598393)
  • Date: Fri, 1 Dec 2006 10:24:08 -0600

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

utils/console-tools/DETAILS | 2 +-
utils/console-tools/HISTORY | 5 +++++
utils/console-tools/INSTALL | 2 +-
utils/console-tools/PRE_BUILD | 4 +++-
4 files changed, 10 insertions(+), 3 deletions(-)

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

console-tools: fix #13264

diff --git a/utils/console-tools/DETAILS b/utils/console-tools/DETAILS
index 2579f06..1cdfd77 100755
--- a/utils/console-tools/DETAILS
+++ b/utils/console-tools/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=ftp://metalab.unc.edu/pub/Linux/system/keyboards/$SOURCE
WEB_SITE=http://lct.sourceforge.net
ENTERED=20010922
- PATCHLEVEL=3
+ PATCHLEVEL=4
KEYWORDS="utils"
SHORT="console-tools allows you to configure and manipulate Linux
consoles."
cat << EOF
diff --git a/utils/console-tools/HISTORY b/utils/console-tools/HISTORY
index f9bcede..dd5ea40 100755
--- a/utils/console-tools/HISTORY
+++ b/utils/console-tools/HISTORY
@@ -1,3 +1,8 @@
+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
+ * DETAILS: ++PATCHLEVEL
+
2006-11-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD: properly install all the manpages #10112 - build some
first
re-enabled the whole doc subdir, agressively disabled some of it
when
diff --git a/utils/console-tools/INSTALL b/utils/console-tools/INSTALL
index c0a9b60..1613602 100755
--- a/utils/console-tools/INSTALL
+++ b/utils/console-tools/INSTALL
@@ -5,6 +5,6 @@ mv $INSTALL_ROOT/usr/bin/loadkeys $INS
# Install man pages.
for (( COUNT=1 ; COUNT < 9 ; COUNT++ )); do
mkdir -p $INSTALL_ROOT/usr/share/man/man$COUNT
- cp doc/man/*.$COUNT* $INSTALL_ROOT/usr/share/man/man$COUNT 2> /dev/null
+ cp doc/man/*.$COUNT $INSTALL_ROOT/usr/share/man/man$COUNT 2> /dev/null
true
done
diff --git a/utils/console-tools/PRE_BUILD b/utils/console-tools/PRE_BUILD
index db580d1..f8474f0 100755
--- a/utils/console-tools/PRE_BUILD
+++ b/utils/console-tools/PRE_BUILD
@@ -1,3 +1,4 @@
+source $GRIMOIRE/is_depends_enabled.function &&
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/double-fclose-fix.patch &&
@@ -5,7 +6,8 @@ patch -p1 < $SCRIPT_DIRECTORY/gcc-3.4
cp $SCRIPT_DIRECTORY/config.sub . &&
if ! is_depends_enabled linuxdoc-tools; then
find -iname "*.sgml" -exec rm {} \; &&
- sed -i -e 's/kbd.FAQ.html//' -e 's/lct.html//' doc/Makefile*
+ sed -i -e 's/kbd.FAQ.html//' -e 's/kbd.FAQ.txt//' \
+ -e 's/lct.html//' -e 's/lct.txt//' doc/Makefile*
fi &&
sedit "s/examples//" Makefile.am &&
sedit "s/examples//" Makefile.in



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a5bf209e02e02e6bf830fd653d189558cd598393), Jaka Kranjc, 12/01/2006

Archive powered by MHonArc 2.6.24.

Top of Page