Author: bdefreese Date: 2013-06-22 14:48:57 +0000 (Sat, 22 Jun 2013) New Revision: 14300
Added: packages/trunk/raincat/debian/source/ packages/trunk/raincat/debian/source/format packages/trunk/raincat/debian/watch Removed: packages/trunk/raincat/debian/README.source packages/trunk/raincat/debian/patches/fix_haskell_modules.patch packages/trunk/raincat/debian/patches/ftbfs.patch packages/trunk/raincat/debian/patches/path.patch packages/trunk/raincat/debian/patches/series Modified: packages/trunk/raincat/debian/changelog packages/trunk/raincat/debian/compat packages/trunk/raincat/debian/control packages/trunk/raincat/debian/copyright packages/trunk/raincat/debian/raincat.install packages/trunk/raincat/debian/rules Log: New upstream. Significant packaging updates. Deleted: packages/trunk/raincat/debian/README.source =================================================================== --- packages/trunk/raincat/debian/README.source 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/README.source 2013-06-22 14:48:57 UTC (rev 14300) @@ -1 +0,0 @@ -See /usr/share/doc/quilt/README.source Modified: packages/trunk/raincat/debian/changelog =================================================================== --- packages/trunk/raincat/debian/changelog 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/changelog 2013-06-22 14:48:57 UTC (rev 14300) @@ -1,8 +1,17 @@ raincat (1.1.1.2-1) UNRELEASED; urgency=low * New upstream release. - + Switch upstream source and update watch file. + + Uses extensible exceptions. (Closes: #705123). + + Thanks to Colin Watson for the info. + + Switch upstream source and add watch file. + + New upstream source location: hackage.haskell.org. + * Update ghc build-deps. (Closes: #705122, #713131). + * Make source format 3.0 quilt. + + Drop quilt build-dep. * Add myself to uploaders. + * Remove debian/README.source as it contains nothing useful. + * Move to dh style build system. + * Bump debhelper build-dep and compat to 9. * Bump Standards Version to 3.9.4. -- Barry deFreese <bdefre...@debian.org> Sat, 22 Jun 2013 04:27:17 -0400 Modified: packages/trunk/raincat/debian/compat =================================================================== --- packages/trunk/raincat/debian/compat 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/compat 2013-06-22 14:48:57 UTC (rev 14300) @@ -1 +1 @@ -7 +9 Modified: packages/trunk/raincat/debian/control =================================================================== --- packages/trunk/raincat/debian/control 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/control 2013-06-22 14:48:57 UTC (rev 14300) @@ -3,12 +3,12 @@ Priority: optional Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Miriam Ruiz <little_m...@yahoo.es>, Barry deFreese <bdefre...@debian.org> -Build-Depends: debhelper (>= 7), dh-buildinfo, quilt, sng, ghc6, +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, - libghc6-ghc-mtl-dev, libghc6-datetime-dev, - libghc6-glut-dev, libghc6-opengl-dev, libghc6-sdl-dev, - libghc6-sdl-image-dev, libghc6-sdl-mixer-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 Homepage: http://raincat.bysusanlin.com/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/raincat/ Modified: packages/trunk/raincat/debian/copyright =================================================================== --- packages/trunk/raincat/debian/copyright 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/copyright 2013-06-22 14:48:57 UTC (rev 14300) @@ -1,7 +1,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Raincat Upstream-Contact: Garrick Chin <gc...@cmu.edu> -Source: http://www.contrib.andrew.cmu.edu/~gchin/downloads/Raincat.tar.gz +Source: http://hackage.haskell.org/packages/archive/Raincat/1.1.1.2/Raincat-1.1.1.2.tar.gz +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 Deleted: packages/trunk/raincat/debian/patches/fix_haskell_modules.patch =================================================================== --- packages/trunk/raincat/debian/patches/fix_haskell_modules.patch 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/patches/fix_haskell_modules.patch 2013-06-22 14:48:57 UTC (rev 14300) @@ -1,111 +0,0 @@ -Description: Update module imports, fix ftbfs -Author: Vincent Legout <vleg...@debian.org> -Last-Update: 2012-04-01 -Bug-Debian: http://bugs.debian.org/665069 - -Index: raincat-1.1/src/Cat/Cat.hs -=================================================================== ---- raincat-1.1.orig/src/Cat/Cat.hs 2010-01-28 19:31:39.000000000 +0100 -+++ raincat-1.1/src/Cat/Cat.hs 2012-04-01 10:14:33.572911584 +0200 -@@ -30,7 +30,7 @@ - updateCatAnim, - updateCatItemDuration) where - --import Maybe -+import Data.Maybe - import Graphics.Rendering.OpenGL as GL - import Nxt.Graphics - import Nxt.Types -Index: raincat-1.1/src/Game/GameInit.hs -=================================================================== ---- raincat-1.1.orig/src/Game/GameInit.hs 2010-01-28 19:31:39.000000000 +0100 -+++ raincat-1.1/src/Game/GameInit.hs 2012-04-01 10:14:33.572911584 +0200 -@@ -1,7 +1,7 @@ - module Game.GameInit - (gameInit) where - --import Maybe -+import Data.Maybe - import Data.IORef - import World.World - import qualified Nxt.Graphics -Index: raincat-1.1/src/Game/GameMain.hs -=================================================================== ---- raincat-1.1.orig/src/Game/GameMain.hs 2010-01-28 19:31:39.000000000 +0100 -+++ raincat-1.1/src/Game/GameMain.hs 2012-04-01 10:14:33.580911584 +0200 -@@ -1,8 +1,8 @@ - module Game.GameMain - (gameMain) where - --import List --import Maybe -+import Data.List -+import Data.Maybe - import Control.Monad.State - import Data.IORef - import qualified Graphics.UI.GLUT as Glut -Index: raincat-1.1/src/Items/ItemEffects.hs -=================================================================== ---- raincat-1.1.orig/src/Items/ItemEffects.hs 2010-01-28 19:31:38.000000000 +0100 -+++ raincat-1.1/src/Items/ItemEffects.hs 2012-04-01 10:14:33.600911583 +0200 -@@ -18,7 +18,7 @@ - pogostickEffect2, - wrenchEffect) where - --import Maybe -+import Data.Maybe - import Graphics.Rendering.OpenGL as GL - import Nxt.Graphics - import Nxt.Types -Index: raincat-1.1/src/Items/Items.hs -=================================================================== ---- raincat-1.1.orig/src/Items/Items.hs 2010-01-28 19:31:38.000000000 +0100 -+++ raincat-1.1/src/Items/Items.hs 2012-04-01 10:14:33.600911583 +0200 -@@ -17,7 +17,7 @@ - drawItemBut, - mouseOverItemBut) where - --import Maybe -+import Data.Maybe - import Graphics.Rendering.OpenGL as GL - import Nxt.Graphics - import Nxt.Types -Index: raincat-1.1/src/Level/Level.hs -=================================================================== ---- raincat-1.1.orig/src/Level/Level.hs 2010-01-28 19:31:40.000000000 +0100 -+++ raincat-1.1/src/Level/Level.hs 2012-04-01 10:14:33.600911583 +0200 -@@ -16,7 +16,7 @@ - openLevel) where - - import Nxt.Types --import IO -+import System.IO - import Control.Exception - import Settings.DisplaySettings - import Nxt.Types -Index: raincat-1.1/src/Menu/PostVictory.hs -=================================================================== ---- raincat-1.1.orig/src/Menu/PostVictory.hs 2010-01-28 19:31:39.000000000 +0100 -+++ raincat-1.1/src/Menu/PostVictory.hs 2012-04-01 10:14:33.600911583 +0200 -@@ -2,7 +2,7 @@ - (postVictoryMain, - postVictoryDraw) where - --import Maybe -+import Data.Maybe - import Graphics.Rendering.OpenGL as GL hiding (get) - import Graphics.UI.GLUT hiding (get) - import Data.IORef -Index: raincat-1.1/src/Rain/Rain.hs -=================================================================== ---- raincat-1.1.orig/src/Rain/Rain.hs 2010-01-28 19:31:38.000000000 +0100 -+++ raincat-1.1/src/Rain/Rain.hs 2012-04-01 10:14:33.600911583 +0200 -@@ -4,7 +4,7 @@ - rainRect, - rainPoly) where - --import Random -+import System.Random - import Graphics.Rendering.OpenGL - import World.World - import Panels.MainPanel Deleted: packages/trunk/raincat/debian/patches/ftbfs.patch =================================================================== --- packages/trunk/raincat/debian/patches/ftbfs.patch 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/patches/ftbfs.patch 2013-06-22 14:48:57 UTC (rev 14300) @@ -1,14 +0,0 @@ -Description: Fix build with newer ghc -Author: Christoph Egger <christ...@debian.org> - -Index: raincat-1.1/src/Main.hs -=================================================================== ---- raincat-1.1.orig/src/Main.hs 2010-01-28 19:31:38.000000000 +0100 -+++ raincat-1.1/src/Main.hs 2011-05-28 20:43:13.640559007 +0200 -@@ -1,5 +1,5 @@ - module Main -- () where -+ (main) where - - import Graphics.UI.GLUT - import Data.Maybe Deleted: packages/trunk/raincat/debian/patches/path.patch =================================================================== --- packages/trunk/raincat/debian/patches/path.patch 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/patches/path.patch 2013-06-22 14:48:57 UTC (rev 14300) @@ -1,11 +0,0 @@ -Description: Fix installation path -Author: Miriam Ruiz <little_m...@yahoo.es> - ---- a/src/Settings/Path.hs -+++ b/src/Settings/Path.hs -@@ -2,4 +2,4 @@ module Settings.Path - (dataPath) where - - dataPath :: [Char] --dataPath = "./" -+dataPath = "/usr/share/games/raincat/" Deleted: packages/trunk/raincat/debian/patches/series =================================================================== --- packages/trunk/raincat/debian/patches/series 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/patches/series 2013-06-22 14:48:57 UTC (rev 14300) @@ -1,3 +0,0 @@ -path.patch -ftbfs.patch -fix_haskell_modules.patch Modified: packages/trunk/raincat/debian/raincat.install =================================================================== --- packages/trunk/raincat/debian/raincat.install 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/raincat.install 2013-06-22 14:48:57 UTC (rev 14300) @@ -1,4 +1,4 @@ -raincat usr/games/ +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 2013-06-22 12:18:13 UTC (rev 14299) +++ packages/trunk/raincat/debian/rules 2013-06-22 14:48:57 UTC (rev 14300) @@ -1,90 +1,19 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ -config: config-stamp -config-stamp: - dh_testdir - [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch +override_dh_auto_configure: + ghc --make Setup + ./Setup configure --datadir=/usr/share/games/raincat --datasubdir= + +override_dh_auto_build: cd debian; for f in *.sng; do sng "$$f"; done - touch $@ + ./Setup build -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: config - dh_testdir - cd src && ghc -O --make Main.hs - mv src/Main raincat - touch $@ +override_dh_auto_clean: + if [ -x Setup ]; then ./Setup clean; fi + rm -f Setup Setup.o Setup.hi -clean: - dh_testdir - dh_testroot - rm -fv build-stamp config-stamp - rm -fv raincat src/Main - rm -fv `find . -name "*.o"` - rm -fv `find . -name "*.hi"` - rm -fv debian/*.png - [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs -# $(MAKE) DESTDIR=$(CURDIR)/debian/raincat install - -# Build architecture-independent files here. -binary-indep: install - -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install - dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman debian/raincat.6 -# dh_desktop - dh_link +override_dh_strip: dh_strip --dbg-package=raincat-dbg - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - [ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -get-orig-source: - rm -fv Raincat.tar.gz - wget http://www.contrib.andrew.cmu.edu/~gchin/downloads/Raincat.tar.gz - rm -rfv raincat - tar xvfz Raincat.tar.gz - cd raincat && rm -fv raincat src/Main - cd raincat && rm -fv `find . -name "*.o"` - cd raincat && rm -fv `find . -name "*.hi"` - mv raincat raincat-1.1 - rm -fv ../raincat_1.1.orig.tar.gz - tar cvfz ../raincat_1.1.orig.tar.gz raincat-1.1 - rm -rfv raincat-1.1 - -binary: binary-indep binary-arch -.PHONY: config build clean binary-indep binary-arch binary install get-orig-source Added: packages/trunk/raincat/debian/source/format =================================================================== --- packages/trunk/raincat/debian/source/format (rev 0) +++ packages/trunk/raincat/debian/source/format 2013-06-22 14:48:57 UTC (rev 14300) @@ -0,0 +1 @@ +3.0 (quilt) Added: packages/trunk/raincat/debian/watch =================================================================== --- packages/trunk/raincat/debian/watch (rev 0) +++ packages/trunk/raincat/debian/watch 2013-06-22 14:48:57 UTC (rev 14300) @@ -0,0 +1,5 @@ +version=3 +opts="downloadurlmangle=s|archive/([\w\d_-]+)/([\d\.]+)/|archive/$1/$2/$1-$2.tar.gz|,\ +filenamemangle=s|(.*)/$|foo-$1.tar.gz|" \ + http://hackage.haskell.org/packages/archive/Raincat \ + ([\d\.]*\d)/ _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits