diff -urN gourmet-0.16.1/debian/changelog gourmet/debian/changelog --- gourmet-0.16.1/debian/changelog 2013-10-15 17:31:11.000000000 +0200 +++ gourmet/debian/changelog 2014-02-28 00:42:32.516596000 +0100 @@ -1,3 +1,22 @@ +gourmet (0.17.0-0ubuntu1) trusty; urgency=low + + * debian/control: + - Add ipython to Recommends section. + - Set Homepage field to https://thinkle.github.io/gourmet/ + - In Description field, remove full stop "." after first line. + - Bump Standards-Version to 3.9.5 (no changes needed). + * debian/copyright: + - Add copyright information for gourmet/plugins/python_shell/ipython_view.py + - s/thinkle.github.com/thinkle.github.io/ + * debian/docs: s/TODO/TODO.md/ + * debian/patches/01_license-location.diff: Adapt to upstream changes; DEP-3. + * debian/patches/02_gzip-open-faq.diff: Open FAQ file using gzip + decompression. + * debian/patches/fix_schema_upgrade.patch: Drop (integrated upstream). + * debian/watch: Fix to ignore upstream debian/* tags. + + -- Bernhard Reiter Mon, 24 Feb 2014 10:57:50 +0100 + gourmet (0.16.1-1ubuntu1) saucy; urgency=low * debian/patches/fix_schema_upgrade.patch: fix typo preventing a schema diff -urN gourmet-0.16.1/debian/control gourmet/debian/control --- gourmet-0.16.1/debian/control 2013-10-15 17:31:29.000000000 +0200 +++ gourmet/debian/control 2014-02-24 11:37:31.000000000 +0100 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Christian Marillat -Homepage: http://grecipe-manager.sf.net/ -Standards-Version: 3.9.4 +Homepage: https://thinkle.github.io/gourmet/ +Standards-Version: 3.9.5 XS-Python-Version: >= 2.7 Build-Depends: debhelper (>= 9), python | python-all | python-dev | python-all-dev Build-Depends-Indep: intltool, python-distutils-extra @@ -12,8 +12,8 @@ Package: gourmet Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-imaging, python-gtk2 (>= 2.22.0), python-reportlab, python-sqlalchemy, python-poppler, python-elib.intl -Recommends: python-gst0.10, python-gtkspell, python-beautifulsoup -Description: Recipe organizer and shopping list generator. +Recommends: python-gst0.10, python-gtkspell, python-beautifulsoup, ipython +Description: Recipe organizer and shopping list generator Gourmet Recipe Manager is a gtk-based application to store, organize and search recipes. . diff -urN gourmet-0.16.1/debian/copyright gourmet/debian/copyright --- gourmet-0.16.1/debian/copyright 2013-09-12 11:18:00.000000000 +0200 +++ gourmet/debian/copyright 2014-02-28 00:44:01.889039000 +0100 @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Gourmet Recipe Manager -Source: https://thinkle.github.com/gourmet/ +Source: https://thinkle.github.io/gourmet/ Files: * Copyright: 2004-2012 Thomas Mills Hinkle @@ -25,6 +25,10 @@ Copyright: 2012 Kati Pregartner License: GPL-2+ +Files: gourmet/plugins/python_shell/ipython_view.py +Copyright: 2005, 2007 IBM Corporation +License: BSD-3-clause + Files: debian/* Copyright: 2008-2009 Rolf Leggewie 2010 Jonathan Wiltshire @@ -46,3 +50,28 @@ On Debian systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. +License: BSD-3-clause + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the IBM Corporation nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN gourmet-0.16.1/debian/docs gourmet/debian/docs --- gourmet-0.16.1/debian/docs 2013-05-26 10:27:49.000000000 +0200 +++ gourmet/debian/docs 2014-02-24 11:04:21.000000000 +0100 @@ -1,2 +1,2 @@ -TODO +TODO.md README.md diff -urN gourmet-0.16.1/debian/patches/01_license-location.diff gourmet/debian/patches/01_license-location.diff --- gourmet-0.16.1/debian/patches/01_license-location.diff 2013-09-12 11:23:57.000000000 +0200 +++ gourmet/debian/patches/01_license-location.diff 2014-02-27 23:28:31.000000000 +0100 @@ -1,11 +1,16 @@ +Description: Point code to Debian's system GPL-2 text location. + This is necessary as we're removing upstream's LICENSE file as required by + Debian policy. +Author: Bernhard Reiter + --- a/gourmet/GourmetRecipeManager.py +++ b/gourmet/GourmetRecipeManager.py -@@ -385,7 +385,7 @@ class GourmetApplication: +@@ -350,7 +350,7 @@ # load LICENSE text file try: -- h = open(os.path.join(doc_base,'LICENSE'),'r') -+ h = open('/usr/share/common-licenses/GPL-2','r') - s = h.readlines() +- license_text = open(os.path.join(doc_base,'LICENSE'),'r').read() ++ license_text = open('/usr/share/common-licenses/GPL-2','r').read() except IOError, err: print "IO Error %s" % err + except: diff -urN gourmet-0.16.1/debian/patches/02_gzip-open-faq.diff gourmet/debian/patches/02_gzip-open-faq.diff --- gourmet-0.16.1/debian/patches/02_gzip-open-faq.diff 1970-01-01 01:00:00.000000000 +0100 +++ gourmet/debian/patches/02_gzip-open-faq.diff 2014-02-28 00:10:45.000000000 +0100 @@ -0,0 +1,58 @@ +Description: Open FAQ file using gzip decompression. + This is necessary as Debian-based distributions compress docs like our + FAQ file, so we need to uncompress and display FAQ.gz instead of just + displaying FAQ. +Author: Bernhard Reiter + +--- a/gourmet/gtk_extras/dialog_extras.py ++++ b/gourmet/gtk_extras/dialog_extras.py +@@ -2,6 +2,7 @@ + import gtk, gobject, os.path, optionTable, thumbnail, fnmatch, re + import pango + import xml.sax.saxutils ++import gzip + from gettext import gettext as _ + from gourmet.gdebug import debug + from glib import get_user_special_dir, USER_DIRECTORY_PICTURES +@@ -660,7 +661,7 @@ + """ + CLOSE=False + if type(infile)==str: +- infile=open(infile) ++ infile=gzip.open(infile) + CLOSE=True + self.index_lines = [] + self.index_dic={} +--- a/gourmet/GourmetRecipeManager.py ++++ b/gourmet/GourmetRecipeManager.py +@@ -403,7 +403,7 @@ + about.destroy() + + def show_help (self, *args): +- de.show_faq(os.path.join(doc_base,'FAQ')) ++ de.show_faq(os.path.join(doc_base,'FAQ.gz')) + + def save (self, file=None, db=None, xml=None): + debug("save (self, file=None, db=None, xml=None):",5) +--- a/gourmet/reccard.py ++++ b/gourmet/reccard.py +@@ -221,7 +221,7 @@ + ('Preferences',gtk.STOCK_PREFERENCES,None, + None,None,self.preferences_cb), + ('Help',gtk.STOCK_HELP,_('_Help'), +- None,None,lambda *args: de.show_faq(os.path.join(doc_base,'FAQ'),jump_to='Entering and Editing recipes')), ++ None,None,lambda *args: de.show_faq(os.path.join(doc_base,'FAQ.gz'),jump_to='Entering and Editing recipes')), + ] + ) + self.recipeDisplayActionGroup.add_toggle_actions([ +--- a/gourmet/shopgui.py ++++ b/gourmet/shopgui.py +@@ -673,7 +673,7 @@ + ), + ('File',None,_('_File')), + ('Help',gtk.STOCK_HELP,_('_Help'),None,None, +- lambda *args: de.show_faq(os.path.join(doc_base,'FAQ'),jump_to='Shopping')), ++ lambda *args: de.show_faq(os.path.join(doc_base,'FAQ.gz'),jump_to='Shopping')), + ('HelpMenu',None,_('_Help')), + ]) + self.mainActionGroup.add_toggle_actions([ diff -urN gourmet-0.16.1/debian/patches/fix_schema_upgrade.patch gourmet/debian/patches/fix_schema_upgrade.patch --- gourmet-0.16.1/debian/patches/fix_schema_upgrade.patch 2013-10-15 17:29:23.000000000 +0200 +++ gourmet/debian/patches/fix_schema_upgrade.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -From 7f1aa6fbe0bedc1ba82c220c7b437260ec422434 Mon Sep 17 00:00:00 2001 -From: Bernhard Reiter -Date: Sat, 12 Oct 2013 17:37:40 +0200 -Subject: [PATCH] Fix a typo that broke the nutritional information plugin DB - upgrade. - -Bug documented e.g. at -https://bbs.archlinux.org/viewtopic.php?pid=1332916 ---- - gourmet/plugins/nutritional_information/data_plugin.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gourmet/plugins/nutritional_information/data_plugin.py b/gourmet/plugins/nutritional_information/data_plugin.py -index 2f386c8..66db911 100644 ---- a/gourmet/plugins/nutritional_information/data_plugin.py -+++ b/gourmet/plugins/nutritional_information/data_plugin.py -@@ -20,7 +20,7 @@ class UsdaWeight (object): - pass - self.db._setup_object_for_table(self.db.usda_weights_table, UsdaWeight) - -- def setup_nutrition_conversions_table (self): -+ def setup_nutritionconversions_table (self): - self.db.nutritionconversions_table = Table('nutritionconversions',self.db.metadata, - Column('id',Integer(),primary_key=True), - Column('ingkey',String(length=255),**{}), -@@ -58,7 +58,7 @@ class Nutrition (object): - - self.setup_usda_weights_table() - self.setup_nutritionaliases_table() -- self.setup_nutrition_conversions_table() -+ self.setup_nutritionconversions_table() - self.db.do_add_nutrition = self.do_add_nutrition - - def update_version (self, gourmet_stored, plugin_stored, gourmet_current, plugin_current): -@@ -68,7 +68,7 @@ def update_version (self, gourmet_stored, plugin_stored, gourmet_current, plugin - print 'RECREATE USDA WEIGHTS TABLE' - self.db.alter_table('usda_weights',self.setup_usda_weights_table,{}, - [name for lname,name,typ in parser_data.WEIGHT_FIELDS]) -- self.db.alter_table('nutritionconversions',self.setup_nutrition_conversions_table,{}, -+ self.db.alter_table('nutritionconversions',self.setup_nutritionconversions_table,{}, - ['ingkey','unit','factor']) - if plugin_stored == '1': - # Add choline --- -1.8.4 - diff -urN gourmet-0.16.1/debian/patches/series gourmet/debian/patches/series --- gourmet-0.16.1/debian/patches/series 2013-10-15 17:29:23.000000000 +0200 +++ gourmet/debian/patches/series 2014-02-28 00:05:40.000000000 +0100 @@ -1,2 +1,2 @@ 01_license-location.diff -fix_schema_upgrade.patch +02_gzip-open-faq.diff diff -urN gourmet-0.16.1/debian/watch gourmet/debian/watch --- gourmet-0.16.1/debian/watch 2013-09-12 11:06:40.000000000 +0200 +++ gourmet/debian/watch 2014-02-24 11:32:48.000000000 +0100 @@ -1,5 +1,3 @@ version=3 - -opts="uversionmangle=s/debian||0ubuntu1//" \ http://github.com/thinkle/gourmet/releases \ -/thinkle/gourmet/archive/(.*)\.tar\.gz +/thinkle/gourmet/archive/(\d\S*)\.tar\.gz