r6849 - in packages/trunk/funguloids/debian: . patches

[Andres Mejia]

Author: ceros-guest
Date: 2008-05-04 05:37:38 +0000 (Sun, 04 May 2008)
New Revision: 6849

Modified:
   packages/trunk/funguloids/debian/changelog
   packages/trunk/funguloids/debian/control
   packages/trunk/funguloids/debian/patches/makefile_modifications.diff
   packages/trunk/funguloids/debian/patches/series
   packages/trunk/funguloids/debian/rules
Log:
  * Fix problem with running funguloids with ogre-1.4.6 and ogre-1.4.7.
    Closes: #478105
  * Fix up patches and rules file.


Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog	2008-05-03 19:29:01 UTC (rev 6848)
+++ packages/trunk/funguloids/debian/changelog	2008-05-04 05:37:38 UTC (rev 6849)
@@ -1,8 +1,11 @@
-funguloids (1.06-6) UNRELEASED; urgency=low
+funguloids (1.06-6) unstable; urgency=low
 
-  * NOT RELEASED YET
+  [ Andres Mejia ]
+  * Fix problem with running funguloids with ogre-1.4.6 and ogre-1.4.7.
+    Closes: #478105
+  * Fix up patches and rules file.
 
- -- Vincent Fourmond <fourmond at debian.org>  Mon, 14 Jan 2008 20:47:21 +0100
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 04 May 2008 01:35:06 -0400
 
 funguloids (1.06-5) unstable; urgency=low
 

Modified: packages/trunk/funguloids/debian/control
===================================================================
--- packages/trunk/funguloids/debian/control	2008-05-03 19:29:01 UTC (rev 6848)
+++ packages/trunk/funguloids/debian/control	2008-05-04 05:37:38 UTC (rev 6849)
@@ -3,7 +3,7 @@
 Section: contrib/games
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 5), quilt, automake, liblua5.1-0-dev, libois-dev, libogre-dev (>= 1.4), libalut-dev, libopenal-dev, libogg-dev, libvorbis-dev, libmad0-dev
+Build-Depends: debhelper (>= 5), quilt, tofrodos, automake, liblua5.1-0-dev, libois-dev, libogre-dev (>= 1.4), libalut-dev, libopenal-dev, libogg-dev, libvorbis-dev, libmad0-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/funguloids/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/funguloids/?op=log

Modified: packages/trunk/funguloids/debian/patches/makefile_modifications.diff
===================================================================
--- packages/trunk/funguloids/debian/patches/makefile_modifications.diff	2008-05-03 19:29:01 UTC (rev 6848)
+++ packages/trunk/funguloids/debian/patches/makefile_modifications.diff	2008-05-04 05:37:38 UTC (rev 6849)
@@ -1,5 +1,8 @@
---- ./bin/music/Makefile.am~	2007-06-23 18:03:05.000000000 -0400
-+++ ./bin/music/Makefile.am	2007-06-23 18:04:00.000000000 -0400
+Some modifications to get some of the data files installed in the correct
+places. This is mainly for the purpose of building Debian packages.
+==========================================================================
+--- bin/music/Makefile.am~	2007-06-23 18:03:05.000000000 -0400
++++ bin/music/Makefile.am	2007-06-23 18:04:00.000000000 -0400
 @@ -1,12 +1,10 @@
 -musicinstall_DATA = playlist.lua
 +musicinstall_DATA = playlist.lua MarylandInMay.ogg
@@ -14,8 +17,8 @@
  
  
  distclean: clean
---- ./bin/Makefile.am~	2007-06-23 18:36:56.000000000 -0400
-+++ ./bin/Makefile.am	2007-06-23 18:39:50.000000000 -0400
+--- bin/Makefile.am~	2007-06-23 18:36:56.000000000 -0400
++++ bin/Makefile.am	2007-06-23 18:39:50.000000000 -0400
 @@ -4,7 +4,7 @@
  dist_pixmapinstall_DATA = funguloids.png
  dist_gameinstall_DATA = gamesettings.cfg

Modified: packages/trunk/funguloids/debian/patches/series
===================================================================
--- packages/trunk/funguloids/debian/patches/series	2008-05-03 19:29:01 UTC (rev 6848)
+++ packages/trunk/funguloids/debian/patches/series	2008-05-04 05:37:38 UTC (rev 6849)
@@ -1 +1,2 @@
-makefile_modifications.diff
+makefile_modifications.diff -p0
+size_chunks_reverse.patch -p0

Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules	2008-05-03 19:29:01 UTC (rev 6848)
+++ packages/trunk/funguloids/debian/rules	2008-05-04 05:37:38 UTC (rev 6849)
@@ -20,12 +20,17 @@
 # Specify available DEB_BUILD_OPTIONS, nostrip option is specified where
 # dh_strip is used under binary-arch target.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CXXFLAGS += -O0 -g -Wall
+  DEB_CXXFLAGS += -O0 -g -Wall
 else
-  CXXFLAGS += -O2 -g -Wall
+  DEB_CXXFLAGS += -O2 -g -Wall
 endif
 
-patch: patch-stamp
+fromdos: fromdos-stamp
+fromdos-stamp:
+	dh_testdir
+	fromdos -e src/mpakogre.cpp
+
+patch: fromdos patch-stamp
 patch-stamp:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
@@ -38,7 +43,7 @@
 	autoheader -f && \
 	automake --add-missing --force-missing --copy && \
 	autoconf -f && \
-	CXXFLAGS="$(CXXFLAGS)" \
+	CXXFLAGS="$(DEB_CXXFLAGS)" \
 		./configure $(confflags) --prefix=/usr --with-fmod=no
 	touch configure-stamp
 
@@ -48,7 +53,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: clean-stamp unpatch
+clean: clean-stamp unpatch todos
 clean-stamp:
 	dh_testdir
 	dh_testroot
@@ -62,6 +67,10 @@
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	[ ! -f patch-stamp ] || rm patch-stamp
 
+todos:
+	dh_testdir
+	todos -e src/mpakogre.cpp
+
 install: build
 	dh_testdir 
 	dh_testroot