r13068 - in packages/trunk/a7xpg/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2012-01-05 18:46:46 +0000 (Thu, 05 Jan 2012)
New Revision: 13068

Modified:
   packages/trunk/a7xpg/debian/changelog
   packages/trunk/a7xpg/debian/control
   packages/trunk/a7xpg/debian/patches/makefile.patch
   packages/trunk/a7xpg/debian/rules
Log:
[a7xpg] ensure builds use D version 1

Modified: packages/trunk/a7xpg/debian/changelog
===================================================================
--- packages/trunk/a7xpg/debian/changelog	2012-01-03 11:43:45 UTC (rev 13067)
+++ packages/trunk/a7xpg/debian/changelog	2012-01-05 18:46:46 UTC (rev 13068)
@@ -1,3 +1,15 @@
+a7xpg (0.11.dfsg1-7) unstable; urgency=low
+
+  * Build using gdc-v1, instead of gdc (v2). Closes: #653083,
+    thanks to Matthias Klose for the report and the patch
+  * Update to standards to 3.9.2
+  * Provide build-indep and build-arch targets
+  * Drop ^M in the debian Makefile
+  * B-Dep on gdc-v1 (>= 4.6.2-4~) to avoid FTBS due to broken gdmd-v1
+    symlink
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 05 Jan 2012 19:45:17 +0100
+
 a7xpg (0.11.dfsg1-6) unstable; urgency=low
 
   [ Jordan Metzmeier ]

Modified: packages/trunk/a7xpg/debian/control
===================================================================
--- packages/trunk/a7xpg/debian/control	2012-01-03 11:43:45 UTC (rev 13067)
+++ packages/trunk/a7xpg/debian/control	2012-01-05 18:46:46 UTC (rev 13068)
@@ -3,10 +3,10 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>, Vincent Fourmond <fourmond at debian.org>
-Build-Depends: debhelper (>= 5), gdc,
+Build-Depends: debhelper (>= 5), gdc-v1 (>= 4.6.2-4~),
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsdl1.2-dev, libsdl-mixer1.2-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/a7xpg_e.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/a7xpg/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/a7xpg/?op=log

Modified: packages/trunk/a7xpg/debian/patches/makefile.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/makefile.patch	2012-01-03 11:43:45 UTC (rev 13067)
+++ packages/trunk/a7xpg/debian/patches/makefile.patch	2012-01-05 18:46:46 UTC (rev 13068)
@@ -1,45 +1,45 @@
-# Copyright (C) 2007  Miriam Ruiz <little_miry at yahoo.es>
-# Distributed under the same license as the game. See debian/copyright.
-
+# Copyright (C) 2007  Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
 Index: a7xpg-0.11.dfsg1/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ a7xpg-0.11.dfsg1/Makefile	2007-08-29 17:32:50.000000000 +0000
 @@ -0,0 +1,37 @@
-+
-+SOURCES=$(shell find src -name "*.d")
-+OBJS=$(SOURCES:.d=.o)
-+LSOURCES=$(shell find import -name "*.d")
-+LOBJS=$(LSOURCES:.d=.o)
-+CSOURCES=$(shell find src -name "*.c")
-+COBJS=$(CSOURCES:.c=.o)
-+
-+LDFLAGS=
-+CFLAGS=-O2 -Wall
-+DFLAGS=-O -release
-+#DFLAGS=-g -debug
-+CC=gcc
-+DC=gdmd
-+LIBS=-lGL `sdl-config --libs` -lSDL_mixer 
-+EXE=a7xpg
-+
-+all: $(EXE)
-+
-+$(EXE): $(LOBJS) $(OBJS) $(COBJS)
-+	gdc $(LDFLAGS) -o $@ $+ $(LIBS)
-+
-+$(LOBJS): %.o: %.d
-+	$(DC) -d -c -of$@ $(DFLAGS) -Iimport $<
-+
-+$(OBJS): %.o: %.d
-+	$(DC) -d -c -of$@ $(DFLAGS) -Iimport -Isrc $<
-+
-+$(COBJS): %.o: %.c
-+	$(CC) -c -o $@ $(CFLAGS) `sdl-config --cflags` $<
-+
-+clean:
-+	$(RM) -f src/*.o
-+	$(RM) -f src/abagames/a7xpg/*.o
-+	$(RM) -f src/abagames/util/*.o
-+	$(RM) -f src/abagames/util/sdl/*.o
++
++SOURCES=$(shell find src -name "*.d")
++OBJS=$(SOURCES:.d=.o)
++LSOURCES=$(shell find import -name "*.d")
++LOBJS=$(LSOURCES:.d=.o)
++CSOURCES=$(shell find src -name "*.c")
++COBJS=$(CSOURCES:.c=.o)
++
++LDFLAGS=
++CFLAGS=-O2 -Wall
++DFLAGS=-O -release
++#DFLAGS=-g -debug
++CC=gcc
++DC=gdmd-v1
++LIBS=-lGL `sdl-config --libs` -lSDL_mixer 
++EXE=a7xpg
++
++all: $(EXE)
++
++$(EXE): $(LOBJS) $(OBJS) $(COBJS)
++	gdc-v1 $(LDFLAGS) -o $@ $+ $(LIBS)
++
++$(LOBJS): %.o: %.d
++	$(DC) -d -c -of$@ $(DFLAGS) -Iimport $<
++
++$(OBJS): %.o: %.d
++	$(DC) -d -c -of$@ $(DFLAGS) -Iimport -Isrc $<
++
++$(COBJS): %.o: %.c
++	$(CC) -c -o $@ $(CFLAGS) `sdl-config --cflags` $<
++
++clean:
++	$(RM) -f src/*.o
++	$(RM) -f src/abagames/a7xpg/*.o
++	$(RM) -f src/abagames/util/*.o
++	$(RM) -f src/abagames/util/sdl/*.o
 +	$(RM) -f import/*.o

Modified: packages/trunk/a7xpg/debian/rules
===================================================================
--- packages/trunk/a7xpg/debian/rules	2012-01-03 11:43:45 UTC (rev 13067)
+++ packages/trunk/a7xpg/debian/rules	2012-01-05 18:46:46 UTC (rev 13068)
@@ -18,7 +18,11 @@
 	dh_testdir
 	touch $@
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+
 build-stamp: configure-stamp 
 	dh_testdir
 	#ant -v