Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (00d47af177cd0dd84f53eee898f1c0f742a96583)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (00d47af177cd0dd84f53eee898f1c0f742a96583)
  • Date: Wed, 17 Feb 2010 23:31:32 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

database/libiodbc/DETAILS | 1 +
database/libiodbc/HISTORY | 5 +++++
database/libiodbc/INSTALL | 3 +++
database/unixodbc/CONFLICTS | 2 +-
database/unixodbc/HISTORY | 3 +++
5 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 00d47af177cd0dd84f53eee898f1c0f742a96583
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

unixodbc: No longer auto-conflict with libiodbc (only normal conflict)

commit b6950975cf762be51373dd1579acd34eb44ef8ec
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libiodbc: Symlink libodbc.so to libodbcinst.so to provide ODBC-MGR
(at least as far as jdk6-bin is concerned)
PATCHLEVEL++

diff --git a/database/libiodbc/DETAILS b/database/libiodbc/DETAILS
index b175b84..95fd630 100755
--- a/database/libiodbc/DETAILS
+++ b/database/libiodbc/DETAILS
@@ -4,6 +4,7 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[1]=$SOURCEFORGE_URL/iodbc/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ PATCHLEVEL=1
WEB_SITE=http://www.iodbc.org/
LICENSE[0]=BSD
LICENSE[1]=LGPL
diff --git a/database/libiodbc/HISTORY b/database/libiodbc/HISTORY
index 41ada36..0d004ec 100644
--- a/database/libiodbc/HISTORY
+++ b/database/libiodbc/HISTORY
@@ -1,3 +1,8 @@
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * INSTALL: Symlink libodbc.so to libodbcinst.so to fully
+ (at least as far as jdk6-bin is concerned) ODBC
+
2009-09-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.52.7
* BUILD: remove make_single
diff --git a/database/libiodbc/INSTALL b/database/libiodbc/INSTALL
new file mode 100755
index 0000000..ca67d21
--- /dev/null
+++ b/database/libiodbc/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+ln -sf $TRACK_ROOT/usr/lib/libodbc.so \
+ $INSTALL_ROOT/usr/lib/libodbcinst.so
diff --git a/database/unixodbc/CONFLICTS b/database/unixodbc/CONFLICTS
index e0e5615..0cab808 100755
--- a/database/unixodbc/CONFLICTS
+++ b/database/unixodbc/CONFLICTS
@@ -1 +1 @@
-conflicts libiodbc y
+conflicts libiodbc
diff --git a/database/unixodbc/HISTORY b/database/unixodbc/HISTORY
index f57aae0..537a918 100644
--- a/database/unixodbc/HISTORY
+++ b/database/unixodbc/HISTORY
@@ -1,3 +1,6 @@
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: No longer auto-conflict with libiodbc (only normal
conflict)
+
2009-01-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: version 2.2.14
* INSTALL: Add missing &&



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (00d47af177cd0dd84f53eee898f1c0f742a96583), Eric Sandall, 02/18/2010

Archive powered by MHonArc 2.6.24.

Top of Page