r15559 - in packages/trunk/raincat/debian: . patches

Markus Koschany apo-guest at moszumanska.debian.org
Tue Oct 27 21:13:59 UTC 2015 

Author: apo-guest
Date: 2015-10-27 21:13:59 +0000 (Tue, 27 Oct 2015)
New Revision: 15559

Added:
   packages/trunk/raincat/debian/patches/opengl-2.9.patch
   packages/trunk/raincat/debian/patches/series
Modified:
   packages/trunk/raincat/debian/changelog
   packages/trunk/raincat/debian/control
   packages/trunk/raincat/debian/copyright
   packages/trunk/raincat/debian/raincat.desktop
   packages/trunk/raincat/debian/raincat.install
   packages/trunk/raincat/debian/rules
Log:
Fix FTBFS. #789108


Modified: packages/trunk/raincat/debian/changelog
===================================================================
--- packages/trunk/raincat/debian/changelog	2015-10-22 17:28:56 UTC (rev 15558)
+++ packages/trunk/raincat/debian/changelog	2015-10-27 21:13:59 UTC (rev 15559)
@@ -1,8 +1,25 @@
-raincat (1.1.1.2-2) UNRELEASED; urgency=low
+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.
+  * Drop raincat-dbg package because it is not of sufficient use for most
+    users. It also appears that the debug file did not contain debug
+    symbols.
+  * Remove dh-buildinfo from Build-Depends. It is no strictly required
+    build-dependency.
+  * wrap-and-sort -sa.
+  * Vcs-Browser: Use https.
+
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:22:01 +0200
+ -- Markus Koschany <apo at gambaru.de>  Tue, 27 Oct 2015 21:54:22 +0100
 
 raincat (1.1.1.2-1) unstable; urgency=low
 

Modified: packages/trunk/raincat/debian/control
===================================================================
--- packages/trunk/raincat/debian/control	2015-10-22 17:28:56 UTC (rev 15558)
+++ packages/trunk/raincat/debian/control	2015-10-27 21:13:59 UTC (rev 15559)
@@ -2,22 +2,38 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 9), dh-buildinfo, sng, ghc,
- freeglut3-dev, libgl1-mesa-dev, libglu1-mesa-dev,
- libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
- 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
+Uploaders:
+ Miriam Ruiz <little_miry at yahoo.es>,
+ Barry deFreese <bdefreese at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ freeglut3-dev,
+ ghc,
+ libghc-extensible-exceptions-dev,
+ libghc-glut-dev,
+ libghc-mtl-dev,
+ libghc-opengl-dev,
+ libghc-random-dev,
+ libghc-sdl-dev,
+ libghc-sdl-image-dev,
+ libghc-sdl-mixer-dev,
+ libgl1-mesa-dev,
+ libglu1-mesa-dev,
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl1.2-dev,
+ sng
+Standards-Version: 3.9.6
 Homepage: http://raincat.bysusanlin.com/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/raincat/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/raincat/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/raincat/
 
 Package: raincat
 Architecture: any
-Depends: raincat-data (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: raincat-dbg (= ${binary:Version})
+Depends:
+ raincat-data (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: 2D puzzle game featuring a fuzzy little cat
  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
@@ -25,8 +41,10 @@
 
 Package: raincat-data
 Architecture: all
-Depends: ${misc:Depends}
-Recommends: raincat
+Depends:
+ ${misc:Depends}
+Recommends:
+ raincat
 Description: 2D puzzle game featuring a fuzzy little cat - data files
  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
@@ -34,14 +52,3 @@
  .
  This package contains the data files.
 
-Package: raincat-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: raincat (= ${binary:Version}), ${shlibs:Depends}, ${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
- level. Just mind the rain, puddles, and loose fire hydrants in your path!
- .
- This package contains the debugging symbols.

Modified: packages/trunk/raincat/debian/copyright
===================================================================
--- packages/trunk/raincat/debian/copyright	2015-10-22 17:28:56 UTC (rev 15558)
+++ packages/trunk/raincat/debian/copyright	2015-10-27 21:13:59 UTC (rev 15559)
@@ -2,18 +2,18 @@
 Upstream-Name: Raincat
 Upstream-Contact: Garrick Chin <gchin at 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_miry at yahoo.es>
-Debianized-Date: Sat, 30 Jan 2010 19:15:17 +0100
+ Debianized-By: Miriam Ruiz <little_miry at 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_miry at 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

Added: packages/trunk/raincat/debian/patches/opengl-2.9.patch
===================================================================
--- packages/trunk/raincat/debian/patches/opengl-2.9.patch	                        (rev 0)
+++ packages/trunk/raincat/debian/patches/opengl-2.9.patch	2015-10-27 21:13:59 UTC (rev 15559)
@@ -0,0 +1,39 @@
+From: Markus Koschany <apo at 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
+ 

Added: packages/trunk/raincat/debian/patches/series
===================================================================
--- packages/trunk/raincat/debian/patches/series	                        (rev 0)
+++ packages/trunk/raincat/debian/patches/series	2015-10-27 21:13:59 UTC (rev 15559)
@@ -0,0 +1 @@
+opengl-2.9.patch

Modified: packages/trunk/raincat/debian/raincat.desktop
===================================================================
--- packages/trunk/raincat/debian/raincat.desktop	2015-10-22 17:28:56 UTC (rev 15558)
+++ packages/trunk/raincat/debian/raincat.desktop	2015-10-27 21:13:59 UTC (rev 15559)
@@ -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;

Modified: packages/trunk/raincat/debian/raincat.install
===================================================================
--- packages/trunk/raincat/debian/raincat.install	2015-10-22 17:28:56 UTC (rev 15558)
+++ packages/trunk/raincat/debian/raincat.install	2015-10-27 21:13:59 UTC (rev 15559)
@@ -1,4 +1,4 @@
+debian/*.desktop usr/share/applications/
+debian/*.png usr/share/pixmaps/
+debian/*.xpm usr/share/pixmaps/
 dist/build/raincat/raincat usr/games/
-debian/*.xpm usr/share/pixmaps/
-debian/*.png usr/share/pixmaps/
-debian/*.desktop usr/share/applications/

Modified: packages/trunk/raincat/debian/rules
===================================================================
--- packages/trunk/raincat/debian/rules	2015-10-22 17:28:56 UTC (rev 15558)
+++ packages/trunk/raincat/debian/rules	2015-10-27 21:13:59 UTC (rev 15559)
@@ -15,5 +15,3 @@
 	if [ -x Setup ]; then ./Setup clean; fi
 	rm -f Setup Setup.o Setup.hi
 
-override_dh_strip:
-	dh_strip --dbg-package=raincat-dbg

More information about the Pkg-games-commits mailing list