r8000 - in packages/trunk/holotz-castle/debian: . patches

Miriam Ruiz miriam at alioth.debian.org
Wed Aug 27 18:03:46 UTC 2008 

Author: miriam
Date: 2008-08-27 18:03:45 +0000 (Wed, 27 Aug 2008)
New Revision: 8000

Modified:
   packages/trunk/holotz-castle/debian/changelog
   packages/trunk/holotz-castle/debian/control
   packages/trunk/holotz-castle/debian/holotz-castle-data.docs
   packages/trunk/holotz-castle/debian/patches/01_jlib_makefile.patch
   packages/trunk/holotz-castle/debian/patches/02_makefile.patch
   packages/trunk/holotz-castle/debian/patches/03_manpage.patch
   packages/trunk/holotz-castle/debian/patches/04_editor_manpage.patch
   packages/trunk/holotz-castle/debian/patches/series
   packages/trunk/holotz-castle/debian/rules
Log:
New Upstream Release



Modified: packages/trunk/holotz-castle/debian/changelog
===================================================================
--- packages/trunk/holotz-castle/debian/changelog	2008-08-26 23:48:56 UTC (rev 7999)
+++ packages/trunk/holotz-castle/debian/changelog	2008-08-27 18:03:45 UTC (rev 8000)
@@ -1,3 +1,16 @@
+holotz-castle (1.3.11-1) UNRELEASED; urgency=low
+
+  [ Miriam Ruiz ]
+  * New Upstream Release
+  * milanb levels are now included in the main source. Added
+    holotz-castle-milanb to Conflicts and Provides
+  * Bump Standards Version to 3.8.0
+  * Removed DM-Upload-Allowed: yes from debian/control
+  * Refreshed patches so that they apply on the newer code
+  * Manpages are now in man/ and not in doc/
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Wed, 27 Aug 2008 19:25:38 +0200
+
 holotz-castle (1.3.10-1) unstable; urgency=high
 
   [ Eddy Petrișor ]

Modified: packages/trunk/holotz-castle/debian/control
===================================================================
--- packages/trunk/holotz-castle/debian/control	2008-08-26 23:48:56 UTC (rev 7999)
+++ packages/trunk/holotz-castle/debian/control	2008-08-27 18:03:45 UTC (rev 8000)
@@ -5,11 +5,10 @@
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>
 Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), quilt,
  libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://www.mainreactor.net/holotzcastle/en/index_en.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/holotz-castle/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/holotz-castle/?op=log
-DM-Upload-Allowed: yes
 
 Package: holotz-castle
 Architecture: any
@@ -22,6 +21,8 @@
 
 Package: holotz-castle-data
 Architecture: all
+Conflicts: holotz-castle-milanb
+Provides: holotz-castle-milanb
 Description: platform game with high doses of mystery - data files
  This package contains data files for the Holotz's Castle game.
 

Modified: packages/trunk/holotz-castle/debian/holotz-castle-data.docs
===================================================================
--- packages/trunk/holotz-castle/debian/holotz-castle-data.docs	2008-08-26 23:48:56 UTC (rev 7999)
+++ packages/trunk/holotz-castle/debian/holotz-castle-data.docs	2008-08-27 18:03:45 UTC (rev 8000)
@@ -1,6 +1 @@
-MANUAL_EN.txt
-MANUAL_ES.txt
-MANUAL_FR.txt
-MANUAL_RU.txt
-MANUAL_EU.txt
-MANUAL_UA.txt
+doc/MANUAL_*.txt

Modified: packages/trunk/holotz-castle/debian/patches/01_jlib_makefile.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/01_jlib_makefile.patch	2008-08-26 23:48:56 UTC (rev 7999)
+++ packages/trunk/holotz-castle/debian/patches/01_jlib_makefile.patch	2008-08-27 18:03:45 UTC (rev 8000)
@@ -1,16 +1,17 @@
 # Copyright (C) 2006, by Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game. See debian/copyright.
 
-diff -ruN holotz-castle-1.3.8.orig/JLib/Makefile holotz-castle-1.3.8.new/JLib/Makefile
---- holotz-castle-1.3.8.orig/JLib/Makefile	2006-01-20 13:59:37.000000000 +0100
-+++ holotz-castle-1.3.8.new/JLib/Makefile	2006-09-23 15:58:26.000000000 +0200
+Index: holotz-castle-1.3.11-src/JLib/Makefile
+===================================================================
+--- holotz-castle-1.3.11-src.orig/JLib/Makefile	2008-08-23 20:36:06.000000000 +0200
++++ holotz-castle-1.3.11-src/JLib/Makefile	2008-08-27 19:30:48.000000000 +0200
 @@ -19,7 +19,8 @@
  endif
  
  # Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
--CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
+-CFLAGS=-I. -I/usr/local/include/SDL -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
 +MORE_CFLAGS= -O3
-+CFLAGS=-I. $(MORE_CFLAGS) -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
++CFLAGS=-I. -I/usr/local/include/SDL $(MORE_CFLAGS) -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
  
  # Sample LDFLAGS for applications
  # LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`

Modified: packages/trunk/holotz-castle/debian/patches/02_makefile.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/02_makefile.patch	2008-08-26 23:48:56 UTC (rev 7999)
+++ packages/trunk/holotz-castle/debian/patches/02_makefile.patch	2008-08-27 18:03:45 UTC (rev 8000)
@@ -1,9 +1,10 @@
 # Copyright (C) 2006, by Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game. See debian/copyright.  
 
-diff -ruN holotz-castle-1.3.8.orig/src/Makefile holotz-castle-1.3.8.new/src/Makefile
---- holotz-castle-1.3.8.orig/src/Makefile	2006-01-20 13:59:38.000000000 +0100
-+++ holotz-castle-1.3.8.new/src/Makefile	2006-09-23 15:58:27.000000000 +0200
+Index: holotz-castle-1.3.11-src/src/Makefile
+===================================================================
+--- holotz-castle-1.3.11-src.orig/src/Makefile	2008-08-23 20:36:07.000000000 +0200
++++ holotz-castle-1.3.11-src/src/Makefile	2008-08-27 19:32:58.000000000 +0200
 @@ -25,7 +25,7 @@
  HC_BASE = /usr/share/games/holotz-castle/
  HC_DATA = $(HC_BASE)game/
@@ -17,9 +18,9 @@
  
  # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
  # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
--CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
+-CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c
 +MORE_CFLAGS= -O3
-+CFLAGS=-I. -I../JLib $(MORE_CFLAGS) -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
++CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL $(MORE_CFLAGS) -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c
  LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
  
  

Modified: packages/trunk/holotz-castle/debian/patches/03_manpage.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/03_manpage.patch	2008-08-26 23:48:56 UTC (rev 7999)
+++ packages/trunk/holotz-castle/debian/patches/03_manpage.patch	2008-08-27 18:03:45 UTC (rev 8000)
@@ -1,9 +1,9 @@
 # Copyright (C) 2006, by Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game. See debian/copyright.  
 
-diff -ruN holotz-castle-1.3.8.orig/doc/holotz-castle.6 holotz-castle-1.3.8.new/doc/holotz-castle.6
---- holotz-castle-1.3.8.orig/doc/holotz-castle.6	2006-01-20 13:59:37.000000000 +0100
-+++ holotz-castle-1.3.8.new/doc/holotz-castle.6	2006-09-23 15:58:27.000000000 +0200
+diff -ruN holotz-castle-1.3.8.orig/man/holotz-castle.6 holotz-castle-1.3.8.new/doc/holotz-castle.6
+--- holotz-castle-1.3.8.orig/man/holotz-castle.6	2006-01-20 13:59:37.000000000 +0100
++++ holotz-castle-1.3.8.new/man/holotz-castle.6	2006-09-23 15:58:27.000000000 +0200
 @@ -5,7 +5,7 @@
  .SH "SYNOPSIS"
  .B holotz\-castle [\fI\-f\fR] [\fI\-w\fR] [\fI\-\-fps nn\fR] [\fI\-mWWxHHxBPP\fR]

Modified: packages/trunk/holotz-castle/debian/patches/04_editor_manpage.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/04_editor_manpage.patch	2008-08-26 23:48:56 UTC (rev 7999)
+++ packages/trunk/holotz-castle/debian/patches/04_editor_manpage.patch	2008-08-27 18:03:45 UTC (rev 8000)
@@ -1,9 +1,9 @@
 # Copyright (C) 2006, by Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game. See debian/copyright.  
 
-diff -ruN holotz-castle-1.3.8.orig/doc/holotz-castle-editor.6 holotz-castle-1.3.8.new/doc/holotz-castle-editor.6
---- holotz-castle-1.3.8.orig/doc/holotz-castle-editor.6	2006-01-20 13:59:37.000000000 +0100
-+++ holotz-castle-1.3.8.new/doc/holotz-castle-editor.6	2006-09-23 15:58:27.000000000 +0200
+diff -ruN holotz-castle-1.3.8.orig/man/holotz-castle-editor.6 holotz-castle-1.3.8.new/doc/holotz-castle-editor.6
+--- holotz-castle-1.3.8.orig/man/holotz-castle-editor.6	2006-01-20 13:59:37.000000000 +0100
++++ holotz-castle-1.3.8.new/man/holotz-castle-editor.6	2006-09-23 15:58:27.000000000 +0200
 @@ -4,7 +4,7 @@
  .SH "SYNOPSIS"
  .B holotz\-castle\-editor [\fI\-f\fR] [\fI\-w\fR] [\fI\-\-fps nn\fR] [\fI\-mWWxHHxBPP\fR] [\fI\-r RR\fR] [\fI\-c CC\fR] [\fI\-t theme\fR] \fI<story> <nr>\fR

Modified: packages/trunk/holotz-castle/debian/patches/series
===================================================================
--- packages/trunk/holotz-castle/debian/patches/series	2008-08-26 23:48:56 UTC (rev 7999)
+++ packages/trunk/holotz-castle/debian/patches/series	2008-08-27 18:03:45 UTC (rev 8000)
@@ -1,5 +1,5 @@
-01_jlib_makefile.patch -p1
-02_makefile.patch -p1
+01_jlib_makefile.patch 
+02_makefile.patch 
 03_manpage.patch -p1
 04_editor_manpage.patch -p1
 05_jlib.patch -p1

Modified: packages/trunk/holotz-castle/debian/rules
===================================================================
--- packages/trunk/holotz-castle/debian/rules	2008-08-26 23:48:56 UTC (rev 7999)
+++ packages/trunk/holotz-castle/debian/rules	2008-08-27 18:03:45 UTC (rev 8000)
@@ -22,7 +22,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f *-stamp
-
+	chmod -x res/stories/milanb/*
 	$(MAKE) clean
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
@@ -62,8 +62,8 @@
 	dh_testdir
 	dh_testroot
 	dh_installmenu
-	dh_installman -pholotz-castle doc/holotz-castle.6
-	dh_installman -pholotz-castle-editor doc/holotz-castle-editor.6
+	dh_installman -pholotz-castle man/holotz-castle.6
+	dh_installman -pholotz-castle-editor man/holotz-castle-editor.6
 	dh_link -pholotz-castle usr/share/doc/holotz-castle-data usr/share/doc/holotz-castle
 	dh_link -pholotz-castle-editor usr/share/doc/holotz-castle-data usr/share/doc/holotz-castle-editor
 	dh_desktop -pholotz-castle

More information about the Pkg-games-commits mailing list