--- mysql-query-browser-1.1.17.orig/mysql-query-browser/MySQLQueryBrowser.desktop.in +++ mysql-query-browser-1.1.17/mysql-query-browser/MySQLQueryBrowser.desktop.in @@ -1,7 +1,8 @@ -[Desktop Entry] -Name=MySQL Query Browser -Comment=MySQL Query Tool -Exec=#bindir#/mysql-query-browser -Terminal=false -Type=Application -Icon=#mydatadir#/MySQLIcon_QueryBrowser_48x48.png +[Desktop Entry] +Name=MySQL Query Browser +Comment=MySQL Query Tool +Exec=#bindir#/mysql-query-browser +Terminal=false +Type=Application +Icon=mysql_query_browser +Categories=GNOME;Application;Database;Development; --- mysql-query-browser-1.1.17.orig/mysql-query-browser/source/linux/main.cc +++ mysql-query-browser-1.1.17/mysql-query-browser/source/linux/main.cc @@ -253,12 +253,6 @@ if (!parse_cmd_line_args(argc, argv)) return 1; - if (!getenv(PATH_ENV)) - { - g_print(_("You must start this program using mysql-query-browser.\n")); - exit(0); - } - // add search paths for images { std::string prefix= get_prefix()+DATADIRNAME"/mysql-gui"; @@ -355,10 +349,7 @@ std::string get_prefix() { - if (getenv(PATH_ENV)) - return std::string(getenv(PATH_ENV))+"/"; - else - return PREFIX"/"; + return "/usr/"; } --- mysql-query-browser-1.1.17.orig/mysql-query-browser/source/linux/MQBookmarkBrowser.cc +++ mysql-query-browser-1.1.17/mysql-query-browser/source/linux/MQBookmarkBrowser.cc @@ -257,7 +257,8 @@ { for (unsigned int i=0; i < _menu.items().size(); i++) _menu.items()[i].set_sensitive(false); - _menu.items()[3].set_sensitive(true); // New Folder + if( _menu.items().size() > 3 ) + _menu.items()[3].set_sensitive(true); // New Folder } } --- mysql-query-browser-1.1.17.orig/mysql-query-browser/source/linux/MQResultSetView.cc +++ mysql-query-browser-1.1.17/mysql-query-browser/source/linux/MQResultSetView.cc @@ -1851,7 +1851,7 @@ editor->get_data(buffer, size); path= (char*)((Glib::Object*)editor)->get_data("path"); - column= (int)((Glib::Object*)editor)->get_data("column"); + column= (int)(long)((Glib::Object*)editor)->get_data("column"); Gtk::TreeIter iter= _model->get_iter(Gtk::TreePath(path)); _model->set_value(iter, column*2, buffer, size); @@ -1879,7 +1879,7 @@ void MQResultSetView::blob_edit(CellRendererBlob *cell, Gtk::Widget *widget, const Glib::ustring &path, int column) { gpointer fdata; - gsize fsize; + guint fsize; Gtk::TreeIter iter= _model->get_iter(Gtk::TreePath(path)); if (_model->get_value(iter, column*2, fdata, fsize)) @@ -1905,7 +1905,7 @@ void MQResultSetView::blob_save(CellRendererBlob *cell, Gtk::Widget *widget, const Glib::ustring &path, int column) { gpointer fdata; - gsize fsize; + guint fsize; Gtk::TreeIter iter= _model->get_iter(Gtk::TreePath(path)); if (_model->get_value(iter, column*2, fdata, fsize)) @@ -1979,7 +1979,7 @@ void MQResultSetView::blob_view(CellRendererBlob *cell, Gtk::Widget *widget, const Glib::ustring &path, int column) { gpointer fdata; - gsize fsize; + guint fsize; Gtk::TreeIter iter= _model->get_iter(Gtk::TreePath(path)); if (_model->get_value(iter, column*2, fdata, fsize)) --- mysql-query-browser-1.1.17.orig/mysql-query-browser/source/linux/Makefile.in +++ mysql-query-browser-1.1.17/mysql-query-browser/source/linux/Makefile.in @@ -570,7 +570,7 @@ # If a solution is found, this could be removed. # $(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a: - (cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make) + (cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests --enable-compile-warnings=yes; make) clean-generic: -make -C gtksourceview distclean --- mysql-query-browser-1.1.17.orig/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.in +++ mysql-query-browser-1.1.17/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.in @@ -64,7 +64,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ -DEPDIR = @DEPDIR@ +DEPDIR = @DEPDIR@ DEP_CFLAGS = @DEP_CFLAGS@ DEP_LIBS = @DEP_LIBS@ ECHO = @ECHO@ @@ -247,8 +247,8 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/test-widget.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testregion.Po +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/test-widget.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/testregion.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -289,14 +289,14 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-widget.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testregion.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-widget.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testregion.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @@ -304,7 +304,7 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --- mysql-query-browser-1.1.17.orig/mysql-query-browser/source/linux/gtksourceview/config.guess +++ mysql-query-browser-1.1.17/mysql-query-browser/source/linux/gtksourceview/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2005-09-19' +timestamp='2002-02-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- mysql-query-browser-1.1.17.orig/mysql-query-browser/source/linux/gtksourceview/config.sub +++ mysql-query-browser-1.1.17/mysql-query-browser/source/linux/gtksourceview/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2005-09-19' +timestamp='2003-02-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- mysql-query-browser-1.1.17.orig/mysql-query-browser/source/linux/gtksourceview/Makefile.in +++ mysql-query-browser-1.1.17/mysql-query-browser/source/linux/gtksourceview/Makefile.in @@ -197,7 +197,7 @@ @BUILD_TESTS_FALSE@MAYBE_TESTS = @BUILD_TESTS_TRUE@MAYBE_TESTS = tests -SUBDIRS = gtksourceview $(MAYBE_TESTS) docs +SUBDIRS = gtksourceview pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gtksourceview-1.0.pc @@ -238,7 +238,7 @@ aclocal.m4 config.guess config.h.in config.sub configure \ configure.in depcomp gtksourceview-1.0.pc.in install-sh \ ltmain.sh missing mkinstalldirs -DIST_SUBDIRS = gtksourceview po tests docs +DIST_SUBDIRS = gtksourceview all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive --- mysql-query-browser-1.1.17.orig/mysql-query-browser/source/linux/MGResultSetModel.cc +++ mysql-query-browser-1.1.17/mysql-query-browser/source/linux/MGResultSetModel.cc @@ -384,7 +384,7 @@ { bool tmp= _disable_checks; gpointer data= NULL; - gsize size= 0; + guint size= 0; bool is_blob; switch (_resultset->columns[column/2].column_type) { --- mysql-query-browser-1.1.17.orig/mysql-gui-common/res/po/de.po +++ mysql-query-browser-1.1.17/mysql-gui-common/res/po/de.po @@ -384,7 +384,7 @@ # ConnectToInstanceForm..BottomPnl..ClearFieldsBtn..Caption #: ConnectToInstance.dfm:481 msgid "Clear" -msgstr "Zurücksetzten" +msgstr "Zurücksezen" #. ConnectToInstanceForm..BottomPnl..CancelBtn..Hint #: ConnectToInstance.dfm:468 --- mysql-query-browser-1.1.17.orig/mysql-gui-common/source/linux/canvas/Makefile +++ mysql-query-browser-1.1.17/mysql-gui-common/source/linux/canvas/Makefile @@ -36,8 +36,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu +build_triplet = i486-pc-linux-gnu +host_triplet = i486-pc-linux-gnu subdir = source/linux/canvas DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -76,14 +76,14 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/vkolesnikov/bldtmp/checkouts/mysql-query-browser-1.1.17/mysql-gui-common/missing --run aclocal-1.9 -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/vkolesnikov/bldtmp/checkouts/mysql-query-browser-1.1.17/mysql-gui-common/missing --run tar -AUTOCONF = ${SHELL} /home/vkolesnikov/bldtmp/checkouts/mysql-query-browser-1.1.17/mysql-gui-common/missing --run autoconf -AUTOHEADER = ${SHELL} /home/vkolesnikov/bldtmp/checkouts/mysql-query-browser-1.1.17/mysql-gui-common/missing --run autoheader -AUTOMAKE = ${SHELL} /home/vkolesnikov/bldtmp/checkouts/mysql-query-browser-1.1.17/mysql-gui-common/missing --run automake-1.9 -AWK = gawk +ACLOCAL = ${SHELL} /tmp/mysql-query-browser-1.1.17/mysql-gui-common/missing --run aclocal-1.9 +AMDEP_FALSE = +AMDEP_TRUE = # +AMTAR = ${SHELL} /tmp/mysql-query-browser-1.1.17/mysql-gui-common/missing --run tar +AUTOCONF = ${SHELL} /tmp/mysql-query-browser-1.1.17/mysql-gui-common/missing --run autoconf +AUTOHEADER = ${SHELL} /tmp/mysql-query-browser-1.1.17/mysql-gui-common/missing --run autoheader +AUTOMAKE = ${SHELL} /tmp/mysql-query-browser-1.1.17/mysql-gui-common/missing --run automake-1.9 +AWK = mawk BUILD_GC_FALSE = BUILD_GC_TRUE = # BUILD_GRT_FALSE = @@ -92,13 +92,13 @@ BUILD_GTK_TRUE = BUILD_NEWT_FALSE = BUILD_NEWT_TRUE = # -CC = gcc -CCDEPMODE = depmode=gcc3 +CC = i486-linux-gnu-gcc +CCDEPMODE = depmode=none CFLAGS = -g -O2 CPP = CPPFLAGS = -CXX = g++ -CXXDEPMODE = depmode=gcc3 +CXX = i486-linux-gnu-g++ +CXXDEPMODE = depmode=none CXXFLAGS = -g -O2 CYGPATH_W = echo DATADIRNAME = share @@ -114,14 +114,14 @@ EXEEXT = GCDEPS_CFLAGS = GCDEPS_LIBS = -GLIB_CFLAGS = -I/usr/include/libxml2 -I/opt/gnome/include/glib-2.0 -I/opt/gnome/lib/glib-2.0/include -GLIB_LIBS = -L/opt/gnome/lib -lglib-2.0 -lxml2 -lpthread -lz -lm -GNOME_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -I/usr/local/include/gtkmm-2.4 -I/usr/local/lib/gtkmm-2.4/include -I/usr/local/include/glibmm-2.4 -I/usr/local/lib/glibmm-2.4/include -I/usr/local/include/gdkmm-2.4 -I/usr/local/lib/gdkmm-2.4/include -I/usr/local/include/pangomm-1.4 -I/usr/local/include/atkmm-1.6 -I/usr/local/include/sigc++-2.0 -I/usr/local/lib/sigc++-2.0/include -I/usr/include/libxml2 -I/opt/gnome/include/libglade-2.0 -I/opt/gnome/include/gtk-2.0 -I/opt/gnome/lib/gtk-2.0/include -I/usr/X11R6/include -I/opt/gnome/include/atk-1.0 -I/opt/gnome/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/opt/gnome/include/glib-2.0 -I/opt/gnome/lib/glib-2.0/include -GNOME_LIBS = -L/usr/local/lib -L/opt/gnome/lib -lglade-2.0 -lxml2 -lpthread -lz -lgtkmm-2.4 -lgdkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lpangomm-1.4 -lglibmm-2.4 -lsigc-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GTHREAD_CFLAGS = -pthread -I/usr/include/libxml2 -I/opt/gnome/include/glib-2.0 -I/opt/gnome/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -L/opt/gnome/lib -lgthread-2.0 -lglib-2.0 -lxml2 -lpthread -lz -lm -GTK_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -I/opt/gnome/include/gtk-2.0 -I/opt/gnome/lib/gtk-2.0/include -I/usr/X11R6/include -I/opt/gnome/include/atk-1.0 -I/opt/gnome/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/opt/gnome/include/glib-2.0 -I/opt/gnome/lib/glib-2.0/include -GTK_LIBS = -L/opt/gnome/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 +GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 +GLIB_LIBS = -lglib-2.0 -lxml2 -lz -lm +GNOME_CFLAGS = -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include +GNOME_LIBS = -lglade-2.0 -lxml2 -lz -lgtkmm-2.4 -lgdkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lpangomm-1.4 -lglibmm-2.4 -lsigc-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 +GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 +GTHREAD_LIBS = -pthread -lgthread-2.0 -lglib-2.0 -lxml2 -lz -lm +GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} @@ -134,10 +134,10 @@ LTLIBOBJS = LUA_CFLAGS = LUA_LDFLAGS = -MAKEINFO = ${SHELL} /home/vkolesnikov/bldtmp/checkouts/mysql-query-browser-1.1.17/mysql-gui-common/missing --run makeinfo -MA_COMMONDIR = common -MYSQL_INCLUDE = -I/usr/include/mysql -g -pipe -march=i386 -mcpu=i686 -MYSQL_LIBS = -L/usr/lib/mysql -lmysqlclient_r -lz -lpthread -lcrypt -lnsl -lm -lpthread +MAKEINFO = ${SHELL} /tmp/mysql-query-browser-1.1.17/mysql-gui-common/missing --run makeinfo +MA_COMMONDIR = query-browser +MYSQL_INCLUDE = -I/usr/include/mysql -DBIG_JOINS=1 +MYSQL_LIBS = -L/usr/lib -lmysqlclient_r -lz -lpthread -lcrypt -lnsl -lm -lpthread OBJEXT = o PACKAGE = mysql-gui-common PACKAGE_BUGREPORT = @@ -156,47 +156,47 @@ SLANG_LIB = STRIP = VERSION = 0.6.0 -ac_ct_CC = gcc -ac_ct_CXX = g++ +ac_ct_CC = +ac_ct_CXX = ac_ct_RANLIB = ranlib ac_ct_STRIP = -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = +am__fastdepCC_FALSE = +am__fastdepCC_TRUE = # +am__fastdepCXX_FALSE = +am__fastdepCXX_TRUE = # am__include = include am__leading_dot = . am__quote = am__tar = ${AMTAR} chof - "$$tardir" am__untar = ${AMTAR} xf - bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 +build = i486-pc-linux-gnu +build_alias = i486-linux-gnu +build_cpu = i486 build_os = linux-gnu build_vendor = pc datadir = ${prefix}/share exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 +host = i486-pc-linux-gnu +host_alias = i486-linux-gnu +host_cpu = i486 host_os = linux-gnu host_vendor = pc includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/vkolesnikov/bldtmp/checkouts/mysql-query-browser-1.1.17/mysql-gui-common/install-sh +infodir = /usr/share/info +install_sh = /tmp/mysql-query-browser-1.1.17/mysql-gui-common/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var -mandir = ${prefix}/man +mandir = /usr/share/man mkdir_p = mkdir -p -- -mydatadir = $(datadir)/mysql-gui/common +mydatadir = $(datadir)/mysql-gui/query-browser oldincludedir = /usr/include -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc +sysconfdir = /etc target_alias = #wbcanvas = libwbcanvas.a noinst_LIBRARIES = libcanvas.a $(wbcanvas) @@ -209,9 +209,9 @@ # MWBCanvas.cc -#demo_LDADD=-L/usr/local/lib -L/opt/gnome/lib -lglade-2.0 -lxml2 -lpthread -lz -lgtkmm-2.4 -lgdkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lpangomm-1.4 -lglibmm-2.4 -lsigc-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 libcanvas.a ../../../library_gc/source/libgcanvas.a\ +#demo_LDADD=-lglade-2.0 -lxml2 -lz -lgtkmm-2.4 -lgdkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lpangomm-1.4 -lglibmm-2.4 -lsigc-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 libcanvas.a ../../../library_gc/source/libgcanvas.a\ # -lftgl -lGL -lGLU -lpng -INCLUDES = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -I/usr/local/include/gtkmm-2.4 -I/usr/local/lib/gtkmm-2.4/include -I/usr/local/include/glibmm-2.4 -I/usr/local/lib/glibmm-2.4/include -I/usr/local/include/gdkmm-2.4 -I/usr/local/lib/gdkmm-2.4/include -I/usr/local/include/pangomm-1.4 -I/usr/local/include/atkmm-1.6 -I/usr/local/include/sigc++-2.0 -I/usr/local/lib/sigc++-2.0/include -I/usr/include/libxml2 -I/opt/gnome/include/libglade-2.0 -I/opt/gnome/include/gtk-2.0 -I/opt/gnome/lib/gtk-2.0/include -I/usr/X11R6/include -I/opt/gnome/include/atk-1.0 -I/opt/gnome/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/opt/gnome/include/glib-2.0 -I/opt/gnome/lib/glib-2.0/include -I/usr/include/mysql -g -pipe -march=i386 -mcpu=i686\ +INCLUDES = -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/mysql -DBIG_JOINS=1\ -I$(top_srcdir)/library/include\ -I$(top_srcdir)/library/shared_include\ -I$(top_srcdir)/library_gc/include\ @@ -272,22 +272,22 @@ distclean-compile: -rm -f *.tab.c -include ./$(DEPDIR)/MGCanvas.Po -include ./$(DEPDIR)/MWBCanvas.Po +#include ./$(DEPDIR)/MGCanvas.Po +#include ./$(DEPDIR)/MWBCanvas.Po .cc.o: - if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ -# $(CXXCOMPILE) -c -o $@ $< +# if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +# source='$<' object='$@' libtool=no +# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) + $(CXXCOMPILE) -c -o $@ $< .cc.obj: - if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ -# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +# if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +# source='$<' object='$@' libtool=no +# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) + $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) --- mysql-query-browser-1.1.17.orig/debian/mysql_query_browser.xpm +++ mysql-query-browser-1.1.17/debian/mysql_query_browser.xpm @@ -0,0 +1,382 @@ +/* XPM */ +static char * mysql_query_browser_xpm[] = { +"32 32 347 2", +" c None", +". c #4A8DB6", +"+ c #619BB9", +"@ c #5F9AB8", +"# c #5594AF", +"$ c #5F9AB9", +"% c #609BBA", +"& c #609BB9", +"* c #609AB9", +"= c #6099B8", +"- c #6099B7", +"; c #6098B5", +"> c #649AB6", +", c #518FAB", +"' c #2D77A0", +") c #28597C", +"! c #7FB2C3", +"~ c #B3D1D9", +"{ c #ADCDD6", +"] c #AFCFD9", +"^ c #ADCED7", +"/ c #ADCDD7", +"( c #ADCCD5", +"_ c #ACCBD4", +": c #B1CDD4", +"< c #ACCDD5", +"[ c #5691AB", +"} c #172F42", +"| c #4B93B7", +"1 c #91BECA", +"2 c #93BFCD", +"3 c #92BFCE", +"4 c #92C0CF", +"5 c #92C0D0", +"6 c #91BECD", +"7 c #92BECD", +"8 c #9AC2CE", +"9 c #9FC8D5", +"0 c #5E94AF", +"a c #152839", +"b c #4587BB", +"c c #5CA0B6", +"d c #7DB4C6", +"e c #78B2C6", +"f c #79B4C7", +"g c #7AB5C8", +"h c #7BB5C8", +"i c #7BB5C9", +"j c #7AB4C8", +"k c #7AB4C7", +"l c #84B8C9", +"m c #8CC2D3", +"n c #588FAB", +"o c #0E1B27", +"p c #398CB1", +"q c #60A6BB", +"r c #64A8C0", +"s c #66AAC1", +"t c #68ABC2", +"u c #68ACC4", +"v c #69ADC4", +"w c #69ADC5", +"x c #68ACC3", +"y c #6AADC4", +"z c #74B2C6", +"A c #7ABBD1", +"B c #538DAC", +"C c #0D1924", +"D c #4890C6", +"E c #3C92AF", +"F c #519FB9", +"G c #4E9EB9", +"H c #4C9DB9", +"I c #4D9EBA", +"J c #52A1BD", +"K c #56A4BF", +"L c #58A4BF", +"M c #57A4BF", +"N c #59A6BF", +"O c #60AFCA", +"P c #4C88AA", +"Q c #0E1823", +"R c #308CB6", +"S c #2B8CAB", +"T c #2186A8", +"U c #1C84A7", +"V c #1E85A9", +"W c #2288AC", +"X c #268BAE", +"Y c #2A8EB0", +"Z c #2F90B2", +"` c #3191B2", +" . c #3492B3", +".. c #3C98B6", +"+. c #50A8C6", +"@. c #447D9D", +"#. c #0E151E", +"$. c #2A6487", +"%. c #1483AA", +"&. c #1580A4", +"*. c #1B84A8", +"=. c #2389AC", +"-. c #298DB0", +";. c #2E90B2", +">. c #3293B4", +",. c #3594B5", +"'. c #3596B6", +"). c #3997B7", +"!. c #459EBB", +"~. c #5CB0CF", +"{. c #487996", +"]. c #080B10", +"^. c #2587B2", +"/. c #1582A6", +"(. c #2188AB", +"_. c #3192B4", +":. c #3796B7", +"<. c #3E9ABA", +"[. c #439EBD", +"}. c #469FBE", +"|. c #48A0BF", +"1. c #4BA2C0", +"2. c #53A8C7", +"3. c #3D6984", +"4. c #2D698D", +"5. c #1B89B0", +"6. c #2C8FB1", +"7. c #3696B6", +"8. c #3F9BBA", +"9. c #47A0BE", +"0. c #4EA4C2", +"a. c #54A8C5", +"b. c #59AAC6", +"c. c #5BABC7", +"d. c #5BADC9", +"e. c #599DC5", +"f. c #345670", +"g. c #2C4B60", +"h. c #288BB4", +"i. c #2189AC", +"j. c #2E90B3", +"k. c #3A97B8", +"l. c #459FBD", +"m. c #4FA5C2", +"n. c #58AAC6", +"o. c #66B3CD", +"p. c #6AB5CE", +"q. c #6CB5CF", +"r. c #6BB4CF", +"s. c #6CBAD7", +"t. c #69BBDA", +"u. c #61B7D7", +"v. c #54ABCA", +"w. c #469FBF", +"x. c #3B98B8", +"y. c #3394B6", +"z. c #3094BB", +"A. c #296586", +"B. c #317AA3", +"C. c #208BB0", +"D. c #3B98B9", +"E. c #55A7C5", +"F. c #61AFCA", +"G. c #71B9D2", +"H. c #76BBD3", +"I. c #79BDD5", +"J. c #7BBED5", +"K. c #7ABED5", +"L. c #76BCD4", +"M. c #72B9D2", +"N. c #6BB6CF", +"O. c #62B0CB", +"P. c #5AABC6", +"Q. c #5CAEC9", +"R. c #60AECF", +"S. c #30526A", +"T. c #248CB3", +"U. c #258BAE", +"V. c #3696B7", +"W. c #53A7C4", +"X. c #62AFCA", +"Y. c #6CB6CF", +"Z. c #74BBD3", +"`. c #7BBFD6", +" + c #81C2D9", +".+ c #85C4DA", +"++ c #87C5DB", +"@+ c #86C5DA", +"#+ c #82C3D9", +"$+ c #7CBFD7", +"%+ c #77BCD4", +"&+ c #75BBD2", +"*+ c #80C3D9", +"=+ c #7BB7D3", +"-+ c #2F4458", +";+ c #3D8EBD", +">+ c #288EAE", +",+ c #459DBB", +"'+ c #56A7C3", +")+ c #64AFCA", +"!+ c #6EB6CE", +"~+ c #72B9D1", +"{+ c #7EC0D7", +"]+ c #86C5DB", +"^+ c #8CC9DE", +"/+ c #91CBDF", +"(+ c #93CCE0", +"_+ c #91CBE0", +":+ c #8DC9DE", +"<+ c #88C6DB", +"[+ c #87C5D9", +"}+ c #94CFE3", +"|+ c #87BDD9", +"1+ c #283949", +"2+ c #5EAFD2", +"3+ c #7BC0DA", +"4+ c #90CBE3", +"5+ c #9AD1E7", +"6+ c #A3D6EC", +"7+ c #9DD2E6", +"8+ c #8AC5D9", +"9+ c #81C2D8", +"0+ c #8ECADF", +"a+ c #96CEE1", +"b+ c #9BD2E4", +"c+ c #9ED3E5", +"d+ c #98CFE2", +"e+ c #98CEE1", +"f+ c #A5DAEB", +"g+ c #8AB9D4", +"h+ c #233343", +"i+ c #3A576C", +"j+ c #405668", +"k+ c #425769", +"l+ c #44586A", +"m+ c #415464", +"n+ c #54718A", +"o+ c #8EC7DE", +"p+ c #89C8DC", +"q+ c #96CFE2", +"r+ c #9ED4E6", +"s+ c #A4D7E8", +"t+ c #A8D8E9", +"u+ c #A7D9E9", +"v+ c #A6D7E8", +"w+ c #A8D7E8", +"x+ c #B4E3F3", +"y+ c #89B2CA", +"z+ c #17212C", +"A+ c #3C5B72", +"B+ c #88CBE3", +"C+ c #8AC7DC", +"D+ c #93CDE1", +"E+ c #A6D8E8", +"F+ c #ADDCEC", +"G+ c #B0DEED", +"H+ c #B1DEED", +"I+ c #B6E0ED", +"J+ c #C2ECFB", +"K+ c #8AB0C9", +"L+ c #121B25", +"M+ c #67A0C2", +"N+ c #82C6DC", +"O+ c #8CC8DD", +"P+ c #A1D5E7", +"Q+ c #ABDBEB", +"R+ c #B2DFEE", +"S+ c #B9E2F0", +"T+ c #C1E6F2", +"U+ c #CCF1FE", +"V+ c #81A2B9", +"W+ c #0E151F", +"X+ c #78BEDE", +"Y+ c #8DC9DD", +"Z+ c #99CFE2", +"`+ c #A3D6E7", +" @ c #ACDBEB", +".@ c #B7E1EF", +"+@ c #C6EAF5", +"@@ c #D4F6FF", +"#@ c #7894AA", +"$@ c #05090D", +"%@ c #477190", +"&@ c #79C3DF", +"*@ c #A2D5E6", +"=@ c #AEDCEB", +"-@ c #C0E7F3", +";@ c #CEF2FF", +">@ c #6F8BA3", +",@ c #03060B", +"'@ c #62A2C6", +")@ c #73BDD4", +"!@ c #95CDE1", +"~@ c #A2D4E5", +"{@ c #B8E4F1", +"]@ c #C0E7F8", +"^@ c #5B7488", +"/@ c #000207", +"(@ c #65B5D6", +"_@ c #6DB7D0", +":@ c #78BDD5", +"<@ c #85C4D9", +"[@ c #94CCDF", +"}@ c #AFDFEF", +"|@ c #A3CDE4", +"1@ c #374958", +"2@ c #457C9F", +"3@ c #5AB0CE", +"4@ c #74BAD2", +"5@ c #86C4D9", +"6@ c #A3D9EA", +"7@ c #91BDD6", +"8@ c #233242", +"9@ c #4A99C0", +"0@ c #4DA6C3", +"a@ c #60AECA", +"b@ c #77BBD2", +"c@ c #95D2E6", +"d@ c #7FACC5", +"e@ c #16202A", +"f@ c #3E9FC5", +"g@ c #459FBE", +"h@ c #62AFC9", +"i@ c #87CAE1", +"j@ c #72A1BE", +"k@ c #337296", +"l@ c #2E96B9", +"m@ c #4BA2BE", +"n@ c #72BDD7", +"o@ c #5E8BA7", +"p@ c #0E141D", +"q@ c #2D88B3", +"r@ c #3295B3", +"s@ c #61B2D0", +"t@ c #4E7B98", +"u@ c #06090D", +"v@ c #2C93B9", +"w@ c #4FA6C6", +"x@ c #45718F", +"y@ c #06080C", +"z@ c #37789D", +"A@ c #45A1C3", +"B@ c #345A72", +"C@ c #040407", +"D@ c #519EC8", +"E@ c #30556D", +"F@ c #325470", +" . + @ # $ % % % % & * = - ; > , ' ", +" ) ! ~ { ] ^ ^ ^ ^ / { { ( _ : < [ } ", +" | 1 2 3 4 4 5 5 4 4 3 6 7 8 9 0 a ", +" b c d e f g h i i i j k k l m n o ", +" p q r s t u v w w v x y z A B C ", +" D E F G H I J K L L M M N O P Q ", +" R S T U V W X Y Z ` ...+.@.#. ", +" $.%.&.*.=.-.;.>.,.'.).!.~.{.]. ", +" ^./.(.-._.:.<.[.}.|.1.2.3. ", +" 4.5.W 6.7.8.9.0.a.b.c.d.e.f.g. ", +" h.i.j.k.l.m.n.O o.p.q.q.r.s.t.u.v.w.x.y.z.A. ", +" B.C.;.D.|.E.F.p.G.H.I.J.J.K.L.M.N.O.P.Q.R.S. ", +" T.U.V.l.W.X.Y.Z.`. +.+++++@+#+$+%+&+*+=+-+ ", +" ;+>+,+'+)+!+~+L.{+]+^+/+(+(+_+:+<+[+}+|+1+ ", +" 2+3+4+5+6+7+8+9+]+0+a+b+c+c+b+d+e+f+g+h+ ", +" i+j+k+l+m+n+o+p+:+q+r+s+t+u+v+w+x+y+z+ ", +" A+B+C+D+c+E+F+G+H+I+J+K+L+ ", +" M+N+O+d+P+Q+R+S+T+U+V+W+ ", +" X+#+Y+Z+`+ @.@+@@@#@$@ ", +" %@&@9+Y+d+*@=@-@;@>@,@ ", +" '@)@{+C+!@~@{@]@^@/@ ", +" (@_@:@<@[@}@|@1@ ", +" 2@3@o.4@5@6@7@8@ ", +" 9@0@a@b@c@d@e@ ", +" f@g@h@i@j@L+ ", +" k@l@m@n@o@p@ ", +" q@r@s@t@u@ ", +" v@w@x@y@ ", +" z@A@B@C@ ", +" D@E@ ", +" F@ ", +" "}; --- mysql-query-browser-1.1.17.orig/debian/control +++ mysql-query-browser-1.1.17/debian/control @@ -0,0 +1,22 @@ +Source: mysql-query-browser +Section: misc +Priority: optional +Maintainer: Adam Majer +Build-Depends: debhelper (>= 4.0.0), libgtkhtml3.6-dev, libgtkmm-2.4-dev (>=1:2.6), libpcre3-dev, libxml-parser-perl, libmysqlclient15-dev, autotools-dev +Build-Conflicts: libmysqlclient-dev (<4.1) +Standards-Version: 3.6.2 + +Package: mysql-query-browser +Architecture: any +Depends: mysql-query-browser-common (=${Source-Version}), ${shlibs:Depends}, ${misc:Depends} +Description: Official GUI tool to query MySQL database + MySQL Query Browser is a visual database query tool with a syntax + highlighing SQL editor. The result tables of may be edited + before changes are commited to the database. + +Package: mysql-query-browser-common +Architecture: all +Suggests: mysql-query-browser +Description: Architecture independent files for MySQL Query Browser + Icons and GUI XML files used by MySQL Query Browser. This package + also includes documentation files. --- mysql-query-browser-1.1.17.orig/debian/compat +++ mysql-query-browser-1.1.17/debian/compat @@ -0,0 +1 @@ +4 --- mysql-query-browser-1.1.17.orig/debian/changelog +++ mysql-query-browser-1.1.17/debian/changelog @@ -0,0 +1,190 @@ +mysql-query-browser (1.1.17-5ubuntu3) dapper; urgency=low + + * Update build-dep to libmysqlclient15-dev + + -- Barry deFreese Thu, 18 May 2006 12:09:47 -0400 + +mysql-query-browser (1.1.17-5ubuntu2) dapper; urgency=low + + * .desktop file : + -added Development to Categories, because Database + is not used for menus categories now. (Closes Malone #35713) + - deleted icon extension + + -- Loic Pefferkorn Mon, 10 Apr 2006 10:58:35 +0000 + +mysql-query-browser (1.1.17-5ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Christian Bjälevik Thu, 5 Jan 2006 13:52:17 +0100 + +mysql-query-browser (1.1.17-5) unstable; urgency=high + + * Fixed a segfault at startup (closes: #343632) + * Fixed build depends to require libgtkmm 2.6 or better (closes: #343604) + * Fixed config update script and fixed the hacked timestamps back to + their correct dates (closes: #342389) + + -- Adam Majer Sun, 1 Jan 2006 20:27:47 -0600 + +mysql-query-browser (1.1.17-4ubuntu1) dapper; urgency=low + + * Sync with Debian: + + Use libmysqlclient14-dev instead of libmysqlclient15-dev which we don't + have + + -- Sebastian Dröge Wed, 28 Dec 2005 16:09:18 +0100 + +mysql-query-browser (1.1.17-4) unstable; urgency=low + + * debian/rules: + - Make sure we have debian/updateconfigs as executable. + + -- Adam Majer Thu, 15 Dec 2005 12:08:52 -0600 + +mysql-query-browser (1.1.17-3) unstable; urgency=low + + * Updated the watch file to point at mysql.mirrored.ca Hopefully they will + not disappear + * Rebuild with the new *2a libraries so the package is installable again + (closes: #343166) + * Added a small script to automatically update config.{sub,guess} to make + sure we never FTBFS due to outdated config files (closes: #342389) + + -- Adam Majer Wed, 14 Dec 2005 21:31:40 -0600 + +mysql-query-browser (1.1.17-2) unstable; urgency=low + + * Updated Build-depends to fix FTBFS. Now uses libgtkmm-2.4 + + -- Adam Majer Mon, 24 Oct 2005 11:29:38 -0500 + +mysql-query-browser (1.1.17-1) unstable; urgency=low + + * New upstream release + * Updated out of date config.{sub,guess} (closes: #307494) + + -- Adam Majer Mon, 24 Oct 2005 08:48:36 -0500 + +mysql-query-browser (1.1.14-2) unstable; urgency=low + + * Fix a FTBFS on 64-bit arches + * Removed extraneous 'configure-stamp' from debian/rules + + -- Adam Majer Thu, 8 Sep 2005 13:35:12 -0500 + +mysql-query-browser (1.1.14-1) unstable; urgency=low + + * New upstream release + + -- Adam Majer Wed, 7 Sep 2005 13:23:48 -0500 + +mysql-query-browser (1.1.12-2) unstable; urgency=low + + * Build with libgtkhtml3.6 (closes: #323503) + * Updated standards to 3.6.2 + * Fixed building process such that configure is not run if Makefile exists + * Rebuild will fix the uninstallable problems (closes: #318085) + + -- Adam Majer Mon, 22 Aug 2005 20:35:03 -0500 + +mysql-query-browser (1.1.12-1) unstable; urgency=low + + * New upstream release + + Table Editor is now case sensitive. (closes: #296463) + * Updated German PO file (closes: #313963) + * Updated watch file + + -- Adam Majer Wed, 22 Jun 2005 11:23:13 -0500 + +mysql-query-browser (1.1.7-1) unstable; urgency=low + + * New upstream release + * Applied a patch to make query browser compile on gcc4.0/Amd64 thanks to + Andreas Jochens (closes: #301833) + * Downgraded builddepends to libgtkhtml3.2 since 3.6 will not ship with + Sarge. + + -- Adam Majer Sun, 1 May 2005 16:09:10 -0500 + +mysql-query-browser (1.1.6-2) unstable; urgency=low + + * Updated to use libgtkhtml3.6 instead of 3.0 (closes: #305999) + + -- Adam Majer Sat, 23 Apr 2005 18:14:05 -0500 + +mysql-query-browser (1.1.6-1) unstable; urgency=low + + * New upstream release + + doesn't segfault anymore on right click of an empty result set + (closes: #291756) + -- Adam Majer Fri, 4 Mar 2005 11:54:51 -0600 + +mysql-query-browser (1.1.5-2) unstable; urgency=high + + * The 'ARM buildd maintainers are not capable of rescheduling a rebuild + after 40 days and after being asked' release. No changes. + + -- Adam Majer Thu, 17 Feb 2005 14:08:45 -0600 + +mysql-query-browser (1.1.5-1) unstable; urgency=low + + * New upstream release + + -- Adam Majer Fri, 7 Jan 2005 00:40:24 -0600 + +mysql-query-browser (1.1.4-1) unstable; urgency=low + + * New upstream release + * Updated build-depends to use client library from MySQL 4.1 + + -- Adam Majer Mon, 20 Dec 2004 12:47:53 -0600 + +mysql-query-browser (1.1.2-1) unstable; urgency=low + + * New upstream release + + -- Adam Majer Fri, 3 Dec 2004 20:29:17 -0600 + +mysql-query-browser (1.1.1-2) unstable; urgency=low + + * Fixed the "swapped arguments" FTBFS bug (closes: #280965) + * Fixed FTBFS using gcc-3.4. Thanks Andreas Jochens! (closes: #280465) + + -- Adam Majer Sun, 14 Nov 2004 14:10:51 -0600 + +mysql-query-browser (1.1.1-1) unstable; urgency=low + + * New upstream release + + -- Adam Majer Mon, 8 Nov 2004 12:32:14 -0600 + +mysql-query-browser (1.1.0-1) unstable; urgency=low + + * New upstream release + + -- Adam Majer Wed, 3 Nov 2004 10:38:32 -0600 + +mysql-query-browser (1.0.7a-3) unstable; urgency=low + + * Added missing depends to mysql-query-browser (closes: #275275) + * Fixed a FTBFS on ia64 + + warnings are no longer treated as errors + + -- Adam Majer Thu, 7 Oct 2004 09:55:23 -0500 + +mysql-query-browser (1.0.7a-2) unstable; urgency=low + + * Attempt to fix FTBFS on S390 and Alpha + * Fix menu title + + -- Adam Majer Wed, 6 Oct 2004 00:30:19 -0500 + +mysql-query-browser (1.0.7a-1) unstable; urgency=low + + * Initial Debian release (closes: #260343) + * Updated watch file + + -- Adam Majer Fri, 3 Sep 2004 12:23:39 -0500 + --- mysql-query-browser-1.1.17.orig/debian/copyright +++ mysql-query-browser-1.1.17/debian/copyright @@ -0,0 +1,11 @@ +This package was debianized by Adam Majer on +Thu, 8 Jul 2004 21:57:25 -0500. + +It was downloaded from http://dev.mysql.com/downloads/query-browser/index.html + +Upstream Authors: Alfredo Kengi Kojima + Michael G. Zinner + +MySQL Query Browser is licensed under the GPL license. Please see +/usr/share/common-licenses/GPL-2 or http://www.gnu.org for the +license text. --- mysql-query-browser-1.1.17.orig/debian/rules +++ mysql-query-browser-1.1.17/debian/rules @@ -0,0 +1,175 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: config-stamp +config-stamp: + chmod +x debian/configupdate + debian/configupdate update + touch config-stamp + +#Architecture +build: configure build-arch build-indep + +build-arch: build-arch-stamp +build-arch-stamp: + + # Add here commands to compile the arch part of the package. + cd mysql-gui-common; \ + if [ ! -e Makefile ]; then ./configure --prefix=/usr --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --sysconfdir=/etc \ + --build=${DEB_BUILD_GNU_TYPE} \ + --host=${DEB_HOST_GNU_TYPE} \ + --with-commondirname=query-browser \ + --disable-dependency-tracking; fi; \ + $(MAKE) + + cd mysql-query-browser; \ + if [ ! -e Makefile ]; then ./configure --prefix=/usr --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --sysconfdir=/etc \ + --build=${DEB_BUILD_GNU_TYPE} \ + --host=${DEB_HOST_GNU_TYPE} \ + --with-commondirname=query-browser \ + --with-gtkhtml=libgtkhtml-3.6 \ + --disable-dependency-tracking; fi; \ + $(MAKE) + + #$(MAKE) + touch build-arch-stamp + +build-indep: build-arch-stamp build-indep-stamp +build-indep-stamp: + + # Add here commands to compile the indep part of the package. + #$(MAKE) doc + touch build-indep-stamp + +clean: + dh_testdir + dh_testroot + + rm -f config-stamp build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# + + # Add here commands to clean up after the build process. + cd mysql-query-browser; if [ -a Makefile ]; then $(MAKE) distclean; fi + cd mysql-gui-common; if [ -a Makefile ]; then $(MAKE) distclean; fi + cd mysql-query-browser/source/linux/gtksourceview; if [ -a Makefile ]; then $(MAKE) distclean; fi + cd mysql-query-browser/source/linux/gtksourceview/docs; if [ -a Makefile ]; then $(MAKE) distclean; fi + cd mysql-query-browser/source/linux/gtksourceview/tests; if [ -a Makefile ]; then $(MAKE) distclean; fi + + # Clean up things not cleaned up in the makefiles + for i in source/linux/gtksourceview/po/Makefile.in \ + source/linux/gtksourceview/po/Makefile \ + source/linux/gtksourceview/po/POTFILES \ + source/linux/stamp-h.in; \ + do rm -f mysql-query-browser/$$i; \ + done + rm -rf mysql-query-browser/autom4te.cache + + chmod +x debian/configupdate + debian/configupdate reset + dh_clean + +install-indep: install-arch +install-arch: install +# dh_testdir +# dh_testroot +# dh_clean -k -i +# dh_installdirs -i +# +# # Add here commands to install the indep part of the package into +# # debian/-doc. +# #INSTALLDOC# +# +# dh_install -i + +# To build all we need arch, and vice-versa... +install: + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # installing binaries + cd mysql-query-browser; $(MAKE) install DESTDIR=$(CURDIR)/debian/mysql-query-browser + cd mysql-gui-common; $(MAKE) install DESTDIR=$(CURDIR)/debian/mysql-query-browser-common + + mv debian/mysql-query-browser/usr/share/mysql-gui/query-browser/* debian/mysql-query-browser-common/usr/share/mysql-gui/query-browser + rmdir debian/mysql-query-browser/usr/share/mysql-gui/query-browser + mv debian/mysql-query-browser/usr/share/applications debian/mysql-query-browser-common/usr/share +# mv debian/mysql-query-browser/usr/share/mysql-gui/dolphin_anim.gif debian/mysql-query-browser-common/usr/share/mysql-gui + mv debian/mysql-query-browser/usr/bin/mysql-query-browser-bin debian/mysql-query-browser/usr/bin/mysql-query-browser + + install -m644 -oroot -groot debian/mysql_query_browser.xpm debian/mysql-query-browser/usr/share/pixmaps + +# dh_install + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs +# dh_installexamples + dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb +# Build architecture independant packages using the common target. +binary-indep: build-indep install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build-arch install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +manpage: debian/mysql-query-browser.xml + xsltproc -''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl debian/mysql-query-browser.xml + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure --- mysql-query-browser-1.1.17.orig/debian/mysql-query-browser.menu +++ mysql-query-browser-1.1.17/debian/mysql-query-browser.menu @@ -0,0 +1,3 @@ +?package(mysql-query-browser):needs="X11" section="Apps/Databases"\ + title="MySQL Query Browser" command="/usr/bin/mysql-query-browser"\ + hints="Gnome,MySQL,Databases" icon="/usr/share/pixmaps/mysql_query_browser.xpm" --- mysql-query-browser-1.1.17.orig/debian/dirs +++ mysql-query-browser-1.1.17/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/sbin +usr/share/pixmaps --- mysql-query-browser-1.1.17.orig/debian/watch +++ mysql-query-browser-1.1.17/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/MySQLAdministrationSuite/mysql-query-browser-([^-]*).*\.tar\.gz debian uupdate --- mysql-query-browser-1.1.17.orig/debian/mysql-query-browser.manpages +++ mysql-query-browser-1.1.17/debian/mysql-query-browser.manpages @@ -0,0 +1 @@ +mysql-query-browser.1 --- mysql-query-browser-1.1.17.orig/debian/mysql-query-browser.xml +++ mysql-query-browser-1.1.17/debian/mysql-query-browser.xml @@ -0,0 +1,155 @@ + +.
will be generated. You may view the +manual page with: nroff -man .
| less'. A +typical entry in a Makefile or Makefile.am is: + +DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\ +manpages/docbook.xsl +XP=xsltproc -''-nonet + +manpage.1: manpage.dbk + $(XP) $(DB2MAN) $< + +The xsltproc binary is found in the xsltproc package. The +XSL files are in docbook-xsl. Please remember that if you +create the nroff version in one of the debian/rules file +targets (such as build), you will need to include xsltproc +and docbook-xsl in your Build-Depends control field. + +--> + + + Adam"> + Majer"> + + September 4, 2004"> + + 1"> + adamm@zombino.com"> + + mysql-query-browser"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + MySQL query tool + + + + &dhpackage; + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; command. + + MySQL Query Browser enables developers and DBAs to visually perform database queries including data edition. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + + + OPTIONS + + + + + + + Show summary of options. + + + + + + + Disable usage of the sound server. + + + + + + + Enables usage of the sound server. + + + + + + + Connect to the specific sound server. + + + + + + + Displays the version of &dhpackage;. + + + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + + + + + --- mysql-query-browser-1.1.17.orig/debian/configupdate +++ mysql-query-browser-1.1.17/debian/configupdate @@ -0,0 +1,61 @@ +#!/bin/bash + +# Original written and copyright by Adam Majer +# +# This file is 100% public domain. Use it for whatever you wish. +# + +function update_configs() +{ + [ -x /usr/share/misc/config.${1} ] || return 0 + LATEST_VERSION=`/usr/share/misc/config.${1} -t` + UPDATE_FILES=`find -type f | grep "/config\.${1}\$"` + + echo "Latest version of config.${1} file is ${LATEST_VERSION}" + for i in $UPDATE_FILES; do + head -1 "$i" | grep -q '#!\s*\/bin\/sh' + EXE=$? + if [ -x "$i" ] || [ $EXE -eq 0 ]; then + V=`sh -e "${i}" -t` + echo "Updating ${V} version file at ${i}" + if [[ "$LATEST_VERSION" > "$V" ]]; then + mv "${i}" "${i}.orig_update" + ln -s /usr/share/misc/config.$1 "${i}" + else + echo "WARNING: Debian version of config.${1} is older than this package's upstream." + fi + fi + done + return 0 +} + + +function reset_configs() +{ + UPDATED_FILES=`find -type l | grep "/config\.${1}\$"` + for i in ${UPDATED_FILES}; do + if [ -e "${i}.orig_update" ]; then + mv "${i}.orig_update" "${i}" + fi + done + return 0 +} + + +# Check if we are updating, reseting or whatever +case "$1" in + update) + update_configs sub + update_configs guess + ;; + reset) + reset_configs sub + reset_configs guess + ;; + *) + echo "The only allowed parameters are 'update' or 'reset'" + exit 2; + ;; +esac + +exit 0 --- mysql-query-browser-1.1.17.orig/mysql-query-browser.1 +++ mysql-query-browser-1.1.17/mysql-query-browser.1 @@ -0,0 +1,73 @@ +.\"Generated by db2man.xsl. Don't modify this, modify the source. +.de Sh \" Subsection +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Ip \" List item +.br +.ie \\n(.$>=3 .ne \\$3 +.el .ne 3 +.IP "\\$1" \\$2 +.. +.TH "MYSQL-QUERY-BROWSER" 1 "September 4, 2004" "" "" +.SH NAME +mysql-query-browser \- MySQL query tool +.SH "SYNOPSIS" +.ad l +.hy 0 +.HP 20 +\fBmysql\-query\-browser\fR +.ad +.hy + +.SH "DESCRIPTION" + +.PP +This manual page documents briefly the \fBmysql\-query\-browser\fR command\&. + +.PP +MySQL Query Browser enables developers and DBAs to visually perform database queries including data edition\&. + +.PP +This manual page was written for the Debian™ distribution because the original program does not have a manual page\&. + +.SH "OPTIONS" + +.TP +\fB\-? \fR\fB\-\-help\fR +Show summary of options\&. + +.TP +\fB\-\-disable\-sound\fR +Disable usage of the sound server\&. + +.TP +\fB\-\-enable\-sound\fR +Enables usage of the sound server\&. + +.TP +\fB\-\-espeaker=HOSTNAME:PORT\fR +Connect to the specific sound server\&. + +.TP +\fB\-\-version\fR +Displays the version of mysql\-query\-browser\&. + +.SH "AUTHOR" + +.PP +This manual page was written by Adam Majer for the Debian™ system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation\&. + +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&. + +.SH AUTHOR +Adam Majer.