Dear Margarita, thank you for your contribution!

I was in vacations some days, so your NMU is welcome!

Best regards,                   Georges.

Margarita Manterola a écrit :
> Hi,
> 
> I have taken the patch made by Paul, but added it to the 10-Makefile.patch,
> where it made more sense.
> 
> I've tested the resulting program and it seemed to use cairo properly, 
> although
> I'm not a French speaker, not a chemistry expert, it seemed to do the right
> thing.
> 
> I'm attaching here the debdiff corresponding to my change.  I'll be uploading
> this fix to the 3-day delayed queue.
> 
> -- 
> Cheers,
> Marga

> diff -Nru dozzaqueux-3.33/debian/changelog dozzaqueux-3.33/debian/changelog
> --- dozzaqueux-3.33/debian/changelog  2014-01-05 17:10:54.000000000 +0100
> +++ dozzaqueux-3.33/debian/changelog  2014-04-25 15:40:50.000000000 +0200
> @@ -1,3 +1,11 @@
> +dozzaqueux (3.33-1.1) unstable; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * Modify 10-Makefile.patch to find cairocanvas component, fixing FTBFS.
> +    Based on patch by Paul Gevers <[email protected]>. Closes: #743117
> +
> + -- Margarita Manterola <[email protected]>  Fri, 25 Apr 2014 15:13:49 +0200
> +
>  dozzaqueux (3.33-1) unstable; urgency=medium
>  
>    * created a working watch file and added a script to make the new package
> diff -Nru dozzaqueux-3.33/debian/patches/10-Makefile.patch 
> dozzaqueux-3.33/debian/patches/10-Makefile.patch
> --- dozzaqueux-3.33/debian/patches/10-Makefile.patch  2014-01-05 
> 17:09:41.000000000 +0100
> +++ dozzaqueux-3.33/debian/patches/10-Makefile.patch  2014-04-25 
> 15:16:05.000000000 +0200
> @@ -1,6 +1,8 @@
> ---- /dev/null
> -+++ b/Makefile
> -@@ -0,0 +1,50 @@
> +Index: dozzaqueux-3.33/Makefile
> +===================================================================
> +--- /dev/null        1970-01-01 00:00:00.000000000 +0000
> ++++ dozzaqueux-3.33/Makefile 2014-04-25 15:16:01.448456823 +0200
> +@@ -0,0 +1,51 @@
>  +DESTDIR =
>  +
>  +FPC_VERSION = $(shell update-alternatives --list lazarus | tail -1 | awk -F 
> / '{print $$5}')
> @@ -12,6 +14,7 @@
>  +UNITLIBS += 
> -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/lazutils/lib/$(ARCH)/
>  +UNITLIBS += 
> -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/synedit/units/$(ARCH)/nogui/
>  +UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/packager/units/$(ARCH)/
> ++UNITLIBS += 
> -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/cairocanvas/lib/$(ARCH)/gtk2/
>  +UNITLIBS += 
> -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/printers/lib/$(ARCH)/gtk2/
>  +UNITLIBS += 
> -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/synedit/units/$(ARCH)/
>  +UNITLIBS += -Fu.


-- 
Georges KHAZNADAR et Jocelyne FOURNIER
22 rue des mouettes, 59240 Dunkerque France.
Téléphone +33 (0)3 28 29 17 70

Attachment: signature.asc
Description: Digital signature

Reply via email to