[Python-apps-commits] r207 - in /packages/emma: branches/upstream/ trunk/ trunk/debian/ trunk/debian/patches/ trunk/emmalib/

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Mon Nov 12 21:42:15 UTC 2007


Author: piotr
Date: Mon Nov 12 21:42:15 2007
New Revision: 207

URL: http://svn.debian.org/wsvn/python-apps/?sc=1&rev=207
Log:
use quilt to manage patches

Added:
    packages/emma/trunk/debian/patches/
    packages/emma/trunk/debian/patches/add_some_keywords_in_pretty_format.patch
    packages/emma/trunk/debian/patches/changelog_encoding.patch
    packages/emma/trunk/debian/patches/disable_theme_change.patch
    packages/emma/trunk/debian/patches/fix_module_import_order.patch
    packages/emma/trunk/debian/patches/series
Removed:
    packages/emma/branches/upstream/
    packages/emma/trunk/changelog
    packages/emma/trunk/emmalib/
Modified:
    packages/emma/trunk/debian/changelog
    packages/emma/trunk/debian/control
    packages/emma/trunk/debian/rules

Modified: packages/emma/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/changelog?rev=207&op=diff
==============================================================================
--- packages/emma/trunk/debian/changelog (original)
+++ packages/emma/trunk/debian/changelog Mon Nov 12 21:42:15 2007
@@ -2,6 +2,7 @@
 
   * debian/menu: section changed to "Applications/Data Management"
   * update .desktop file (Version and Categories fields changed)
+  * Use quilt to manage patches
   * Change maintainer to PAPT, move myself to Uploaders
   * Changed my address to piotr at debian.org
 

Modified: packages/emma/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/control?rev=207&op=diff
==============================================================================
--- packages/emma/trunk/debian/control (original)
+++ packages/emma/trunk/debian/control Mon Nov 12 21:42:15 2007
@@ -3,7 +3,7 @@
 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)
+Build-Depends: python (>= 2.4), python-central (>= 0.5.6), debhelper (>= 5.0.38), quilt (>= 0.40-1)
 XS-Python-Version: current, >=2.4
 Standards-Version: 3.7.2
 Homepage: http://www.fastflo.de/projects/emma

Added: packages/emma/trunk/debian/patches/add_some_keywords_in_pretty_format.patch
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/patches/add_some_keywords_in_pretty_format.patch?rev=207&op=file
==============================================================================
--- packages/emma/trunk/debian/patches/add_some_keywords_in_pretty_format.patch (added)
+++ packages/emma/trunk/debian/patches/add_some_keywords_in_pretty_format.patch Mon Nov 12 21:42:15 2007
@@ -1,0 +1,36 @@
+--- emma-0.6.orig/emmalib/plugins/pretty_format/__init__.py
++++ emma-0.6/emmalib/plugins/pretty_format/__init__.py
+@@ -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

Added: packages/emma/trunk/debian/patches/changelog_encoding.patch
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/patches/changelog_encoding.patch?rev=207&op=file
==============================================================================
--- packages/emma/trunk/debian/patches/changelog_encoding.patch (added)
+++ packages/emma/trunk/debian/patches/changelog_encoding.patch Mon Nov 12 21:42:15 2007
@@ -1,0 +1,11 @@
+--- emma-0.6.orig/changelog
++++ emma-0.6/changelog
+@@ -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

Added: packages/emma/trunk/debian/patches/disable_theme_change.patch
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/patches/disable_theme_change.patch?rev=207&op=file
==============================================================================
--- packages/emma/trunk/debian/patches/disable_theme_change.patch (added)
+++ packages/emma/trunk/debian/patches/disable_theme_change.patch Mon Nov 12 21:42:15 2007
@@ -1,0 +1,13 @@
+--- emma-0.6.orig/emmalib/__init__.py
++++ emma-0.6/emmalib/__init__.py
+@@ -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(

Added: packages/emma/trunk/debian/patches/fix_module_import_order.patch
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/patches/fix_module_import_order.patch?rev=207&op=file
==============================================================================
--- packages/emma/trunk/debian/patches/fix_module_import_order.patch (added)
+++ packages/emma/trunk/debian/patches/fix_module_import_order.patch Mon Nov 12 21:42:15 2007
@@ -1,0 +1,25 @@
+--- emma-0.6.orig/emmalib/__init__.py
++++ emma-0.6/emmalib/__init__.py
+@@ -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."

Added: packages/emma/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/patches/series?rev=207&op=file
==============================================================================
--- packages/emma/trunk/debian/patches/series (added)
+++ packages/emma/trunk/debian/patches/series Mon Nov 12 21:42:15 2007
@@ -1,0 +1,4 @@
+add_some_keywords_in_pretty_format.patch
+disable_theme_change.patch
+fix_module_import_order.patch
+changelog_encoding.patch

Modified: packages/emma/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-apps/packages/emma/trunk/debian/rules?rev=207&op=diff
==============================================================================
--- packages/emma/trunk/debian/rules (original)
+++ packages/emma/trunk/debian/rules Mon Nov 12 21:42:15 2007
@@ -3,16 +3,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 build:
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	python setup.py clean -a
 	find . -name '*\.py[co]' -delete
 	dh_clean 
 
-install:
+install: patch
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -38,7 +40,7 @@
 	dh_md5sums
 	dh_builddeb
 
-binary-arch: build install
+binary-arch:
 
 binary: binary-indep binary-arch
 




More information about the Python-apps-commits mailing list