diff -Nru gourmet-0.15.4/debian/changelog gourmet-0.15.4/debian/changelog --- gourmet-0.15.4/debian/changelog 2010-06-07 02:16:45.000000000 +0200 +++ gourmet-0.15.4/debian/changelog 2010-10-15 21:18:01.000000000 +0200 @@ -1,3 +1,9 @@ +gourmet (0.15.4-2ubuntu2) natty; urgency=low + + * fix problems with python-sqlalchemy 0.6.0 (Closes LP: #322961) + + -- Stefan Roggensack Fri, 15 Oct 2010 21:16:30 +0200 + gourmet (0.15.4-2ubuntu1) maverick; urgency=low * Merge from Debian unstable, remaining changes: diff -Nru gourmet-0.15.4/debian/patches/04_fix_TypeError.patch gourmet-0.15.4/debian/patches/04_fix_TypeError.patch --- gourmet-0.15.4/debian/patches/04_fix_TypeError.patch 1970-01-01 01:00:00.000000000 +0100 +++ gourmet-0.15.4/debian/patches/04_fix_TypeError.patch 2010-10-15 21:16:10.000000000 +0200 @@ -0,0 +1,13 @@ +Index: gourmet-0.15.4/src/lib/backends/db.py +=================================================================== +--- gourmet-0.15.4.orig/src/lib/backends/db.py 2009-12-18 03:24:33.000000000 +0100 ++++ gourmet-0.15.4/src/lib/backends/db.py 2010-10-13 21:27:46.015533999 +0200 +@@ -794,7 +794,7 @@ + + def get_unique_values (self, colname,table=None,**criteria): + """Get list of unique values for column in table.""" +- if not table: table=self.recipe_table ++ if table is None: table=self.recipe_table + if criteria: table = table.select(*make_simple_select_arg(criteria,table)) + if colname=='category' and table==self.recipe_table: + print 'WARNING: you are using a hack to access category values.' diff -Nru gourmet-0.15.4/debian/patches/series gourmet-0.15.4/debian/patches/series --- gourmet-0.15.4/debian/patches/series 2010-06-07 02:16:45.000000000 +0200 +++ gourmet-0.15.4/debian/patches/series 2010-10-15 21:16:10.000000000 +0200 @@ -1,2 +1,3 @@ 01_fix_raise_str.patch 03_dont_remove_nonexistent_plugin.patch +04_fix_TypeError.patch