Skip to Content.
Sympa Menu

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

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 (a5686655c7f2e778e387f5076a2ed52ac9f26c4a)
  • Date: Wed, 8 Nov 2006 14:39:44 -0600

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

utils/console-tools/DEPENDS | 4 +++-
utils/console-tools/DETAILS | 2 +-
utils/console-tools/HISTORY | 7 +++++++
utils/console-tools/PRE_BUILD | 6 ++++--
4 files changed, 15 insertions(+), 4 deletions(-)

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

console-tools: properly fix #10112

diff --git a/utils/console-tools/DEPENDS b/utils/console-tools/DEPENDS
index 411feae..01eb603 100755
--- a/utils/console-tools/DEPENDS
+++ b/utils/console-tools/DEPENDS
@@ -6,4 +6,6 @@ depends smgl-fhs &&

# to fix bug #12830, to be removed eventually (during stable-rc 0.7
# should be sufficient)
-depends init.d
+depends init.d &&
+
+optional_depends linuxdoc-tools "" "" "for some SGML and HTML documentation"
diff --git a/utils/console-tools/DETAILS b/utils/console-tools/DETAILS
index d5332e0..2579f06 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=2
+ PATCHLEVEL=3
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 6d9ee57..f9bcede 100755
--- a/utils/console-tools/HISTORY
+++ b/utils/console-tools/HISTORY
@@ -1,3 +1,10 @@
+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
+ there is no linuxdoc-tools
+ * DEPENDS: added optional on linuxdoc-tools
+ * DETAILS: ++PATCHLEVEL
+
2006-11-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: install all the manpages #10112
* DETAILS: ++PATCHLEVEL
diff --git a/utils/console-tools/PRE_BUILD b/utils/console-tools/PRE_BUILD
index 178cd63..db580d1 100755
--- a/utils/console-tools/PRE_BUILD
+++ b/utils/console-tools/PRE_BUILD
@@ -3,7 +3,9 @@ cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/double-fclose-fix.patch &&
patch -p1 < $SCRIPT_DIRECTORY/gcc-3.4.patch &&
cp $SCRIPT_DIRECTORY/config.sub . &&
-sedit "s/doc//" Makefile.am &&
-sedit "s/doc//" Makefile.in &&
+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*
+fi &&
sedit "s/examples//" Makefile.am &&
sedit "s/examples//" Makefile.in



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a5686655c7f2e778e387f5076a2ed52ac9f26c4a), Jaka Kranjc, 11/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page