Package: gourmet Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: lucid ubuntu-patch
Hi, In Ubuntu we have updated gourmet to 0.15.2, and thought you might want to do the same. Attached is a diff against the version in unstable with the version in the Ubuntu development release. This was generated using: $ diff -Naurp gourmet-0.14.5/debian/ gourmet-0.15.2/debian/ > /tmp/gourmet-0.14.5_to_0.15.2.diff Not only is this a new upstream release, but it is a required update for gourmet to work properly with python 2.6. Some of the work done here can be seen in the Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/gourmet/+bug/431806 Thanks, Jamie -- System Information: Debian Release: squeeze/sid APT prefers karmic-updates APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 'karmic') Architecture: amd64 (x86_64) Kernel: Linux 2.6.31-16-generic (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages gourmet depends on: ii python 2.6.4-0ubuntu1 An interactive high-level object-o ii python-central 0.6.11ubuntu9 register and build utility for Pyt ii python-glade2 2.16.0-0ubuntu1 GTK+ bindings: Glade support ii python-gtk2 2.16.0-0ubuntu1 Python bindings for the GTK+ widge ii python-imaging 1.1.6-3ubuntu1 Python Imaging Library ii python-poppler 0.10.0-1ubuntu1 Poppler Python bindings ii python-reportlab 2.3-0ubuntu1 ReportLab library to create PDF do ii python-sqlalchemy 0.5.5-1 SQL toolkit and Object Relational ii python2.6 2.6.4-0ubuntu3 An interactive high-level object-o Versions of packages gourmet recommends: ii python-gnome2 2.28.0-0ubuntu1 Python bindings for the GNOME desk pn python-gnome2-extras <none> (no description available) gourmet suggests no packages. -- no debconf information
diff -Naurp gourmet-0.14.5/debian/changelog gourmet-0.15.2/debian/changelog --- gourmet-0.14.5/debian/changelog 2009-12-29 09:32:18.000000000 -0600 +++ gourmet-0.15.2/debian/changelog 2009-12-29 09:12:54.000000000 -0600 @@ -1,3 +1,45 @@ +gourmet (0.15.2-0ubuntu1) lucid; urgency=low + + * New upstream release (LP: #431806, Closes: #530841). Also fixes the + following bugs: + - LP: #315836 + - LP: #295982 + - LP: #316445 (the GUI has been changed so this no longer applies) + * Drop forcing of python2.5 + * debian/control: Recommends python-gnome2-extras for printing + * drop debian/patches/05-add_manpage.patch, which is now included upstream + * Fix some lintian warnings: + - add debian/README.source + - debian/control: bump Standards-Version to 3.8.3 + - debian/compat: bump to 5 + * debian/control: Depends on python-poppler (needed for printing) + * debian/patches/01_fix_raise_str.patch: don't raise str exception + in src/lib/plugin_gui.py + * debian/patches/02_fix_nutrition_index_out_of_range.patch: don't + add entries beyond the width of the field in databaseGrabber.py + * debian/patches/03_dont_remove_nonexistent_plugin.patch: don't + remove an inactive plugin in plugin_loader.py and don't deactivate + a plugin from a non-existent database + + -- Jamie Strandboge <ja...@ubuntu.com> Tue, 29 Dec 2009 09:12:49 -0600 + +gourmet (0.14.5-2ubuntu2) karmic; urgency=low + + * force python 2.5. This change should be able to be dropped 0.14.9 and + later + - debian/control: use 'XS-Python-Version: 2.5' + - debian/control: Depends on python2.5 + - debian/rules: Replace all '#!' calls to python with python2.5 + - LP: #352678 + + -- Jamie Strandboge <ja...@ubuntu.com> Fri, 03 Jul 2009 21:16:20 -0500 + +gourmet (0.14.5-2ubuntu1) jaunty; urgency=low + + * Use --install-layout=deb to fix FTBFS with Python 2.6. + + -- Alessio Treglia <quadris...@ubuntu.com> Sat, 07 Mar 2009 00:24:16 +0100 + gourmet (0.14.5-2) unstable; urgency=low * reintroduce conflict for python-pysqlite. (Closes: #516803) diff -Naurp gourmet-0.14.5/debian/compat gourmet-0.15.2/debian/compat --- gourmet-0.14.5/debian/compat 2009-12-29 09:32:18.000000000 -0600 +++ gourmet-0.15.2/debian/compat 2009-12-13 10:36:40.000000000 -0600 @@ -1 +1 @@ -4 +5 diff -Naurp gourmet-0.14.5/debian/control gourmet-0.15.2/debian/control --- gourmet-0.14.5/debian/control 2009-12-29 09:32:18.000000000 -0600 +++ gourmet-0.15.2/debian/control 2009-12-29 09:54:10.000000000 -0600 @@ -1,19 +1,21 @@ Source: gourmet Section: gnome Priority: optional -Maintainer: Rolf Leggewie <f...@rolf.leggewie.biz> +Maintainer: Ubuntu MOTU Developers <ubuntu-m...@lists.ubuntu.com> +XSBC-Original-Maintainer: Rolf Leggewie <f...@rolf.leggewie.biz> Build-Depends: debhelper (>= 5.0.38), quilt Build-Depends-Indep: python-dev, python-gtk2-dev, python-central (>= 0.5.6), intltool -XS-Python-Version: all +XS-Python-Version: 2.6 Homepage: http://grecipe-manager.sf.net/ -Standards-Version: 3.8.0 +Standards-Version: 3.8.3 Package: gourmet Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-imaging, python-glade2, - python-gtk2 (>=2.3.92), python (>=2.5), python-reportlab, python-sqlalchemy -Recommends: python-gnome2 + python-gtk2 (>=2.3.92), python (>=2.6), python-reportlab, python-sqlalchemy, + python-poppler +Recommends: python-gnome2, python-gnome2-extras Conflicts: python-pysqlite2 (>=2.5) XB-Python-Version: ${python:Versions} Description: A gtk-based recipe organizer and shopping list generator diff -Naurp gourmet-0.14.5/debian/patches/01_fix_raise_str.patch gourmet-0.15.2/debian/patches/01_fix_raise_str.patch --- gourmet-0.14.5/debian/patches/01_fix_raise_str.patch 1969-12-31 18:00:00.000000000 -0600 +++ gourmet-0.15.2/debian/patches/01_fix_raise_str.patch 2009-12-29 09:07:54.000000000 -0600 @@ -0,0 +1,16 @@ +Description: fix 2.6 TypeError instead of raising bare exception +Author: Jamie Strandboge <ja...@ubuntu.com> + +Index: gourmet-0.15.2/src/lib/plugin_gui.py +=================================================================== +--- gourmet-0.15.2.orig/src/lib/plugin_gui.py 2009-12-16 07:14:22.000000000 -0600 ++++ gourmet-0.15.2/src/lib/plugin_gui.py 2009-12-16 07:24:30.000000000 -0600 +@@ -124,7 +124,7 @@ + if row[1] in dependers: + row[0] = False + else: +- raise "Cancelled" ++ raise de.UserCancelledError("Cancelled") + else: + self.loader.deactivate_plugin_set(plugin_set) + except: diff -Naurp gourmet-0.14.5/debian/patches/02_fix_nutrition_index_out_of_range.patch gourmet-0.15.2/debian/patches/02_fix_nutrition_index_out_of_range.patch --- gourmet-0.14.5/debian/patches/02_fix_nutrition_index_out_of_range.patch 1969-12-31 18:00:00.000000000 -0600 +++ gourmet-0.15.2/debian/patches/02_fix_nutrition_index_out_of_range.patch 2009-12-29 09:09:01.000000000 -0600 @@ -0,0 +1,17 @@ +Description: fix IndexError when activating nutritional database +Author: Jamie Strandboge <ja...@ubuntu.com> + +Index: gourmet-0.15.2/src/lib/plugins/nutritional_information/databaseGrabber.py +=================================================================== +--- gourmet-0.15.2.orig/src/lib/plugins/nutritional_information/databaseGrabber.py 2009-12-16 07:28:45.000000000 -0600 ++++ gourmet-0.15.2/src/lib/plugins/nutritional_information/databaseGrabber.py 2009-12-16 07:33:45.000000000 -0600 +@@ -117,6 +117,9 @@ + d = {} + fields = line.split("^") + for n,fl in enumerate(fields): ++ if n >= len(field_defs): ++ print "Skipping entry: %d too big for field definitions(%d)" % (n, len(field_defs)) ++ continue + lname,sname,typ = field_defs[n] + if fl and fl[0]=='~' and fl[-1]=='~': + d[sname]=fl[1:-1] diff -Naurp gourmet-0.14.5/debian/patches/03_dont_remove_nonexistent_plugin.patch gourmet-0.15.2/debian/patches/03_dont_remove_nonexistent_plugin.patch --- gourmet-0.14.5/debian/patches/03_dont_remove_nonexistent_plugin.patch 1969-12-31 18:00:00.000000000 -0600 +++ gourmet-0.15.2/debian/patches/03_dont_remove_nonexistent_plugin.patch 2009-12-29 09:11:20.000000000 -0600 @@ -0,0 +1,32 @@ +Description: don't remove a non-active plugin or an entry from a non-existent + database +Author: Jamie Strandboge <ja...@ubuntu.com> + +Index: gourmet-0.15.2/src/lib/plugin_loader.py +=================================================================== +--- gourmet-0.15.2.orig/src/lib/plugin_loader.py 2009-12-16 07:35:30.000000000 -0600 ++++ gourmet-0.15.2/src/lib/plugin_loader.py 2009-12-16 07:36:57.000000000 -0600 +@@ -173,7 +173,8 @@ + for plugin in plugin_set.plugins: + if self.instantiated_plugins.has_key(plugin): + self.instantiated_plugins[plugin].remove() +- self.active_plugins.remove(plugin) ++ if plugin in self.active_plugins: ++ self.active_plugins.remove(plugin) + + def get_instantiated_plugin (self, plugin): + if self.instantiated_plugins.has_key(plugin): +Index: gourmet-0.15.2/src/lib/plugin.py +=================================================================== +--- gourmet-0.15.2.orig/src/lib/plugin.py 2009-12-16 07:39:17.000000000 -0600 ++++ gourmet-0.15.2/src/lib/plugin.py 2009-12-16 07:39:37.000000000 -0600 +@@ -243,7 +243,8 @@ + self.active = True + + def remove (self): +- self.db.remove_hook(plugin_loader.POST,'setup_tables',self.create_tables) ++ if hasattr(self, "db"): ++ self.db.remove_hook(plugin_loader.POST,'setup_tables',self.create_tables) + self.active = False + + def create_tables (self): diff -Naurp gourmet-0.14.5/debian/patches/05-add_manpage.patch gourmet-0.15.2/debian/patches/05-add_manpage.patch --- gourmet-0.14.5/debian/patches/05-add_manpage.patch 2009-12-29 09:32:18.000000000 -0600 +++ gourmet-0.15.2/debian/patches/05-add_manpage.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,88 +0,0 @@ -Index: gourmet-0.14.0/debian/gourmet.1 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gourmet-0.14.0/gourmet.1 2008-09-22 19:39:58.000000000 +0200 -@@ -0,0 +1,83 @@ -+.TH "gourmet" "1" "September 2008" -+.SH NAME -+gourmet \- A Gtk-based recipe organizer and shopping list generator -+.SH SYNOPSIS -+.B gourmet -+[\fIoptions\fR] -+.SH DESCRIPTION -+.PP -+This manual page describes briefly the \fBgourmet\fR command. -+.PP -+Gourmet Recipe Manager is a Gtk-based recipe organizer and shopping list -+generator intended for the GNOME desktop environment (though it does not need -+all the GNOME libraries). Gourmet can import Mealmaster(tm) files and can -+export recipes in a number of formats, including text, RTF and web pages. -+Gourmet also can calculate nutritional information for recipes. -+.SH OPTIONS -+.TP -+\fB\-\-force\-winprinter\fR -+Force the use of the windows PDF\-based printer. -+.TP -+\fB\-\-force\-lprprinter\fR -+Force the use of the LPR\-based printer even if -+gnomeprint is available. -+.TP -+\fB\-\-database\-url\fR=\fIDB_URL\fR -+Custom url for database of form driver://args/location -+.TP -+\fB\-\-plugin\-directory\fR=\fIHTML_PLUGIN_DIR\fR -+Directory for webpage import filter plugins. -+.TP -+\fB\-\-use\-threads\fR -+Enable threading support. -+.TP -+\fB\-\-disable\-threads\fR -+Disable threading support. -+.TP -+\fB\-\-gourmet\-directory\fR=\fIGOURMETDIR\fR -+Gourmet configuration directory. -+.TP -+\fB\-\-debug\-threading\-interval\fR=\fITHREAD_DEBUG_INTERVAL\fR -+Interval for threading debug calls. -+.TP -+\fB\-\-debug\-threading\fR -+Print debugging information about threading. -+.TP -+\fB\-\-debug\-file\fR=\fIDEBUG_FILE\fR -+Regular expression that matches filename(s) whose code -+we want to display debug messages from. -+.TP -+\fB\-q\fR -+Don't print \fBgourmet\fR error messages. -+.TP -+\fB\-\-showtimes\fR -+Print timestamps on debug statements. -+.TP -+\fB\-v\fR -+Be verbose (extra v's will increase the verbosity -+level. -+.TP -+\fB\-\-data\-directory\fR=\fIDATAD\fR -+Directory for \fBgourmet\fR data files. -+.TP -+\fB\-\-image\-directory\fR=\fIIMAGED\fR -+Directory for \fBgourmet\fR image files. -+.TP -+\fB\-\-glade\-directory\fR=\fIGLADED\fR -+Directory for \fBgourmet\fR glade files. -+.TP -+\fB\-\-disable\-psyco\fR -+Do not use psyco if it is installed. -+.TP -+\fB\-\-version\fR -+show version number and exit. -+.TP -+\fB\-h\fR, \fB\-\-help\fR -+show this help message and exit -+.SH AUTHORS -+Thomas Hinkle <thomas_hin...@alumni.brown.edu> -+ -+.PP -+This manual page was written by Francois Wendling <frwendl...@free.fr> for the -+Debian GNU/Linux system (but may be used by others). -+ diff -Naurp gourmet-0.14.5/debian/patches/series gourmet-0.15.2/debian/patches/series --- gourmet-0.14.5/debian/patches/series 2009-12-29 09:32:18.000000000 -0600 +++ gourmet-0.15.2/debian/patches/series 2009-12-29 09:20:18.000000000 -0600 @@ -1 +1,3 @@ -05-add_manpage.patch +01_fix_raise_str.patch +02_fix_nutrition_index_out_of_range.patch +03_dont_remove_nonexistent_plugin.patch diff -Naurp gourmet-0.14.5/debian/README.source gourmet-0.15.2/debian/README.source --- gourmet-0.14.5/debian/README.source 1969-12-31 18:00:00.000000000 -0600 +++ gourmet-0.15.2/debian/README.source 2009-12-13 10:34:39.000000000 -0600 @@ -0,0 +1,2 @@ +This package uses quilt to manage patches; see: + /usr/share/doc/quilt/README.source diff -Naurp gourmet-0.14.5/debian/rules gourmet-0.15.2/debian/rules --- gourmet-0.14.5/debian/rules 2009-12-29 09:32:18.000000000 -0600 +++ gourmet-0.15.2/debian/rules 2009-12-29 09:43:04.000000000 -0600 @@ -32,7 +32,7 @@ install: build dh_installdirs # Add here commands to install the package into debian/gourmet. - python setup.py install --no-compile --disable-modules-check --root=$(CURDIR)/debian/gourmet --install-lib /usr/share/gourmet + python setup.py install --no-compile --disable-modules-check --root=$(CURDIR)/debian/gourmet --install-lib /usr/share/gourmet --install-layout=deb # Build architecture-independent files here. binary-indep: build install
