From 0b5cdd48b0e960f5da011922a5845a03808141e5 Mon Sep 17 00:00:00 2001
From: adustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8>
Date: Sun, 28 Apr 2002 19:55:08 +0000
Subject: [PATCH] packaging changes, pre-emptive version bump

---
 MySQLdb/CHANGELOG | 29 +++++++++++++++++++++++++++++
 MySQLdb/_mysql.c  |  2 +-
 MySQLdb/setup.py  |  7 +++++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/MySQLdb/CHANGELOG b/MySQLdb/CHANGELOG
index c4c9ddf..547381b 100644
--- a/MySQLdb/CHANGELOG
+++ b/MySQLdb/CHANGELOG
@@ -1,3 +1,32 @@
+0.9.2c1
+
+  * Use name of the python interpreter as part of the package name.
+    On Red Hat Linux (7.2 and earlier), the standard python package
+    is 1.5.2. The www.python.org RPM package for Python-2.2.1 is
+    python2, and their 2.1.3 package is python2.1. This is so you can
+    install all three at once; RPM considers them different packages.
+    With this packaging change, you'll now get:
+
+    python setup.py bdist_rpm # MySQL-python for python-1.5.2
+    python2.1 setup.py bdist_rpm # MySQL-python2.1 for python 2.1.x
+    python2 setup.py bdist_rpm # MySQL-python2 for python 2.2.x
+
+    Once Python 2.3 comes out, that will probably become the python2
+    package, and the Python 2.2.x version will become the python2.2
+    package, or at least that's what the progression seems to be.
+
+    Note that in the current Red Hat beta (skipjack), the python
+    package is still 1.5.2 and python2 is 2.2. Skipjack already
+    comes with MySQL-python-0.9.1, but I don't know what version of
+    Python it's compiled against. Who knows if Red Hat will follow
+    python.org's naming convention, but in any case, this change
+    shouldn't hurt anything.
+
+  * Plug: I will be at OScon2002 giving a tutorial session on the
+    Python DB-API, mostly using MySQLdb.
+
+        http://conferences.oreillynet.com/os2002/
+
 0.9.2b2
 
   * Avoid memory leak when using dictionary-based cursors
diff --git a/MySQLdb/_mysql.c b/MySQLdb/_mysql.c
index 0e8f043..06b5bcc 100644
--- a/MySQLdb/_mysql.c
+++ b/MySQLdb/_mysql.c
@@ -1,4 +1,4 @@
-#define version_info "(0,9,2,'beta',2)"
+#define version_info "(0,9,2,'gamma',1)"
 #define __version__ "0.9.2"
 /*
 This program is free software; you can redistribute it and/or modify
diff --git a/MySQLdb/setup.py b/MySQLdb/setup.py
index 2c741a5..fac9ca6 100644
--- a/MySQLdb/setup.py
+++ b/MySQLdb/setup.py
@@ -17,6 +17,9 @@ thread_safe_library = YES
 # do, please mail me the configuration for your platform. Don't
 # forget to include the value of sys.platform and os.name.
 
+name = "MySQL-%s" % os.path.basename(sys.executable)
+version = "0.9.2c1"
+
 mysqlclient = thread_safe_library and "mysqlclient_r" or "mysqlclient"
 
 # include files and library locations should cover most platforms
@@ -91,8 +94,8 @@ MySQLdb. MySQLdb is free software.
 """
 
 setup (# Distribution meta-data
-        name = "MySQL-python",
-        version = "0.9.2b2",
+        name = name,
+        version = version,
         description = "An interface to MySQL",
         long_description=long_description,
         author = "Andy Dustman",