Package: ace-of-penguins Version: 1.2-9.1 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu maverick ubuntu-patch
Hi, There is a new upstream release, which include all the patches in the Debian package. In Ubuntu, we've applied the attached patch to achieve the following: * New upstream release. - Updated with a recent version of automake. - Don't display empty windows (LP: #482225) * debian/patches/ - Add 10-include-imagelib.dpatch: Fix implicit pointer conversion. - Remove 90-autoreconf-ldflags-am_ldflags.dpatch, merged upstream. - Remove 95-autoreconf-fi-2.64.dpatch, merged upstream. - Remove 96-autoreconf-fi-2.64-depcomp.dpatch, merged upstream. - Remove 30-documentation-changes.dpatch, merged upstream. - Remove 01-code-changes.dpatch, merged upstream. * debian/rules: - Don't clean depcomp, to fix FTBFS after clean. We thought you might be interested in doing the same. Regards, Julien Lavergne -- System Information: Debian Release: squeeze/sid APT prefers lucid-updates APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid-proposed'), (500, 'lucid') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-24-generic (SMP w/2 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru ace-of-penguins-1.2/debian/patches/00list ace-of-penguins-1.3/debian/patches/00list --- ace-of-penguins-1.2/debian/patches/00list 2010-07-23 22:10:01.000000000 +0200 +++ ace-of-penguins-1.3/debian/patches/00list 2010-07-23 22:10:01.000000000 +0200 @@ -1,6 +1 @@ -01-code-changes.dpatch -30-documentation-changes.dpatch -90-autoreconf-ldflags-am_ldflags.dpatch -95-autoreconf-fi-2.64.dpatch -96-autoreconf-fi-2.64-depcomp.dpatch - +10-include-imagelib.dpatch diff -Nru ace-of-penguins-1.2/debian/patches/10-include-imagelib.dpatch ace-of-penguins-1.3/debian/patches/10-include-imagelib.dpatch --- ace-of-penguins-1.2/debian/patches/10-include-imagelib.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ ace-of-penguins-1.3/debian/patches/10-include-imagelib.dpatch 2010-07-23 22:10:01.000000000 +0200 @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-include-imagelib.dpath.dpatch by Julien Lavergne <gi...@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad ace-1.3~/games/spider.c ace-1.3/games/spider.c +--- ace-1.3~/games/spider.c 2008-04-20 07:39:39.000000000 +0200 ++++ ace-1.3/games/spider.c 2010-07-23 16:21:06.882845602 +0200 +@@ -21,7 +21,7 @@ + #include <time.h> + ++#include "imagelib.h" + #include "cards.h" +-//#include "imagelib.h" + + #define W CARD_WIDTH + #define H CARD_HEIGHT diff -Nru ace-of-penguins-1.2/debian/patches/10-include-imagelib.dpath.dpatch ace-of-penguins-1.3/debian/patches/10-include-imagelib.dpath.dpatch --- ace-of-penguins-1.2/debian/patches/10-include-imagelib.dpath.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ ace-of-penguins-1.3/debian/patches/10-include-imagelib.dpath.dpatch 2010-07-23 22:10:01.000000000 +0200 @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-include-imagelib.dpath.dpatch by Julien Lavergne <gi...@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad ace-1.3~/games/spider.c ace-1.3/games/spider.c +--- ace-1.3~/games/spider.c 2008-04-20 07:39:39.000000000 +0200 ++++ ace-1.3/games/spider.c 2010-07-23 16:29:55.392844809 +0200 +@@ -20,8 +20,9 @@ + #include <string.h> + #include <time.h> + ++#include "imagelib.h" + #include "cards.h" +-//#include "imagelib.h" ++ + + #define W CARD_WIDTH + #define H CARD_HEIGHT diff -Nru ace-of-penguins-1.2/debian/rules ace-of-penguins-1.3/debian/rules --- ace-of-penguins-1.2/debian/rules 2010-07-23 22:10:01.000000000 +0200 +++ ace-of-penguins-1.3/debian/rules 2010-07-23 22:10:01.000000000 +0200 @@ -111,7 +111,7 @@ clean distclean || : ; \ fi - rm -f config.stamp config.status depcomp libtool Makefile */Makefile + rm -f config.stamp config.status libtool Makefile */Makefile rm -f lib/libcards1.la # rm -rf lib/.lib games/.lib */*.[ao] *.[ao]
