Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.4 grimoire by Eric Sandall (29b06057ffc5885d9261c144e693b2bc3da91e43)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.4 grimoire by Eric Sandall (29b06057ffc5885d9261c144e693b2bc3da91e43)
  • Date: Wed, 6 Dec 2006 15:58:07 -0600

GIT changes to stable-0.4 grimoire by Eric Sandall <sandalle@moby.(none)>:

http/middleman/DEPENDS | 20 ++++++++++++++++----
http/middleman/HISTORY | 3 +++
utils/console-tools/DETAILS | 5 ++---
utils/console-tools/HISTORY | 5 +++++
utils/console-tools/INSTALL | 2 +-
utils/console-tools/PRE_BUILD | 4 +++-
utils/fcron/DEPENDS | 14 +++++++++++---
utils/fcron/HISTORY | 15 ++++++++++++++-
8 files changed, 55 insertions(+), 13 deletions(-)

New commits:
commit 29b06057ffc5885d9261c144e693b2bc3da91e43
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

fcron: depends which (bug #13294)

Conflicts:

utils/fcron/HISTORY

commit c41d813dd831ba0b6d01018971e0f5793ba41bc6
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

middleman: Added depends g++ (bug #13272)

commit b668305b71ac91df0746d398f83f29be4a6dd3b4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

console-tools: fix #13264

Conflicts:

utils/console-tools/DETAILS

diff --git a/http/middleman/DEPENDS b/http/middleman/DEPENDS
index 7e08af8..cbbe089 100755
--- a/http/middleman/DEPENDS
+++ b/http/middleman/DEPENDS
@@ -1,5 +1,17 @@
-depends pcre &&
+depends g++ &&
+depends pcre &&

-optional_depends zlib '--enable-zlib' '--disable-zlib' 'for GZip and
Deflate encoding' &&
-optional_depends openssl '--enable-ssl' '--disable-ssl' 'for SSL
support' &&
-optional_depends linux-pam '--enable-pam' '--disable-pam' 'for PAM support'
\ No newline at end of file
+optional_depends zlib \
+ '--enable-zlib' \
+ '--disable-zlib' \
+ 'for GZip and Deflate encoding' &&
+
+optional_depends openssl \
+ '--enable-ssl' \
+ '--disable-ssl' \
+ 'for SSL support' &&
+
+optional_depends linux-pam \
+ '--enable-pam' \
+ '--disable-pam' \
+ 'for PAM support'
diff --git a/http/middleman/HISTORY b/http/middleman/HISTORY
index 0e46b8e..ccbd009 100644
--- a/http/middleman/HISTORY
+++ b/http/middleman/HISTORY
@@ -1,3 +1,6 @@
+2006-12-01 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Added depends g++ (bug #13272), reformatted code.
+
2006-11-27 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: Made file executable (fixes bug #12515).

diff --git a/utils/console-tools/DETAILS b/utils/console-tools/DETAILS
index a2c8c53..1cdfd77 100755
--- a/utils/console-tools/DETAILS
+++ b/utils/console-tools/DETAILS
@@ -6,9 +6,8 @@ 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
- UPDATED=20031124
- BUILD_API=2
- PATCHLEVEL=1
+ PATCHLEVEL=4
+ KEYWORDS="utils"
SHORT="console-tools allows you to configure and manipulate Linux
consoles."
cat << EOF
The console-tools package allows you to set-up and manipulate the Linux
diff --git a/utils/console-tools/HISTORY b/utils/console-tools/HISTORY
index a1d7986..972a4a3 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
diff --git a/utils/fcron/DEPENDS b/utils/fcron/DEPENDS
index 5241a92..b4907ce 100755
--- a/utils/fcron/DEPENDS
+++ b/utils/fcron/DEPENDS
@@ -1,4 +1,12 @@
-depends perl &&
-optional_depends "openjade" "" "" "to build documentation" &&
-optional_depends "MAIL-TRANSPORT-AGENT" "" "--without-sendmail" "for the
e-mailing of reports"
+depends perl &&
+depends which &&

+optional_depends openjade \
+ "" \
+ "" \
+ "to build documentation" &&
+
+optional_depends MAIL-TRANSPORT-AGENT \
+ "" \
+ "--without-sendmail" \
+ "for the e-mailing of reports"
diff --git a/utils/fcron/HISTORY b/utils/fcron/HISTORY
index 1b2385a..eb98981 100644
--- a/utils/fcron/HISTORY
+++ b/utils/fcron/HISTORY
@@ -1,4 +1,17 @@
-2006-02-07 Andrew "ruskie" Levstik <ruskie AT mages.ath.cx>
+2006-12-05 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Added depends which (bug #13294), better code
+ formatting.
+
+2006-09-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * INSTALL: fix permission for fcron.conf
+
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-02-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated to 3.0.1, SECURITY_PATCH, switched to VERIFIED
upstream key
* Thibault_Godouet.gpg: added, verified through:



  • [SM-Commit] GIT changes to stable-0.4 grimoire by Eric Sandall (29b06057ffc5885d9261c144e693b2bc3da91e43), Eric Sandall, 12/06/2006

Archive powered by MHonArc 2.6.24.

Top of Page