On 15 mars 2023 20:35, Jonathan Wiltshire <j...@debian.org> wrote:
> Control: tag -1 moreinfo
>
> Hi,
>
> On Wed, Mar 15, 2023 at 09:29:54AM +0100, Christian Marillat wrote:
>> [ Checklist ]
>> [x] all changes are documented in the d/changelog
>> [x] I reviewed all changes and I approve them
>> [ ] attach debdiff against the package in testing
>
> Can we get the debdiff please?
Yes :
,----
| diff -Nru gourmand-1.1.0+really1.1.0~rc3/debian/changelog
gourmand-1.1.0+really1.1.0~rc3/debian/changelog
| --- gourmand-1.1.0+really1.1.0~rc3/debian/changelog 2023-02-05
17:26:09.000000000 +0100
| +++ gourmand-1.1.0+really1.1.0~rc3/debian/changelog 2023-03-10
17:29:44.000000000 +0100
| @@ -1,3 +1,10 @@
| +gourmand (1.1.0+really1.1.0~rc3-3) unstable; urgency=medium
| +
| + * Add upstream patch to fix "unable to add an ingredient"
| + (Closes: #1030027)
| +
| + -- Christian Marillat <maril...@debian.org> Fri, 10 Mar 2023 17:29:44 +0100
| +
| gourmand (1.1.0+really1.1.0~rc3-2) unstable; urgency=medium
|
| * Replaces python3-scrape-schema-recipe by python3-recipe-scrapers.
| diff -Nru
gourmand-1.1.0+really1.1.0~rc3/debian/patches/02_fix-unable-to-add-an-ingredient.patch
gourmand-1.1.0+really1.1.0~rc3/debian/patches/02_fix-unable-to-add-an-ingredient.patch
| ---
gourmand-1.1.0+really1.1.0~rc3/debian/patches/02_fix-unable-to-add-an-ingredient.patch
1970-01-01 01:00:00.000000000 +0100
| +++
gourmand-1.1.0+really1.1.0~rc3/debian/patches/02_fix-unable-to-add-an-ingredient.patch
2023-03-10 17:29:44.000000000 +0100
| @@ -0,0 +1,21 @@
| +From 19a544882b1aabb75d83494e3797e515909300bb Mon Sep 17 00:00:00 2001
| +From: Cyril Danilevski <cyda...@gmail.com>
| +Date: Fri, 27 Jan 2023 19:02:40 +0100
| +Subject: [PATCH] Do not query ingredient key when parsing ingredients from
| + line (#142)
| +
| +---
| + src/gourmand/reccard.py | 2 +-
| + 1 file changed, 1 insertion(+), 1 deletion(-)
| +
| +--- a/src/gourmand/reccard.py
| ++++ b/src/gourmand/reccard.py
| +@@ -1174,7 +1174,7 @@ class IngredientEditorModule (RecEditorM
| + selected item, so that the new ingredient can be added right below
it in
| + the tree.
| + """
| +- d = self.rg.rd.parse_ingredient(line, conv=self.rg.conv)
| ++ d = self.rg.rd.parse_ingredient(line, conv=self.rg.conv,
get_key=False)
| + if d:
| + if 'rangeamount' in d:
| + d['amount'] = self.rg.rd.format_amount_string_from_amount(
| diff -Nru gourmand-1.1.0+really1.1.0~rc3/debian/patches/series
gourmand-1.1.0+really1.1.0~rc3/debian/patches/series
| --- gourmand-1.1.0+really1.1.0~rc3/debian/patches/series 2022-12-10
09:50:43.000000000 +0100
| +++ gourmand-1.1.0+really1.1.0~rc3/debian/patches/series 2023-03-10
17:29:44.000000000 +0100
| @@ -1 +1,2 @@
| 01_Fix-FTBFS-with-python.patch
| +02_fix-unable-to-add-an-ingredient.patch
`----
