[Python-apps-commits] r206 - in /packages/emma/trunk: ./ debian/ emmalib/ emmalib/plugins/pretty_format/
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Mon Nov 12 21:11:20 UTC 2007
Author: piotr
Date: Mon Nov 12 21:11:20 2007
New Revision: 206
URL: http://svn.debian.org/wsvn/python-apps/?sc=1&rev=206
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
packages/emma/trunk/debian/ (with props)
packages/emma/trunk/debian/Emma.1
packages/emma/trunk/debian/README.Debian
packages/emma/trunk/debian/changelog
packages/emma/trunk/debian/compat
packages/emma/trunk/debian/control
packages/emma/trunk/debian/copyright
packages/emma/trunk/debian/emma.desktop
packages/emma/trunk/debian/manpages
packages/emma/trunk/debian/menu
packages/emma/trunk/debian/rules (with props)
packages/emma/trunk/debian/watch
Modified:
packages/emma/trunk/changelog
packages/emma/trunk/emmalib/__init__.py
packages/emma/trunk/emmalib/plugins/pretty_format/__init__.py
Modified: packages/emma/trunk/changelog
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/changelog?rev=206&op=diff
==============================================================================
--- packages/emma/trunk/changelog (original)
+++ packages/emma/trunk/changelog Mon Nov 12 21:11:20 2007
@@ -3,7 +3,7 @@
* let all data files install to prefix + share/emma
Mon, 13 Nov 2006 19:45:01 +0100
* debian bug+patch Bug#398337: emma: Impossible to create a new connection
- from Manolo Díaz
+ from Manolo DÃaz
* bugfix: connection test button does not use given port number
* remember treeview cursor per tab
* automatic tab nameing with user defined pre-postfixes
Propchange: packages/emma/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: packages/emma/trunk/debian/Emma.1
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/Emma.1?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/Emma.1 (added)
+++ packages/emma/trunk/debian/Emma.1 Mon Nov 12 21:11:20 2007
@@ -1,0 +1,48 @@
+.TH EMMA 1 "october 24, 2006"
+.SH NAME
+emma \- extendable MySQL managing assistant
+.SH SYNOPSIS
+.B emma
+.RI [-h|--help]\ [-d|--debug\]\ [-l\ output_log\ [-f|--flush]]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B emma
+command (
+.B Emma
+on Debian systems)
+.PP
+emma is a graphical toolkit for MySQL database developers and administrators,
+it is the successor of yamysqlfront.
+.PP
+Its main features are:
+ * Dialogs to create/modify MySQL databases, tables and associated indexes
+ * Result sets grouped in tabs
+ * SQL editor:
+ + Tabs
+ + Built-in syntax highlighting
+ + Table and field name tab-completion
+ + Automatic SQL statement formatting
+ * Export to CSV files
+ * Multiple simultaneously opened MySQL connections
+.PP
+.SH OPTIONS
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h, \-\-help
+show help message
+.TP
+.B \-d, \-\-debug
+output debug information on stdout
+.HP
+.B \-l, \-\-log FILE
+append all output to a specified log file
+.TP
+.B \-f, \-\-flush
+flush {stdout,log} after each write
+.SH AUTHOR
+emma was written by Florian Schmidt <flo at fastflo.de>.
+.PP
+This manual page was written by Piotr Ozarowski <ozarow at gmail.com>,
+for the Debian project (but may be used by others).
Added: packages/emma/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/README.Debian?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/README.Debian (added)
+++ packages/emma/trunk/debian/README.Debian Mon Nov 12 21:11:20 2007
@@ -1,0 +1,5 @@
+emma Debian notes
+=================
+
+/usr/bin/emma file was renamed to /usr/bin/Emma to prevent conflicts with
+binaries used in EMBOSS. See http://bugs.debian.org/394705 for details.
Added: packages/emma/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/changelog?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/changelog (added)
+++ packages/emma/trunk/debian/changelog Mon Nov 12 21:11:20 2007
@@ -1,0 +1,31 @@
+emma (0.6-2) UNRELEASED; urgency=low
+
+ * debian/menu: section changed to "Applications/Data Management"
+ * update .desktop file (Version and Categories fields changed)
+ * Change maintainer to PAPT, move myself to Uploaders
+ * Changed my address to piotr at debian.org
+
+ -- Piotr Ożarowski <piotr at debian.org> Mon, 12 Nov 2007 21:50:30 +0100
+
+emma (0.6-1) unstable; urgency=low
+
+ * New upstream release
+ * GTK+ theme change disabled
+ * Fixed changelog encoding (menu->Help->Changelog doesn't work with non UTF-8
+ characters)
+ * Fixed handling of JOINs in "pretty format" plugin
+
+ -- Piotr Ozarowski <ozarow at gmail.com> Tue, 14 Nov 2006 16:00:07 +0100
+
+emma (0.5-2) unstable; urgency=low
+
+ * Fixed bug when adding new connection (closes: #398337)
+
+ -- Piotr Ozarowski <ozarow at gmail.com> Mon, 13 Nov 2006 11:24:03 +0100
+
+emma (0.5-1) unstable; urgency=low
+
+ * Initial release (closes: #394705)
+
+ -- Piotr Ozarowski <ozarow at gmail.com> Mon, 23 Oct 2006 00:18:46 +0200
+
Added: packages/emma/trunk/debian/compat
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/compat?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/compat (added)
+++ packages/emma/trunk/debian/compat Mon Nov 12 21:11:20 2007
@@ -1,0 +1,1 @@
+5
Added: packages/emma/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/control?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/control (added)
+++ packages/emma/trunk/debian/control Mon Nov 12 21:11:20 2007
@@ -1,0 +1,28 @@
+Source: emma
+Section: gnome
+Priority: optional
+Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Piotr Ożarowski <piotr at debian.org>
+Build-Depends: python (>= 2.4), python-central (>= 0.5.6), debhelper (>= 5.0.38)
+XS-Python-Version: current, >=2.4
+Standards-Version: 3.7.2
+Homepage: http://www.fastflo.de/projects/emma
+
+Package: emma
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, python-gtk2 (>= 2.8.6-1), python-glade2 (>= 2.8.6-1), python-mysqldb (>=1.2.1-p2-2)
+Description: extendable MySQL managing assistant
+ emma is a graphical toolkit for MySQL database developers and administrators,
+ it is the successor of yamysqlfront.
+ .
+ Its main features are:
+ * Dialogs to create/modify MySQL databases, tables and associated indexes
+ * Result sets grouped in tabs
+ * SQL editor:
+ + Tabs
+ + Built-in syntax highlighting
+ + Table and field name tab-completion
+ + Automatic SQL statement formatting
+ * Export to CSV files
+ * Multiple simultaneously opened MySQL connections
Added: packages/emma/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/copyright?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/copyright (added)
+++ packages/emma/trunk/debian/copyright Mon Nov 12 21:11:20 2007
@@ -1,0 +1,33 @@
+This package was debianized by Piotr Ożarowski <piotr at debian.org> on
+Tue, 22 Oct 2006 13:58:00 +0200.
+
+It was downloaded from http://www.fastflo.de/projects/emma
+
+Upstream Author: Florian Schmidt <flo at fastflo.de>
+
+Copyright (C) 2006 Florian Schmidt
+
+Licence:
+
+ Copyright (C) 2006 Florian Schmidt (flo at fastflo.de)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+The Debian packaging is (C) 2006-2007, Piotr Ożarowski <piotr at debian.org> and
+is licensed under the GPL.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL'.
Added: packages/emma/trunk/debian/emma.desktop
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/emma.desktop?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/emma.desktop (added)
+++ packages/emma/trunk/debian/emma.desktop Mon Nov 12 21:11:20 2007
@@ -1,0 +1,11 @@
+[Desktop Entry]
+Name=emma
+GenericName=emma - MySQL managing assistant
+Comment=MySQL managing assistant
+Version=0.6
+Exec=Emma
+MimeType=application/x-executable
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Development;Database
Added: packages/emma/trunk/debian/manpages
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/manpages?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/manpages (added)
+++ packages/emma/trunk/debian/manpages Mon Nov 12 21:11:20 2007
@@ -1,0 +1,1 @@
+debian/Emma.1
Added: packages/emma/trunk/debian/menu
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/menu?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/menu (added)
+++ packages/emma/trunk/debian/menu Mon Nov 12 21:11:20 2007
@@ -1,0 +1,7 @@
+?package(emma):needs="X11" \
+ section="Applications/Data Management" \
+ title="emma" \
+ hints="Gnome" \
+ command="/usr/bin/Emma" \
+ longtitle="emma - MySQL managing assistant"
+
Added: packages/emma/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/rules?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/rules (added)
+++ packages/emma/trunk/debian/rules Mon Nov 12 21:11:20 2007
@@ -1,0 +1,45 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build:
+
+clean:
+ dh_testdir
+ dh_testroot
+ python setup.py clean -a
+ find . -name '*\.py[co]' -delete
+ dh_clean
+
+install:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ python setup.py install --root debian/emma
+ # See REAMDE.Debian for explanations
+ mv debian/emma/usr/bin/emma debian/emma/usr/bin/Emma
+ #dh_link /usr/share/pycentral/emma/site-packages/emmalib/changelog /usr/share/doc/emma/changelog
+ dh_install debian/emma.desktop /usr/share/applications/
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installmenu
+ dh_installdocs
+ dh_installchangelogs
+ dh_installman
+ dh_compress -X.py -X.glade
+ dh_fixperms
+ dh_pycentral
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build install
+
+binary: binary-indep binary-arch
+
+.PHONY: build clean binary-indep binary-arch binary install
Propchange: packages/emma/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: packages/emma/trunk/debian/watch
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/watch?rev=206&op=file
==============================================================================
--- packages/emma/trunk/debian/watch (added)
+++ packages/emma/trunk/debian/watch Mon Nov 12 21:11:20 2007
@@ -1,0 +1,2 @@
+version=3
+http://www.fastflo.de/projects/emma /files/emma/downloads/python_src/emma-(.*)\.tar\.gz
Modified: packages/emma/trunk/emmalib/__init__.py
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/emmalib/__init__.py?rev=206&op=diff
==============================================================================
--- packages/emma/trunk/emmalib/__init__.py (original)
+++ packages/emma/trunk/emmalib/__init__.py Mon Nov 12 21:11:20 2007
@@ -28,11 +28,6 @@
import bz2
try:
- import gtk
- from gtk import keysyms
- import gobject
- import gtk.gdk
- import gtk.glade
if __name__ != "__main__":
from emmalib import __file__ as emmalib_file
from emmalib.mysql_host import *
@@ -41,6 +36,11 @@
emmalib_file = __file__
from mysql_host import *
from mysql_query_tab import *
+ import gtk
+ from gtk import keysyms
+ import gobject
+ import gtk.gdk
+ import gtk.glade
except:
print "no gtk. you will not be able to start emma."
@@ -200,8 +200,8 @@
label.show()
self.query_notebook.append_page(new_page, label)
- if self.config["theme"]:
- self.select_theme(self.config["theme"])
+ #if self.config["theme"]:
+ # self.select_theme(self.config["theme"])
if int(self.config["ping_connection_interval"]) > 0:
gobject.timeout_add(
Modified: packages/emma/trunk/emmalib/plugins/pretty_format/__init__.py
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/emmalib/plugins/pretty_format/__init__.py?rev=206&op=diff
==============================================================================
--- packages/emma/trunk/emmalib/plugins/pretty_format/__init__.py (original)
+++ packages/emma/trunk/emmalib/plugins/pretty_format/__init__.py Mon Nov 12 21:11:20 2007
@@ -310,7 +310,7 @@
p = e
continue
- if token.lower() == "where":
+ if token.lower() in ("where", "on"):
output.write("\n")
output.write(kw(token))
output.write("\n\t")
@@ -343,9 +343,12 @@
if current_statement == "select" and current_state == "tables":
- output.write(token)
- if token == ",":
- output.write("\n\t")
+ if token.lower() in "join,left,right,inner".split(","):
+ output.write(" %s " % kw(token))
+ else:
+ output.write(token)
+ if token == ",":
+ output.write("\n\t")
p = e
continue
if current_statement == "order":
@@ -389,7 +392,7 @@
p = 0
tl = len(text)
token = None
- keywords = "select,from,left,join,right,inner,where,and,or,order,by,having,group,limit,union,distinct"
+ keywords = "select,from,left,join,right,inner,where,and,or,on,order,by,having,group,limit,union,distinct"
keywords = keywords.split(",")
token = None
last_token = token
More information about the Python-apps-commits
mailing list