Control: tags -1 patch Hi,
please find attached a debdiff for raincat with the necessary changes to fix this bug. I have also cleaned up the package a little but there are still two Lintian warnings left. Not sure yet how to fix them properly. Regards, Markus
diff -Nru raincat-1.1.1.2/debian/changelog raincat-1.1.1.2/debian/changelog --- raincat-1.1.1.2/debian/changelog 2013-06-22 13:23:04.000000000 +0200 +++ raincat-1.1.1.2/debian/changelog 2015-08-22 14:30:44.000000000 +0200 @@ -1,3 +1,21 @@ +raincat (1.1.1.2-2) unstable; urgency=medium + + * Team upload. + + [ Markus Koschany ] + * Add opengl-2.9.patch and fix FTBFS with newer versions of OpenGL. + (Closes: #789108) + * Declare compliance with Debian Policy 3.9.6. + * raincat.desktop: Add keywords and GenericName and Comment in German. + * Fix debian/copyright syntax to silence Lintian warnings. + * debian/control: Remove superfluous shlibs:Depends substvar from + raincat-dbg. + + [ Evgeni Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org + + -- Markus Koschany <a...@gambaru.de> Sat, 22 Aug 2015 14:14:04 +0200 + raincat (1.1.1.2-1) unstable; urgency=low * New upstream release. diff -Nru raincat-1.1.1.2/debian/control raincat-1.1.1.2/debian/control --- raincat-1.1.1.2/debian/control 2013-06-22 13:23:04.000000000 +0200 +++ raincat-1.1.1.2/debian/control 2015-08-22 14:30:44.000000000 +0200 @@ -9,10 +9,10 @@ libghc-mtl-dev, libghc-extensible-exceptions-dev, libghc-glut-dev, libghc-opengl-dev, libghc-random-dev, libghc-sdl-dev, libghc-sdl-image-dev, libghc-sdl-mixer-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://raincat.bysusanlin.com/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/raincat/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/raincat/ +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/raincat/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/raincat/ Package: raincat Architecture: any @@ -38,7 +38,7 @@ Section: debug Priority: extra Architecture: any -Depends: raincat (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: raincat (= ${binary:Version}), ${misc:Depends} Description: 2D puzzle game featuring a fuzzy little cat - debug Raincat is a 2d puzzle game similar to the Incredible Machine and Lemmings series. Your goal is simple: guide the cat safe and dry to the end of each diff -Nru raincat-1.1.1.2/debian/copyright raincat-1.1.1.2/debian/copyright --- raincat-1.1.1.2/debian/copyright 2013-06-22 13:23:04.000000000 +0200 +++ raincat-1.1.1.2/debian/copyright 2015-08-22 14:30:44.000000000 +0200 @@ -2,18 +2,18 @@ Upstream-Name: Raincat Upstream-Contact: Garrick Chin <gc...@cmu.edu> Source: http://hackage.haskell.org/packages/archive/Raincat/1.1.1.2/Raincat-1.1.1.2.tar.gz -Comment: +Comment: Old source was http://www.contrib.andrew.cmu.edu/~gchin/downloads/Raincat.tar.gz -Debianized-By: Miriam Ruiz <little_m...@yahoo.es> -Debianized-Date: Sat, 30 Jan 2010 19:15:17 +0100 + Debianized-By: Miriam Ruiz <little_m...@yahoo.es> + Debianized-Date: Sat, 30 Jan 2010 19:15:17 +0100 Files: * Copyright: Copyright (c) 2010, Garrick Chin -License: BSD +License: BSD-3-clause Files: data/* Copyright: Copyright (c) 2010, Garrick Chin -License: CC-by-sa-3.0 +License: CC-BY-SA-3.0 Comment: The Raincat program graphics and music are distributed under the Creative Commons Version Attribution-Share Alike 3.0 license @@ -21,10 +21,9 @@ Files: debian/* Copyright: Copyright (C) 2010, Miriam Ruiz <little_m...@yahoo.es> -License: BSD - The Debian packaging is licensed under the same license as the program. +License: BSD-3-clause -License: BSD +License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -50,7 +49,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: CC-by-sa-3.0 +License: CC-BY-SA-3.0 THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS diff -Nru raincat-1.1.1.2/debian/patches/opengl-2.9.patch raincat-1.1.1.2/debian/patches/opengl-2.9.patch --- raincat-1.1.1.2/debian/patches/opengl-2.9.patch 1970-01-01 01:00:00.000000000 +0100 +++ raincat-1.1.1.2/debian/patches/opengl-2.9.patch 2015-08-22 14:30:44.000000000 +0200 @@ -0,0 +1,39 @@ +From: Markus Koschany <a...@gambaru.de> +Date: Sat, 22 Aug 2015 13:59:06 +0200 +Subject: opengl 2.9 + +Taken from +https://github.com/styx/Raincat/commit/307c24681421b316add18f7c1dfa85c123f836c0 + +Fixes FTBFS with newer version of OpenGL. + +Bug: https://bugs.debian.org/789108 +Forwarded: no +--- + src/Nxt/Graphics.hs | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/Nxt/Graphics.hs b/src/Nxt/Graphics.hs +index 981d6df..384fbd8 100644 +--- a/src/Nxt/Graphics.hs ++++ b/src/Nxt/Graphics.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + module Nxt.Graphics + (begin, + end, +@@ -88,7 +89,13 @@ loadTexture textureFilePath = do + surfacePixels <- surfaceGetPixels surface + + let pixelData = PixelData RGBA UnsignedByte surfacePixels +- texImage2D Nothing NoProxy 0 RGBA' surfaceSize 0 pixelData ++ texImage2D ++#if MIN_VERSION_OpenGL(2,9,0) ++ Texture2D ++#else ++ Nothing ++#endif ++ NoProxy 0 RGBA' surfaceSize 0 pixelData + + freeSurface surface + diff -Nru raincat-1.1.1.2/debian/patches/series raincat-1.1.1.2/debian/patches/series --- raincat-1.1.1.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ raincat-1.1.1.2/debian/patches/series 2015-08-22 14:30:44.000000000 +0200 @@ -0,0 +1 @@ +opengl-2.9.patch diff -Nru raincat-1.1.1.2/debian/raincat.desktop raincat-1.1.1.2/debian/raincat.desktop --- raincat-1.1.1.2/debian/raincat.desktop 2013-06-22 13:23:04.000000000 +0200 +++ raincat-1.1.1.2/debian/raincat.desktop 2015-08-22 14:30:44.000000000 +0200 @@ -3,9 +3,12 @@ Name=Raincat GenericName=Logic Game GenericName[es]=Juego de lógica +GenericName[de]=Denkspiel Comment=2D puzzle game featuring a fuzzy little cat Comment[es]=Rompecabezas en 2D protagonizado por un lindo gatito +Comment[de]=Puzzlespiel in 2D mit einer kleinen, flauschigen Katze Icon=raincat Exec=raincat Terminal=false Categories=Game;KidsGame; +Keywords=cat;lemmings;puzzle;kids;
signature.asc
Description: OpenPGP digital signature