Author: pdewacht-guest
Date: 2013-05-23 19:28:49 +0000 (Thu, 23 May 2013)
New Revision: 14134

Added:
   packages/trunk/a7xpg/debian/a7xpg.manpages
Modified:
   packages/trunk/a7xpg/debian/changelog
   packages/trunk/a7xpg/debian/compat
   packages/trunk/a7xpg/debian/control
   packages/trunk/a7xpg/debian/copyright
   packages/trunk/a7xpg/debian/patches/makefile.patch
   packages/trunk/a7xpg/debian/rules
Log:
a7xpg: convert to dh-style rules, to stay consistent with the other D games


Added: packages/trunk/a7xpg/debian/a7xpg.manpages
===================================================================
--- packages/trunk/a7xpg/debian/a7xpg.manpages                          (rev 0)
+++ packages/trunk/a7xpg/debian/a7xpg.manpages  2013-05-23 19:28:49 UTC (rev 
14134)
@@ -0,0 +1 @@
+debian/a7xpg.6

Modified: packages/trunk/a7xpg/debian/changelog
===================================================================
--- packages/trunk/a7xpg/debian/changelog       2013-05-23 19:20:12 UTC (rev 
14133)
+++ packages/trunk/a7xpg/debian/changelog       2013-05-23 19:28:49 UTC (rev 
14134)
@@ -7,6 +7,9 @@
   [ Ansgar Burchardt ]
   * debian/control: Remove DM-Upload-Allowed.
 
+  [ Peter De Wachter ]
+  * Switch dh-style minimal rules file
+
  -- Ansgar Burchardt <[email protected]>  Fri, 02 Nov 2012 19:36:46 +0100
 
 a7xpg (0.11.dfsg1-7) unstable; urgency=low

Modified: packages/trunk/a7xpg/debian/compat
===================================================================
--- packages/trunk/a7xpg/debian/compat  2013-05-23 19:20:12 UTC (rev 14133)
+++ packages/trunk/a7xpg/debian/compat  2013-05-23 19:28:49 UTC (rev 14134)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/a7xpg/debian/control
===================================================================
--- packages/trunk/a7xpg/debian/control 2013-05-23 19:20:12 UTC (rev 14133)
+++ packages/trunk/a7xpg/debian/control 2013-05-23 19:28:49 UTC (rev 14134)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <[email protected]>
 Uploaders: Miriam Ruiz <[email protected]>, Peter De Wachter 
<[email protected]>, Vincent Fourmond <[email protected]>
-Build-Depends: debhelper (>= 5), gdc (>= 4.6.3),
+Build-Depends: debhelper (>= 9), gdc (>= 4.6.3),
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsdl1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.9.4

Modified: packages/trunk/a7xpg/debian/copyright
===================================================================
--- packages/trunk/a7xpg/debian/copyright       2013-05-23 19:20:12 UTC (rev 
14133)
+++ packages/trunk/a7xpg/debian/copyright       2013-05-23 19:28:49 UTC (rev 
14134)
@@ -54,9 +54,9 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+On Debian systems, the complete text of the GNU Lesser General Public
+License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
 
 
-The Debian packaging is (C) 2007, Miriam Ruiz <[email protected]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright(C) 2007, Miriam Ruiz <[email protected]>
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.

Modified: packages/trunk/a7xpg/debian/patches/makefile.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/makefile.patch  2013-05-23 19:20:12 UTC 
(rev 14133)
+++ packages/trunk/a7xpg/debian/patches/makefile.patch  2013-05-23 19:28:49 UTC 
(rev 14134)
@@ -1,45 +1,16 @@
 # Copyright (C) 2007  Miriam Ruiz <[email protected]>
 # 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  2013-05-18 12:39:00.000000000 -0400
-@@ -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
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,10 @@
++DSRC=$(shell find import src/abagames -name "*.d" | sort)
 +EXE=a7xpg
 +
 +all: $(EXE)
 +
-+$(EXE): $(LOBJS) $(OBJS) $(COBJS)
-+      gdc $(LDFLAGS) -o $@ $+ $(LIBS)
++$(EXE): $(DSRC)
++      gdc -o $@ -Iimport -Isrc -Wno-deprecated $(DFLAGS) $(CFLAGS) 
$(CPPFLAGS) $(LDFLAGS) $(DSRC) -lSDL -lGL -lSDL_mixer
 +
-+$(LOBJS): %.o: %.d
-+      $(DC) -c -of$@ $(DFLAGS) -Iimport $<
-+
-+$(OBJS): %.o: %.d
-+      $(DC) -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
++      rm -f $(EXE)

Modified: packages/trunk/a7xpg/debian/rules
===================================================================
--- packages/trunk/a7xpg/debian/rules   2013-05-23 19:20:12 UTC (rev 14133)
+++ packages/trunk/a7xpg/debian/rules   2013-05-23 19:28:49 UTC (rev 14134)
@@ -1,74 +1,20 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-       DFLAGS = -g -debug
+       DFLAGS = -fdebug
 else
-       CFLAGS += -O2
-       DFLAGS = -O -release
+       DFLAGS = -frelease
 endif
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       touch $@
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
+%:
+       dh $@
 
+override_dh_auto_build:
+       dh_auto_build -- DFLAGS="$(DFLAGS)"
 
-build-stamp: configure-stamp 
-       dh_testdir
-       #ant -v
-       $(MAKE) CFLAGS="$(CFLAGS)" DFLAGS="$(DFLAGS)"
-       #docbook-to-man debian/a7xpg.sgml > a7xpg.1
-       touch $@
 
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       #ant -v clean
-       [ ! -f Makefile ] || $(MAKE) clean
-       rm -f a7xpg
-       rm -f `find . -name "*.o"`
-       dh_clean 
 
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-       dh_install
-       dh_installmenu
-       dh_installman debian/a7xpg.6
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
 get-orig-source:
        dh_testdir
        dh_testroot
@@ -80,6 +26,3 @@
        rm a7xpg/resource/*.RES
        tar cvfz ../a7xpg_0.11.dfsg1.orig.tar.gz a7xpg
        rm -rf a7xpg.zip a7xpg
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure 
get-orig-source


_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to