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 d70f4cd9ef564adcf5be0800404b253bcafd5765..ada6244622483c74ad58a28d8098aaaa3f56b43e 100644 (file)
--- 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 8340bd87ba7b16de46990f71a5ed01a94a25e2bc..15bb557387f636f00143dd466f866cde5fb5ae87 100644 (file)
--- 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 22178760e981882c3ff3511672e912980f70891b..cd5aae3ed10e7f7495faf22e2afcc0e34f6bbf44 100644 (file)
--- 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 8f114dc8be193d30ab67ab9e4c37a378ccd8020e..8726fcae339eca6c845f5f805531991eca2ef8e2 100644 (file)
--- a/sope-gdl1/MySQL/Version
+++ b/sope-gdl1/MySQL/Version
@@ -1,3 +1,3 @@
 # Version file
 
-SUBMINOR_VERSION:=6
+SUBMINOR_VERSION:=7