[SM-Commit] GIT changes to master grimoire by George Sherwood (0112edd544b476a7a361e7e5e2fdd811f646f4cb)

George Sherwood scm at mail.sourcemage.org
Sun Jan 28 10:36:30 EST 2007


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 libs/slib/CONFLICTS |    1 +
 libs/slib/DETAILS   |    1 +
 libs/slib/HISTORY   |    5 +++++
 libs/slib/INSTALL   |    2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0112edd544b476a7a361e7e5e2fdd811f646f4cb
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    slib: Modified one of the install directories.  gnucash2 will not find
    slib installed to /usr/share/guile/site.

diff --git a/libs/slib/CONFLICTS b/libs/slib/CONFLICTS
new file mode 100755
index 0000000..357ba32
--- /dev/null
+++ b/libs/slib/CONFLICTS
@@ -0,0 +1 @@
+conflicts  slib  y
diff --git a/libs/slib/DETAILS b/libs/slib/DETAILS
index dd87eda..b134cd4 100755
--- a/libs/slib/DETAILS
+++ b/libs/slib/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[1]=http://www.ibiblio.org/pub/gnu/slib/$SOURCE
         WEB_SITE=http://www-swiss.ai.mit.edu/~jaffer/SLIB.html
          ENTERED=20011105
+      PATCHLEVEL=1
       LICENSE[0]=http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt
         KEYWORDS="libs"
            SHORT="Scheme library"
diff --git a/libs/slib/HISTORY b/libs/slib/HISTORY
index 24b439a..1c2b53c 100644
--- a/libs/slib/HISTORY
+++ b/libs/slib/HISTORY
@@ -1,3 +1,8 @@
+2007-01-28 George Sherwood <george at beernabeer.com>
+	* DETAILS: PATCHLEVEL++
+	* INSTALL: link to /usr/share/guile/slib vice /usr/share/guile/site
+	* CONFLICTS: Install fails if slib is installed
+
 2006-11-01 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 3a4
 	* CONFIGURE: deleted, slib now supports guile-1.8
diff --git a/libs/slib/INSTALL b/libs/slib/INSTALL
index 7533f3c..d39ef88 100755
--- a/libs/slib/INSTALL
+++ b/libs/slib/INSTALL
@@ -1,6 +1,6 @@
 local GUILE SLIB         &&
 #GUILE=${INSTALL_ROOT}/usr/share/guile/`installed_version guile|cut -c-3`/slib  &&
-GUILE=${TRACK_ROOT}/usr/share/guile/site  &&
+GUILE=${TRACK_ROOT}/usr/share/guile/slib  &&
 SLIB=${INSTALL_ROOT}/usr/lib/slib  &&
 mkdir -p $SLIB   &&
 cp * $SLIB       &&



More information about the SM-Commit mailing list