r13683 - in packages/trunk/excellent-bifurcation/debian: . patches source

Vincent Cheng vincentc-guest at alioth.debian.org
Wed Jun 6 04:37:24 UTC 2012 

Author: vincentc-guest
Date: 2012-06-06 04:37:21 +0000 (Wed, 06 Jun 2012)
New Revision: 13683

Added:
   packages/trunk/excellent-bifurcation/debian/patches/fix_allegro_linker_flag.patch
   packages/trunk/excellent-bifurcation/debian/patches/fix_hurd_ftbfs.patch
Removed:
   packages/trunk/excellent-bifurcation/debian/patches/fix_link_alleg.patch
   packages/trunk/excellent-bifurcation/debian/source/local-options
Modified:
   packages/trunk/excellent-bifurcation/debian/changelog
   packages/trunk/excellent-bifurcation/debian/control
   packages/trunk/excellent-bifurcation/debian/copyright
   packages/trunk/excellent-bifurcation/debian/install
   packages/trunk/excellent-bifurcation/debian/patches/series
   packages/trunk/excellent-bifurcation/debian/rules
Log:
excellent-bifurcation: Update to release 0.0.20071015-5


Modified: packages/trunk/excellent-bifurcation/debian/changelog
===================================================================
--- packages/trunk/excellent-bifurcation/debian/changelog	2012-06-06 04:25:53 UTC (rev 13682)
+++ packages/trunk/excellent-bifurcation/debian/changelog	2012-06-06 04:37:21 UTC (rev 13683)
@@ -1,3 +1,14 @@
+excellent-bifurcation (0.0.20071015-5) unstable; urgency=low
+
+  * Add debian/patches/fix_allegro_linker_flag.patch to fix FTBFS; thanks to
+    Andreas Rönnquist for the patch. (Closes: #676026)
+  * Add debian/patches/fix_hurd_ftbfs.patch to fix FTBFS on hurd.
+  * Add myself to Uploaders.
+  * Remove build dependency on dh-buildinfo.
+  * Bump Standards-Version to 3.9.3 (no changes required).
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com>  Mon, 04 Jun 2012 16:54:32 -0700
+
 excellent-bifurcation (0.0.20071015-4) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/excellent-bifurcation/debian/control
===================================================================
--- packages/trunk/excellent-bifurcation/debian/control	2012-06-06 04:25:53 UTC (rev 13682)
+++ packages/trunk/excellent-bifurcation/debian/control	2012-06-06 04:37:21 UTC (rev 13683)
@@ -2,16 +2,22 @@
 Section: games
 Priority: extra
 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 (>= 8), dh-buildinfo, pkg-config,
- liballegro4.2-dev, libxdg-basedir-dev (>= 1.0.0)
-Standards-Version: 3.9.2
+Uploaders:
+ Miriam Ruiz <little_miry at yahoo.es>,
+ Barry deFreese <bdefreese at debian.org>,
+ Vincent Cheng <Vincentc1208 at gmail.com>
+Build-Depends:
+ debhelper (>= 8),
+ liballegro4.2-dev,
+ libxdg-basedir-dev (>= 1.0.0),
+ pkg-config
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/excellent-bifurcation/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/excellent-bifurcation/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/excellent-bifurcation/?op=log
 
 Package: excellent-bifurcation
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: abstract vertical shooter with two sides to play on
  Excellent Bifurcation is a vertical shooter in which you have two sides
  available to play on. Its graphics try to mimic the colours, sounds and

Modified: packages/trunk/excellent-bifurcation/debian/copyright
===================================================================
--- packages/trunk/excellent-bifurcation/debian/copyright	2012-06-06 04:25:53 UTC (rev 13682)
+++ packages/trunk/excellent-bifurcation/debian/copyright	2012-06-06 04:37:21 UTC (rev 13683)
@@ -1,11 +1,11 @@
 This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
 Tue, 23 Oct 2007 08:52:00 +0000.
 
-Upstream Author: 
+Upstream Author:
 
     Linley Henzell <l_henzell at yahoo.com.au>
 
-Copyright: 
+Copyright:
 
     Copyright (C) 2006-2007  Linley Henzell
 
@@ -15,12 +15,12 @@
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
- 
+
     This package is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
- 
+
     You should have received a copy of the GNU General Public License
     along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -37,9 +37,9 @@
 
 
 from: Miriam Ruiz <little.miry at gmail.com>
-to: l_henzell at yahoo.com.au	 
-date: 10-oct-2007 16:12	 
-topic: Question about the license of your games	 
+to: l_henzell at yahoo.com.au
+date: 10-oct-2007 16:12
+topic: Question about the license of your games
 
 Hi! :)
 
@@ -56,9 +56,9 @@
 
 
 from: Linley Henzell <l_henzell at yahoo.com.au>
-to: Miriam Ruiz <little.miry at gmail.com>	 
-date: 14-oct-2007 8:08	 
-topic: Re: Question about the license of your games	 
+to: Miriam Ruiz <little.miry at gmail.com>
+date: 14-oct-2007 8:08
+topic: Re: Question about the license of your games
 
 Hi there!
 
@@ -88,9 +88,9 @@
 
 
 from: Miriam Ruiz <little.miry at gmail.com>
-to: Linley Henzell <l_henzell at yahoo.com.au>	 
-date: 15-oct-2007 0:48	 
-topic: Re: Question about the license of your games	 
+to: Linley Henzell <l_henzell at yahoo.com.au>
+date: 15-oct-2007 0:48
+topic: Re: Question about the license of your games
 
 Thanks a lot for your answer, of course I can wait until you consider
 it's the best moment to release it. It would certainly be the best to
@@ -105,9 +105,9 @@
 
 
 from: Linley Henzell <l_henzell at yahoo.com.au>
-to: Miriam Ruiz <little.miry at gmail.com>	 
-date: 16-oct-2007 9:55	 
-topic: Re: Question about the license of your games	 
+to: Miriam Ruiz <little.miry at gmail.com>
+date: 16-oct-2007 9:55
+topic: Re: Question about the license of your games
 
 Cool. I'll send the Garden source through in a few
 weeks.
@@ -135,8 +135,8 @@
 
 
 from: Miriam Ruiz <little.miry at gmail.com>
-to: Linley Henzell <l_henzell at yahoo.com.au>	 
-date: 22-oct-2007 19:57	 
+to: Linley Henzell <l_henzell at yahoo.com.au>
+date: 22-oct-2007 19:57
 topic: Re: Question about the license of your games
 
 Hi! :)
@@ -156,9 +156,9 @@
 
 
 from: Linley Henzell <l_henzell at yahoo.com.au>
-to: Miriam Ruiz <little.miry at gmail.com>	 
-date: 23-oct-2007 10:13	 
-topic: Re: Question about the license of your games	 
+to: Miriam Ruiz <little.miry at gmail.com>
+date: 23-oct-2007 10:13
+topic: Re: Question about the license of your games
 
 Hi there,
 

Modified: packages/trunk/excellent-bifurcation/debian/install
===================================================================
--- packages/trunk/excellent-bifurcation/debian/install	2012-06-06 04:25:53 UTC (rev 13682)
+++ packages/trunk/excellent-bifurcation/debian/install	2012-06-06 04:37:21 UTC (rev 13683)
@@ -1,4 +1,4 @@
+gfx usr/share/games/excellent-bifurcation
+init.txt usr/share/games/excellent-bifurcation
 src/excellent-bifurcation usr/games
-gfx usr/share/games/excellent-bifurcation
 wavs usr/share/games/excellent-bifurcation
-init.txt usr/share/games/excellent-bifurcation

Added: packages/trunk/excellent-bifurcation/debian/patches/fix_allegro_linker_flag.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/fix_allegro_linker_flag.patch	                        (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/patches/fix_allegro_linker_flag.patch	2012-06-06 04:37:21 UTC (rev 13683)
@@ -0,0 +1,15 @@
+Description: Link against -lalleg instead of -lalleg-4.2.2 to fix FTBFS
+Author: Andreas Rönnquist <gusnan at gusnan.se>
+Last-Update: 2012-06-04
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,7 +3,7 @@
+ PKGCONFIG_FILES=libxdg-basedir
+ PKGCONFIG_CFLAGS= `pkg-config $(PKGCONFIG_FILES) --cflags`
+ PKGCONFIG_LDFLAGS= `pkg-config $(PKGCONFIG_FILES) --libs`
+-LDFLAGS=-lalleg-4.2.2
++LDFLAGS=-lalleg
+ SOURCES=$(shell find . -name "*.c")
+ OBJECTS=$(SOURCES:.c=.o)
+ EXECUTABLE=excellent-bifurcation

Added: packages/trunk/excellent-bifurcation/debian/patches/fix_hurd_ftbfs.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/fix_hurd_ftbfs.patch	                        (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/patches/fix_hurd_ftbfs.patch	2012-06-06 04:37:21 UTC (rev 13683)
@@ -0,0 +1,38 @@
+Description: Fix FTBFS on hurd by defining PATH_MAX
+Author: Vincent Cheng <Vincentc1208 at gmail.com>
+Last-Update: 2012-06-04
+
+--- a/src/sound.c
++++ b/src/sound.c
+@@ -47,6 +47,10 @@
+ 
+ #include <limits.h>
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ //int debug_sound [5];
+ 
+ 
+@@ -886,6 +890,7 @@
+   {
+    mtrack_position [i] = 0;
+    mtrack_count [i] = 0;
++
+ //   mtrack_force_beat [i] = -1;
+ //   mtrack_glitchy [i] = 0;
+   }
+--- a/src/main.c
++++ b/src/main.c
+@@ -54,6 +54,10 @@
+ #include <sys/stat.h>
+ #include <limits.h>
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ // timer interupt functions and variables:
+ void framecount(void);
+ 

Deleted: packages/trunk/excellent-bifurcation/debian/patches/fix_link_alleg.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/fix_link_alleg.patch	2012-06-06 04:25:53 UTC (rev 13682)
+++ packages/trunk/excellent-bifurcation/debian/patches/fix_link_alleg.patch	2012-06-06 04:37:21 UTC (rev 13683)
@@ -1,11 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -3,7 +3,7 @@
- PKGCONFIG_FILES=libxdg-basedir
- PKGCONFIG_CFLAGS= `pkg-config $(PKGCONFIG_FILES) --cflags`
- PKGCONFIG_LDFLAGS= `pkg-config $(PKGCONFIG_FILES) --libs`
--LDFLAGS=-lalleg-4.2.2
-+LDFLAGS=`allegro-config --libs`
- SOURCES=$(shell find . -name "*.c")
- OBJECTS=$(SOURCES:.c=.o)
- EXECUTABLE=excellent-bifurcation

Modified: packages/trunk/excellent-bifurcation/debian/patches/series
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/series	2012-06-06 04:25:53 UTC (rev 13682)
+++ packages/trunk/excellent-bifurcation/debian/patches/series	2012-06-06 04:37:21 UTC (rev 13683)
@@ -2,4 +2,5 @@
 windowed.patch
 config_file.patch
 link-with-libm.patch
-fix_link_alleg.patch
+fix_allegro_linker_flag.patch
+fix_hurd_ftbfs.patch

Modified: packages/trunk/excellent-bifurcation/debian/rules
===================================================================
--- packages/trunk/excellent-bifurcation/debian/rules	2012-06-06 04:25:53 UTC (rev 13682)
+++ packages/trunk/excellent-bifurcation/debian/rules	2012-06-06 04:37:21 UTC (rev 13683)
@@ -8,5 +8,4 @@
 	dh_clean
 
 override_dh_auto_build:
-	$(MAKE) -C src \
-	CFLAGS="-DDATA_DIR=\\\"/usr/share/games/excellent-bifurcation\\\""
+	$(MAKE) -C src CFLAGS="$(CFLAGS) -DDATA_DIR=\\\"/usr/share/games/excellent-bifurcation\\\""

Deleted: packages/trunk/excellent-bifurcation/debian/source/local-options
===================================================================
--- packages/trunk/excellent-bifurcation/debian/source/local-options	2012-06-06 04:25:53 UTC (rev 13682)
+++ packages/trunk/excellent-bifurcation/debian/source/local-options	2012-06-06 04:37:21 UTC (rev 13683)
@@ -1 +0,0 @@
-abort-on-upstream-changes

More information about the Pkg-games-commits mailing list