mysqlcc_0.9.4-4.diff

--- mysqlcc-0.9.4.orig/configure
+++ mysqlcc-0.9.4/configure
@@ -2453,9 +2453,9 @@
         for dir in $mysql_lib; do
             if test "x$mysql_found" != "xyes"
             then
-                as_ac_File=`echo "ac_cv_file_"$dir/libmysqlclient.a"" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for \"$dir/libmysqlclient.a\"" >&5
-echo $ECHO_N "checking for \"$dir/libmysqlclient.a\"... $ECHO_C" >&6
+                as_ac_File=`echo "ac_cv_file_"$dir/libmysqlclient.so"" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for \"$dir/libmysqlclient.so\"" >&5
+echo $ECHO_N "checking for \"$dir/libmysqlclient.so\"... $ECHO_C" >&6
 if eval "test \"\${$as_ac_File+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2463,7 +2463,7 @@
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r ""$dir/libmysqlclient.a""; then
+if test -r ""$dir/libmysqlclient.so""; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -2480,7 +2480,7 @@
                 if test "x$mysql_found" = "xyes"
                 then
                     LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB"
-                    MYSQL_LIB="$dir/libmysqlclient.a $LIBZ_LIB"
+                    MYSQL_LIB="$dir/libmysqlclient.so $LIBZ_LIB"
 
                     echo "$as_me:$LINENO: checking for mysql_real_connect in -lmysqlclient" >&5
 echo $ECHO_N "checking for mysql_real_connect in -lmysqlclient... $ECHO_C" >&6
@@ -4065,7 +4065,13 @@
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
-QMAKESPEC=$QTDIR/mkspecs/$host_os
+if test -e "$QTDIR/mkspecs/default"
+then
+  QMAKESPEC="$QTDIR/mkspecs/default"
+else
+  QMAKESPEC=$QTDIR/mkspecs/$host_os
+fi
+
 echo "Creating Makefile with qmake"
 QMAKESPEC=$QMAKESPEC QTDIR=$QTDIR $QTDIR/bin/qmake mysqlcc.pro
 if test ! $? = 0 ; then
--- mysqlcc-0.9.4.orig/debian/mysqlcc-i18n.install
+++ mysqlcc-0.9.4/debian/mysqlcc-i18n.install
@@ -0,0 +1 @@
+translations/*.qm	usr/share/mysqlcc/translations/
--- mysqlcc-0.9.4.orig/debian/control
+++ mysqlcc-0.9.4/debian/control
@@ -0,0 +1,32 @@
+Source: mysqlcc
+Section: misc
+Priority: optional
+Maintainer: Adam Majer <adamm@galacticasoftware.com>
+Build-Depends: debhelper (>> 4), libmysqlclient-dev (>> 4), libqt3-mt-dev, libqt3-compat-headers, txt2man, autotools-dev, qt3-dev-tools
+Standards-Version: 3.6.1
+
+Package: mysqlcc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: The official GUI interface for MySQL
+ MySQL Control Center is a platform-independent GUI 
+ administration client for the MySQL database server.
+ .
+ Features include:
+   * Interactive queries with a syntax-highlighting SQL editor
+   * Database and table management
+   * Server administration
+   * Cross-platform capability
+ .
+ For more information see www.mysql.com/products/mysqlcc/
+
+Package: mysqlcc-i18n
+Architecture: all
+Depends: mysqlcc (= ${Source-Version}), libqt3-i18n
+Description: The official GUI interface for MySQL with non-English support
+ MySQL Control Center is a platform-independent GUI
+ administration client for the MySQL database server.
+ .
+ This package contains support for German, French, Spanish, Russian,
+ Polish, Italian, Simplified Chinese, and Traditional Chinese
+
--- mysqlcc-0.9.4.orig/debian/my_mv
+++ mysqlcc-0.9.4/debian/my_mv
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+mv "$@" || true
--- mysqlcc-0.9.4.orig/debian/mysqlcc.menu
+++ mysqlcc-0.9.4/debian/mysqlcc.menu
@@ -0,0 +1,7 @@
+?package(mysqlcc):needs="x11" \
+	section="Apps/Databases" \
+	icon="/usr/share/pixmaps/mysqlcc.xpm" \
+	title="MySQL CC" \
+	longtitle="MySQL Control Center" \
+	command="/usr/bin/mysqlcc"
+
--- mysqlcc-0.9.4.orig/debian/compat
+++ mysqlcc-0.9.4/debian/compat
@@ -0,0 +1 @@
+4
--- mysqlcc-0.9.4.orig/debian/changelog
+++ mysqlcc-0.9.4/debian/changelog
@@ -0,0 +1,69 @@
+mysqlcc (0.9.4-4) unstable; urgency=high
+
+  * Fix a rather critical NULL deference when new table rows are inserted.
+    This should go into Sarge (closes: #266069)
+
+ -- Adam Majer <adamm@galacticasoftware.com>  Mon, 16 Aug 2004 15:19:21 -0500
+
+mysqlcc (0.9.4-3) unstable; urgency=low
+
+  * Needs a rebuild - libqt was not picked up (my Qt setup broke the package)
+    (closes: #264300)
+
+ -- Adam Majer <adamm@galacticasoftware.com>  Sun,  8 Aug 2004 14:42:47 -0500
+
+mysqlcc (0.9.4-2) unstable; urgency=low
+
+  * Added a debian/watch file
+  * Set the default number of rows to be returned to be Unlimited. This
+    addresses all of the problems that people have when SELECT only returns
+    1000 rows (default upstream limit)
+
+ -- Adam Majer <adamm@galacticasoftware.com>  Thu,  5 Aug 2004 01:24:56 -0500
+
+mysqlcc (0.9.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Adam Majer <adamm@galacticasoftware.com>  Tue,  8 Jun 2004 01:13:23 -0500
+
+mysqlcc (0.9.3-3) unstable; urgency=low
+
+  * Set View|Results Tabs now use Alt+ instread of Ctrl+ as in ver. 0.9.1
+    so that Ctrl+0 may be used to enter NULL values (closes: #215170)
+
+ -- Adam Majer <adamm@galacticasoftware.com>  Fri, 10 Oct 2003 20:37:44 -0500
+
+mysqlcc (0.9.3-2) unstable; urgency=low
+
+  * Fixed a segfault caused by uninitialized textcodec variable.
+    (closes: #211876)
+  * Updated description of mysqlcc-i18n to include Italian and Polish
+  * Updated Standards to 3.6.1
+
+ -- Adam Majer <adamm@galacticasoftware.com>  Sun, 21 Sep 2003 19:17:55 -0500
+
+mysqlcc (0.9.3-1) unstable; urgency=low
+
+  * New upstream release (closes: #197687)
+    - Apply a patch from Tom Achtenberg <TomA@fh.org> to allow unlimited joins.
+    - Default max join size is now unlimited
+    - option added to not connect to any servers at startup (closes: #197672)
+    - keyword entry doesn't cause a lose of focus anymore (closes: #197686)
+  * Rebuilt with Qt 3.2.1 due to some incompatability introduced somewhere
+    b/w libqt 3.1.1-9 and 3.2.1-4 (closes: #210340)
+
+ -- Adam Majer <adamm@galacticasoftware.com>  Sat, 13 Sep 2003 17:22:58 -0500
+
+mysqlcc (0.9.1-2) unstable; urgency=low
+
+  * [debian/rules] Set debian/my_mv +x so it does not fail on build
+
+ -- Adam Majer <adamm@galacticasoftware.com>  Wed, 21 May 2003 09:46:04 -0500
+
+mysqlcc (0.9.1-1) unstable; urgency=low
+
+  * Initial Release (closes: #166022).
+
+ -- Adam Majer <adamm@galacticasoftware.com>  Fri,  2 May 2003 01:06:25 -0500
+
--- mysqlcc-0.9.4.orig/debian/copyright
+++ mysqlcc-0.9.4/debian/copyright
@@ -0,0 +1,12 @@
+MySQL CC was originally debianized by Adam Majer <adamm@galacticasoftware.com> 
+
+Upstream homepage:
+    http://www.mysql.com/products/mysqlcc/index.html
+
+MySQL CC is copyright by Jorge del Conde and the MySQL AB team.
+Upstream authors include Lenz Grimmer <lenz@mysql.com>
+
+MySQL Control Center was released under the terms of GPL ver.2.
+For more details see "/usr/share/common-licenses/GPL" or 
+http://www.gnu.org/licenses/gpl.txt
+
--- mysqlcc-0.9.4.orig/debian/mysqlcc.manpages
+++ mysqlcc-0.9.4/debian/mysqlcc.manpages
@@ -0,0 +1 @@
+debian/mysqlcc.1
--- mysqlcc-0.9.4.orig/debian/mysqlcc.docs
+++ mysqlcc-0.9.4/debian/mysqlcc.docs
@@ -0,0 +1,2 @@
+README.txt
+TODO.txt
--- mysqlcc-0.9.4.orig/debian/mysqlcc.dirs
+++ mysqlcc-0.9.4/debian/mysqlcc.dirs
@@ -0,0 +1,4 @@
+/usr/bin
+/usr/share/doc/mysqlcc
+/usr/share/mysqlcc
+/usr/share/pixmaps
--- mysqlcc-0.9.4.orig/debian/rules
+++ mysqlcc-0.9.4/debian/rules
@@ -0,0 +1,92 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export QTDIR=/usr/share/qt3
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+all: build
+
+config.status: configure
+	dh_testdir
+	chmod +x debian/my_mv
+	debian/my_mv config.guess config.guess.old
+	debian/my_mv config.sub   config.sub.old
+	ln -s /usr/share/misc/config.sub .
+	ln -s /usr/share/misc/config.guess .
+
+	# Add here commands to configure the package.
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt=/usr/share/qt3
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	txt2man -s 1 -t mysqlcc < debian/manpages/mysqlcc.in > debian/mysqlcc.1
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	chmod +x debian/my_mv
+	debian/my_mv -f config.sub.old   config.sub
+	debian/my_mv -f config.guess.old config.guess
+	rm -f build-stamp config.status config.log mysqlcc.pro Makefile install debian/mysqlcc.1 mysqlcc
+	rm -rf tmp moc
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/mysqlcc.
+	# $(MAKE) install prefix=$(CURDIR)/debian/mysqlcc/usr
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_install -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a Changelog.txt
+	dh_installdocs -a
+	dh_install -a
+	dh_installmenu -a
+	dh_installman -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- mysqlcc-0.9.4.orig/debian/mysqlcc.install
+++ mysqlcc-0.9.4/debian/mysqlcc.install
@@ -0,0 +1,5 @@
+mysqlcc			usr/bin
+syntax.txt		usr/share/mysqlcc
+error.wav		usr/share/mysqlcc
+warning.wav		usr/share/mysqlcc
+debian/mysqlcc.xpm	usr/share/pixmaps
--- mysqlcc-0.9.4.orig/debian/mysqlcc-i18n.links
+++ mysqlcc-0.9.4/debian/mysqlcc-i18n.links
@@ -0,0 +1 @@
+/usr/share/doc/mysqlcc	usr/share/doc/mysqlcc-i18n
--- mysqlcc-0.9.4.orig/debian/mysqlcc.xpm
+++ mysqlcc-0.9.4/debian/mysqlcc.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char *mysqlcc[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 16 1",
+"  c black",
+". c #191919",
+"X c gray20",
+"o c #00007F",
+"O c #007F7F",
+"+ c #7F007F",
+"@ c #4C4C4C",
+"# c #666667",
+"$ c gray50",
+"% c blue",
+"& c cyan",
+"* c gray60",
+"= c #B2B2B2",
+"- c gray80",
+"; c gray90",
+": c gray100",
+/* pixels */
+"        ..    .. .              ",
+" :::::::;-;;-;-=$o@oo#$-;:::::: ",
+" ::::::;-====***oOoOXoo$-;::::: ",
+" ::::;;-==*=**%O$#o@oo@O=;::::: ",
+" :;;;;-=&=-=-==**O$O#$**-;::::: ",
+" ::;;-==---;---&=*%#O=;;::::::: ",
+" :;;==-----;-;;-=*%$*=;:::::::: ",
+" :;-==--;-;;----===&%=-:::::::: ",
+" :===--;-==-------=*%$=;::::::: ",
+" ==-=-&-=*$&=-----===O*-::::::: ",
+".-==----=$o#*=&-----=&$=;:::::: ",
+" ;----;;-=#o@*------=**%;:::::: ",
+" ::;;;;:--*oO$--&-;-==O*-:::::: ",
+" :::::::;;=$o$-;;----==*=;::::: ",
+" :::::::::;*$*-;;-----&**;::::: ",
+" :::::::::;;-;;;;;;;--=**-::::: ",
+" ::::::::::;;;::;::;;-=*$-::::: ",
+" :::::::::::;:::::::;;-&*=;:::: ",
+" ::::::::::::::::::::;-*%=;:::: ",
+" :::::::::::::::::::;;-=*-;:::: ",
+" :::::::::::::::::::::;-*=;:::: ",
+" ::::::::::::::::::::::;=-::::: ",
+" ::::::::::::::::::::::;-;::::: ",
+" ::::::::::::::::::::::;;;::::: ",
+" :::::::::::::::::::::::;--;;:: ",
+" ::::::::::::::::::::::;-$*-;:: ",
+" ::::::::::::::::::::::;*+O$-:; ",
+" :::::::::::::::::::::;-OO#$=;; ",
+" :::::::::::::::::::::;=$*=--;; ",
+" :::::::::::::::::::::;-=-;:::: ",
+" :::::::::::::::::::::;-=-;:::: ",
+"                        ..      "
+};
--- mysqlcc-0.9.4.orig/debian/mysqlcc-i18n.dirs
+++ mysqlcc-0.9.4/debian/mysqlcc-i18n.dirs
@@ -0,0 +1 @@
+usr/share/mysqlcc/translations
--- mysqlcc-0.9.4.orig/debian/dirs
+++ mysqlcc-0.9.4/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- mysqlcc-0.9.4.orig/debian/manpages/mysqlcc.in
+++ mysqlcc-0.9.4/debian/manpages/mysqlcc.in
@@ -0,0 +1,151 @@
+NAME
+
+  mysqlcc
+
+USAGE
+
+  mysqlcc [options] [database]
+ 
+DESCRIPTION
+
+  MySQL Control Center (also known as MySQLCC) is a 
+  platform-independent GUI administration client for 
+  the MySQL database server. 
+
+ Features:
+   * Interactive queries with a syntax-highlighting SQL editor
+
+      With MySQLCC, you can construct queries using 
+      a syntax-highlighting text editor, and then view 
+      the results in a configurable table display. 
+      The table view includes support for viewing 
+      images stored in BLOB fields.
+
+   * Database and table management
+
+      MySQLCC makes it easy to create and manage 
+      databases and tables, including views for all of 
+      the table and field attributes such as comments 
+      and key lengths. You can also check, repair, and 
+      optimize tables.
+
+   * Server administration
+
+      You can easily view and change server variables, 
+      as well as view server status information. MySQLCC 
+      also supports multiple servers.
+
+   * Cross-platform
+
+      MySQLCC uses Trolltech's Qt toolkit, which means it 
+      can run on Microsoft Windows and Unix environments, 
+      and we plan on support Mac OS X in future versions.
+
+OPTIONS
+  -C, --compress
+      Use compression in server/client protocol.
+
+  -b, --blocking-queries 
+      Use Blocking Queries.
+  
+  -y, --syntax
+      Enable Syntax Highlighting and Completion.
+
+  -d, --database=name 
+      Database to use.
+
+  -h, --host=name 
+      Connect to host
+
+  -u, --user=name 
+      User for login if not current user.
+
+  -p, --password[=name]
+      Password to use when connecting to server. If password is
+      not given MySQL Control Center will prompt for the
+      password.
+
+  -P, --port=#
+      Port number to use for connection.
+
+  -S, --socket=name 
+      Socket file to use for connection.
+
+  -c, --connection-name=name
+      This is an alias to --server.
+
+  -s, --server=name 
+      MySQL Control Center connection name.
+
+  -q, --query 
+      Open a Query Window on startup.
+
+  -r, --register 
+      Open the Register Server dialog on startup.
+
+  -?, --help 
+      Display this help and exit. (might be more
+      up to date than this man page though)
+
+  -Y, --syntax-file=name
+      Syntax file for completion.
+
+  -H, --history-size=#
+      History Size for the Query Window.
+
+  -T, --translations-path=name
+      Path to the directory where MySQL Control Center
+      translations are located.
+
+  -g, --plugins-path=name
+      Path to the directory where MySQL Control Center plugins
+      are located.
+
+  -V, --version 
+      Print version information and exit.
+
+  --connect_timeout=#
+
+  --select_limit=#
+
+  --net_buffer_length=#
+
+  --max_allowed_packet=#
+
+  --local-infile
+      Enable/disable LOAD DATA LOCAL INFILE.
+
+  --max_join_size=#
+
+
+  The following options may be given as the first argument:
+
+  --print-defaults 
+      Print the program argument list and exit
+
+  --no-defaults
+      Don't read default options from any options file
+
+  --defaults-file=# 
+      Only read default options from the given file #
+
+  --defaults-extra-file=# 
+      Read this file after the global files are read
+
+
+FILES
+
+  Default options are read from the following files in the given order:
+  /etc/mysql/my.cnf, /var/lib/mysql/my.cnf, ~/.my.cnf
+
+ 
+AUTHORS
+
+  Jorge del Conde
+  MySQL AB
+
+NOTES
+
+This manpage has been compiled by Adam Majer <adamm@galacticasoftware.com>
+to satisfy Debian's requirements. If you find any bugs or omissions,
+please send me a note.
--- mysqlcc-0.9.4.orig/debian/watch
+++ mysqlcc-0.9.4/debian/watch
@@ -0,0 +1,6 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# Site		Directory		Pattern			Version	Script
+version=2
+http://mysql.mirrored.ca/Downloads/MySQLCC/mysqlcc-([^-]*).*\.tar\.gz	debian	uupdate
--- mysqlcc-0.9.4.orig/src/CRegisterServerDialog.cpp
+++ mysqlcc-0.9.4/src/CRegisterServerDialog.cpp
@@ -77,7 +77,7 @@
   selectLimit->setMaxValue(0xFFFFFF);
   selectLimit->setMinValue(0);
   selectLimit->setSpecialValueText(tr("Unlimited"));
-  selectLimit->setValue(1000);
+  selectLimit->setValue(0);
   
   CMySQLOptionsTabLayout->addMultiCellWidget(selectLimit, 1, 1, 1, 2);
   
@@ -156,7 +156,7 @@
 void CMySQLOptionsTab::setDefaultValues(CConfig *Settings)
 {
   connectTimeout->setValue(Settings->readNumberEntry("Timeout", 0));
-  selectLimit->setValue(Settings->readNumberEntry("Limit Select Queries Number", 1000));
+  selectLimit->setValue(Settings->readNumberEntry("Limit Select Queries Number", 0));
   netBufferLength->setValue(Settings->readNumberEntry("Net Buffer Length", 16384));
   maxJoinSize->setValue(Settings->readNumberEntry("Max Join Size", 0));
   maxAllowedPacket->setValue(Settings->readNumberEntry("Max Allowed Packet", 16*1024L*1024L));
--- mysqlcc-0.9.4.orig/src/CApplication.cpp
+++ mysqlcc-0.9.4/src/CApplication.cpp
@@ -109,8 +109,8 @@
   mydir += "/";
 #else
   //Directory where mysqlcc.exe (or mysqlcc) is.
-  QString mydir = QDir::currentDirPath() + "/";
-  //QString mydir = "/usr/share/mysqlcc/";  This needs to be done with a PREFIX define ..
+  //QString mydir = QDir::currentDirPath() + "/";
+  QString mydir = "/usr/share/mysqlcc/";  // This needs to be done with a PREFIX define ..
 #endif
 
   //Translations path
@@ -193,7 +193,7 @@
   default_connection_name = cfg->readStringEntry("Default Connection Name", QString::null);
 
   //Style
-  current_style = cfg->readStringEntry("Style", "Windows");
+  current_style = cfg->readStringEntry("Style", "MotifPlus");
   setStyle(current_style);
   setStylePalette(current_style);
   
--- mysqlcc-0.9.4.orig/src/CTableWindow.cpp
+++ mysqlcc-0.9.4/src/CTableWindow.cpp
@@ -1902,6 +1902,9 @@
 
 void CTableWindow::currentChanged(int row, int)
 {
+  if( !fields->item(row,2)) /* currentChanged() is called when new, null row is inserted */
+    return;
+  
   CTableWindowField *f = ((CTableWindowComboItem *)fields->item(row, 2))->Field;
   if (f->Type.isNull())
     f->Type = fields->text(row, 2);