r14132 - in packages/trunk/ii-esu/debian: . patches

Thu May 23 18:46:22 UTC 2013

Author: pdewacht-guest
Date: 2013-05-23 18:46:22 +0000 (Thu, 23 May 2013)
New Revision: 14132

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


Modified: packages/trunk/ii-esu/debian/changelog
===================================================================

--- packages/trunk/ii-esu/debian/changelog	2013-05-23 18:29:58 UTC (rev 14131)
+++ packages/trunk/ii-esu/debian/changelog	2013-05-23 18:46:22 UTC (rev 14132)
@@ -1,5 +1,6 @@
 ii-esu (1.0a.dfsg1-5) unstable; urgency=low
 
+  [ Barry deFreese ]
   * Add patch to build with D v2. (Closes: #707265)
     - Remove -d (deprecated) flag.
   * Update Homepage tag to new address.
@@ -8,6 +9,9 @@
   * Add empty watch file. (Upstream tarball not versioned).
   * Bump Standards Version to 3.9.4.
 
+  [ Peter De Wachter ]
+  * Switch dh-style minimal rules file.
+
  -- Barry deFreese <bdefreese at debian.org>  Sun, 19 May 2013 15:44:36 -0400
 
 ii-esu (1.0a.dfsg1-4) unstable; urgency=medium

Modified: packages/trunk/ii-esu/debian/compat
===================================================================
--- packages/trunk/ii-esu/debian/compat	2013-05-23 18:29:58 UTC (rev 14131)
+++ packages/trunk/ii-esu/debian/compat	2013-05-23 18:46:22 UTC (rev 14132)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/ii-esu/debian/control
===================================================================
--- packages/trunk/ii-esu/debian/control	2013-05-23 18:29:58 UTC (rev 14131)
+++ packages/trunk/ii-esu/debian/control	2013-05-23 18:46:22 UTC (rev 14132)
@@ -3,7 +3,7 @@
 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>
-Build-Depends: debhelper (>= 5), gdc,
+Build-Depends: debhelper (>= 9), gdc,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsdl1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.9.4

Added: packages/trunk/ii-esu/debian/ii-esu.manpages
===================================================================
--- packages/trunk/ii-esu/debian/ii-esu.manpages	                        (rev 0)
+++ packages/trunk/ii-esu/debian/ii-esu.manpages	2013-05-23 18:46:22 UTC (rev 14132)
@@ -0,0 +1 @@
+debian/ii-esu.6

Modified: packages/trunk/ii-esu/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/ii-esu/debian/patches/dlang_v2.patch	2013-05-23 18:29:58 UTC (rev 14131)
+++ packages/trunk/ii-esu/debian/patches/dlang_v2.patch	2013-05-23 18:46:22 UTC (rev 14132)
@@ -635,3 +635,14 @@
          x[num] = x0[seg][j];
          y[num] = y0[seg][j];
          z[num] = z0[seg][j];
+--- a/src/es/mouse.d
++++ b/src/es/mouse.d
+@@ -3,7 +3,7 @@
+  *
+  * Copyright 2005 Kenta Cho. Some rights reserved.
+  */
+-module util.mouse;
++module es.mouse;
+ 
+ private import std.string;
+ private import std.stream;

Modified: packages/trunk/ii-esu/debian/patches/makefile.patch
===================================================================
--- packages/trunk/ii-esu/debian/patches/makefile.patch	2013-05-23 18:29:58 UTC (rev 14131)
+++ packages/trunk/ii-esu/debian/patches/makefile.patch	2013-05-23 18:46:22 UTC (rev 14132)
@@ -2,32 +2,16 @@
 # Copyright (C) 2007  Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game. See debian/copyright.
 
-Index: ii-esu-1.0a.dfsg1/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ii-esu-1.0a.dfsg1/Makefile	2013-05-19 15:49:42.000000000 -0400
-@@ -0,0 +1,24 @@
-+DC=gdmd
-+DFLAGS=-g -O -release
-+DOUT=-of
-+
-+DSRC=$(shell find src/ -name "*.d")
-+SOURCES=$(DSRC) import/SDL_video.d import/SDL_mouse.d import/SDL_mixer.d
-+OBJS=$(SOURCES:.d=.o)
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,10 @@
++DSRC=import/SDL_video.d import/SDL_mixer.d import/SDL_mouse.d $(shell find src -name "*.d" | sort)
 +EXE=ii-esu
 +
 +all: $(EXE)
 +
-+$(EXE): $(OBJS)
-+	gdc -o $@ $(OBJS) -lSDL -lGL -lSDL_mixer
++$(EXE): $(DSRC)
++	gdc -o $@ -Iimport -Isrc -Wno-deprecated $(DFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DSRC) -lSDL -lGL -lSDL_mixer
 +
-+$(OBJS): %.o: %.d
-+	$(DC) -c $(DOUT)$@ $(DFLAGS) -Iimport -Isrc $<
-+
-+
 +clean:
-+	$(RM) -f src/*.o
-+	$(RM) -f src/br/*.o
-+	$(RM) -f src/util/*.o
-+	$(RM) -f src/util/sdl/*.o
-+	$(RM) -f import/*.o
++	rm -f $(EXE)

Modified: packages/trunk/ii-esu/debian/rules
===================================================================
--- packages/trunk/ii-esu/debian/rules	2013-05-23 18:29:58 UTC (rev 14131)
+++ packages/trunk/ii-esu/debian/rules	2013-05-23 18:46:22 UTC (rev 14132)
@@ -1,72 +1,19 @@
 #!/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 -g -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 $@
 
-build-stamp: configure-stamp 
-	dh_testdir
-	#ant -v
-	$(MAKE) CFLAGS="$(CFLAGS)" DFLAGS="$(DFLAGS)"
-	touch $@
+override_dh_auto_build:
+	dh_auto_build -- DFLAGS="$(DFLAGS)"
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	#ant -v clean
-	#[ ! -f Makefile ] || $(MAKE) clean
-	rm -f ii-esu
-	rm -f `find . -name "*.o"`
-	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	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/*.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
@@ -81,6 +28,3 @@
 	rm ES_d/voice/*
 	tar cvfz ../ii-esu_1.0a.dfsg1.orig.tar.gz ES_d
 	rm -rf ES_d.zip ES_d
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source


