r10608 - in packages/trunk/ceferino/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2009-12-12 15:22:59 +0000 (Sat, 12 Dec 2009)
New Revision: 10608

Added:
   packages/trunk/ceferino/debian/patches/07_gcc_4.4.patch
Modified:
   packages/trunk/ceferino/debian/changelog
   packages/trunk/ceferino/debian/control
   packages/trunk/ceferino/debian/patches/series
   packages/trunk/ceferino/debian/rules
Log:
  * Update my e-mail address.
  * Don't call specific autotools versions in rules if we aren't b-d them.
  * 07_gcc_4.4.patch - Fix FTBFS on gcc-4.4. (Closes: #560521).
Refresh changelog.


Modified: packages/trunk/ceferino/debian/changelog
===================================================================
--- packages/trunk/ceferino/debian/changelog	2009-12-12 14:13:26 UTC (rev 10607)
+++ packages/trunk/ceferino/debian/changelog	2009-12-12 15:22:59 UTC (rev 10608)
@@ -1,4 +1,4 @@
-ceferino (0.97.8-3) UNRELEASED; urgency=low
+ceferino (0.97.8-3) unstable; urgency=low
 
   [ Roland Clobus <rclobus at bigfoot.com> ]
   * 03_fix_typo.diff: Contents moved to 03_english_texts.patch
@@ -17,8 +17,13 @@
   [ Evgeni Golov ]
   * Update watchfile.
 
- -- Gonéri Le Bouder <goneri at rulezlan.org>  Mon, 07 Apr 2008 18:17:50 +0200
+  [ Barry deFreese ]
+  * Update my e-mail address.
+  * Don't call specific autotools versions in rules if we aren't b-d them.
+  * 07_gcc_4.4.patch - Fix FTBFS on gcc-4.4. (Closes: #560521).
 
+ -- Barry deFreese <bdefreese at debian.org>  Sat, 12 Dec 2009 10:01:33 -0500
+
 ceferino (0.97.8-2) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/ceferino/debian/control
===================================================================
--- packages/trunk/ceferino/debian/control	2009-12-12 14:13:26 UTC (rev 10607)
+++ packages/trunk/ceferino/debian/control	2009-12-12 15:22:59 UTC (rev 10608)
@@ -2,7 +2,7 @@
 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 <bddebian at comcast.net>,
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>,
  Bas Wijnen <wijnen at debian.org>
 Build-Depends: debhelper (>= 5.0.37.2), automake, autoconf (>= 2.53),
  gettext, quilt, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, cvs

Added: packages/trunk/ceferino/debian/patches/07_gcc_4.4.patch
===================================================================
--- packages/trunk/ceferino/debian/patches/07_gcc_4.4.patch	                        (rev 0)
+++ packages/trunk/ceferino/debian/patches/07_gcc_4.4.patch	2009-12-12 15:22:59 UTC (rev 10608)
@@ -0,0 +1,14 @@
+Description: Fix nivel class to user proper var.
+Index: ceferino-0.97.8/src/nivel.h
+===================================================================
+--- ceferino-0.97.8.orig/src/nivel.h	2009-12-12 10:03:36.000000000 -0500
++++ ceferino-0.97.8/src/nivel.h	2009-12-12 10:04:23.000000000 -0500
+@@ -34,7 +34,7 @@
+ class nivel
+ {
+ 	public:
+-		void iniciar(juego *_pjuego, grafico *grafico, grafico *pfondos, SDL_Surface *fondo);
++		void iniciar(juego *_pjuego, grafico *ingrafico, grafico *pfondos, SDL_Surface *fondo);
+ 		int avanzar_nivel(int salto = 1);
+ 		int reiniciar_nivel(void);
+ 		int get_dist_suelo(int x, int y, int max);

Modified: packages/trunk/ceferino/debian/patches/series
===================================================================
--- packages/trunk/ceferino/debian/patches/series	2009-12-12 14:13:26 UTC (rev 10607)
+++ packages/trunk/ceferino/debian/patches/series	2009-12-12 15:22:59 UTC (rev 10608)
@@ -3,3 +3,4 @@
 04_align_high_scores.patch
 05_force_latin1.patch
 06_show_loading_of_font_at_right_time.patch
+07_gcc_4.4.patch

Modified: packages/trunk/ceferino/debian/rules
===================================================================
--- packages/trunk/ceferino/debian/rules	2009-12-12 14:13:26 UTC (rev 10607)
+++ packages/trunk/ceferino/debian/rules	2009-12-12 15:22:59 UTC (rev 10608)
@@ -23,9 +23,9 @@
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
 
 	autopoint --force
-	aclocal-1.10 --force
+	aclocal --force
 	autoheader --force
-	automake-1.10 --add-missing --force-missing
+	automake --add-missing --force-missing
 	autoconf --force
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games \