From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Wed, 20 Apr 2005 21:22:02 +0000 (+0000)
Subject: renamed MySQL4 to MySQL
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c907db4d5fd77436159edd54d4b556dd3a8a4fa;p=sope

renamed MySQL4 to MySQL


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@744 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-gdl1/MySQL/ChangeLog b/sope-gdl1/MySQL/ChangeLog
index d70f4cd9..ada62446 100644
--- a/sope-gdl1/MySQL/ChangeLog
+++ b/sope-gdl1/MySQL/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-20  Helge Hess  <helge.hess@opengroupware.org>
+
+	* renamed MySQL4 adaptor to MySQL to avoid confusion (v4.5.7)
+
 2005-04-19  Helge Hess  <helge.hess@skyrix.com>
 
 	* v4.5.6
diff --git a/sope-gdl1/MySQL/GNUmakefile b/sope-gdl1/MySQL/GNUmakefile
index 8340bd87..15bb5573 100644
--- a/sope-gdl1/MySQL/GNUmakefile
+++ b/sope-gdl1/MySQL/GNUmakefile
@@ -27,9 +27,9 @@ include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 include ./Version
 
-BUNDLE_NAME = MySQL4
+BUNDLE_NAME = MySQL
 
-MySQL4_OBJC_FILES = \
+MySQL_OBJC_FILES = \
 	MySQL4Expression.m		\
 	MySQL4Adaptor.m			\
 	MySQL4Context.m			\
@@ -44,15 +44,15 @@ MySQL4_OBJC_FILES = \
 	NSCalendarDate+MySQL4Val.m	\
 	NSNumber+MySQL4Val.m		\
 
-MySQL4_PRINCIPAL_CLASS = MySQL4Adaptor
+MySQL_PRINCIPAL_CLASS = MySQL4Adaptor
 
-BUNDLE_INSTALL     = MySQL4
+BUNDLE_INSTALL     = MySQL
 BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
 # Use .gdladaptor as the bundle extension
 BUNDLE_EXTENSION = .gdladaptor
 
-MySQL4_RESOURCE_FILES += Version
+MySQL_RESOURCE_FILES += Version
 
 # tool
 
diff --git a/sope-gdl1/MySQL/GNUmakefile.preamble b/sope-gdl1/MySQL/GNUmakefile.preamble
index 22178760..cd5aae3e 100644
--- a/sope-gdl1/MySQL/GNUmakefile.preamble
+++ b/sope-gdl1/MySQL/GNUmakefile.preamble
@@ -22,12 +22,12 @@
 # If not, write to the Free Software Foundation,
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-MySQL4_BUNDLE_LIBS += \
+MySQL_BUNDLE_LIBS += \
 	-lGDLAccess	\
 	-lEOControl	\
 	`mysql_config --libs`
 
-MySQL4D_BUNDLE_LIBS += \
+MySQLD_BUNDLE_LIBS += \
 	-lGDLAccess	\
 	-lEOControl	\
 	`mysql_config --libs`
diff --git a/sope-gdl1/MySQL/Version b/sope-gdl1/MySQL/Version
index 8f114dc8..8726fcae 100644
--- a/sope-gdl1/MySQL/Version
+++ b/sope-gdl1/MySQL/Version
@@ -1,3 +1,3 @@
 # Version file
 
-SUBMINOR_VERSION:=6
+SUBMINOR_VERSION:=7