r8476 - in /vdr/vdr-plugin-games/trunk/debian: changelog control copyright patches/00list patches/01_Makefile-fPIC-fix.dpatch patches/03_games-0.6.3-fix-INCLUDES.dpatch rules

tom-guest at users.alioth.debian.org tom-guest at users.alioth.debian.org
Wed Mar 17 00:43:52 UTC 2010 

Author: tom-guest
Date: Wed Mar 17 00:43:52 2010
New Revision: 8476

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8476
Log:
* Added 03_games-0.6.3-fix-INCLUDES.dpatch
* Removed 01_Makefile-fPIC-fix.dpatch
* Removed DVBDIR from debian/rules
* Standards-Version: 3.8.4

Added:
    vdr/vdr-plugin-games/trunk/debian/patches/03_games-0.6.3-fix-INCLUDES.dpatch
Removed:
    vdr/vdr-plugin-games/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
Modified:
    vdr/vdr-plugin-games/trunk/debian/changelog
    vdr/vdr-plugin-games/trunk/debian/control
    vdr/vdr-plugin-games/trunk/debian/copyright
    vdr/vdr-plugin-games/trunk/debian/patches/00list
    vdr/vdr-plugin-games/trunk/debian/rules

Modified: vdr/vdr-plugin-games/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-games/trunk/debian/changelog?rev=8476&op=diff
==============================================================================
--- vdr/vdr-plugin-games/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-games/trunk/debian/changelog Wed Mar 17 00:43:52 2010
@@ -1,3 +1,12 @@
+vdr-plugin-games (0.6.3-26) unstable; urgency=low
+
+  * Added 03_games-0.6.3-fix-INCLUDES.dpatch
+  * Removed 01_Makefile-fPIC-fix.dpatch
+  * Removed DVBDIR from debian/rules
+  * Standards-Version: 3.8.4
+
+ -- Thomas Günther <tom at toms-cafe.de>  Tue, 16 Mar 2010 23:36:46 +0100
+
 vdr-plugin-games (0.6.3-25) unstable; urgency=low
 
   * Removed non-standard shebang line from debian/rules (Closes: #552641)

Modified: vdr/vdr-plugin-games/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-games/trunk/debian/control?rev=8476&op=diff
==============================================================================
--- vdr/vdr-plugin-games/trunk/debian/control (original)
+++ vdr/vdr-plugin-games/trunk/debian/control Wed Mar 17 00:43:52 2010
@@ -4,7 +4,7 @@
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
 Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-games/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-games/trunk/
 Homepage: http://1541.org/vdr-games/

Modified: vdr/vdr-plugin-games/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-games/trunk/debian/copyright?rev=8476&op=diff
==============================================================================
--- vdr/vdr-plugin-games/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-games/trunk/debian/copyright Wed Mar 17 00:43:52 2010
@@ -12,8 +12,23 @@
 Copyright:
     (C) 2002 - 2006 Clemens Kirchgatterer
 
+Copyright (minesweeper):
+    (C) 2003 - 2005 Gerard Monells, Clemens Kirchgatterer
+
+Copyright (snake):
+    (C) 2003 Justin Todd, Clemens Kirchgatterer
+
+Copyright (tetris):
+    (C) 2002 - 2003 Franko Kulaga, Clemens Kirchgatterer
+
+Copyright (tictactoe):
+    (C) 2003 Aaron Rogers, Clemens Kirchgatterer
+
+Copyright (tron):
+    (C) 2003 Rhett D. Jacobs, Clemens Kirchgatterer
+
 Copyright (Debian packaging):
-    (C) 2002 - 2009 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2002 - 2010 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify

Modified: vdr/vdr-plugin-games/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-games/trunk/debian/patches/00list?rev=8476&op=diff
==============================================================================
--- vdr/vdr-plugin-games/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-games/trunk/debian/patches/00list Wed Mar 17 00:43:52 2010
@@ -1,2 +1,2 @@
-01_Makefile-fPIC-fix
 02_Makefile-nosilent
+03_games-0.6.3-fix-INCLUDES

Added: vdr/vdr-plugin-games/trunk/debian/patches/03_games-0.6.3-fix-INCLUDES.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-games/trunk/debian/patches/03_games-0.6.3-fix-INCLUDES.dpatch?rev=8476&op=file
==============================================================================
--- vdr/vdr-plugin-games/trunk/debian/patches/03_games-0.6.3-fix-INCLUDES.dpatch (added)
+++ vdr/vdr-plugin-games/trunk/debian/patches/03_games-0.6.3-fix-INCLUDES.dpatch Wed Mar 17 00:43:52 2010
@@ -1,0 +1,128 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_games-0.6.3-fix-INCLUDES.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes compilation with VDR >= 1.7.13.
+
+ at DPATCH@
+--- games-0.6.3/Makefile
++++ games-0.6.3/Makefile
+@@ -48,7 +48,7 @@
+ 
+ 	TARGET    = libvdr-games.so
+ 	OBJS     += $(VDROBJS)
+-	CFLAGS   += -fPIC -I$(VDRDIR) -I$(DVBDIR)/include
++	CFLAGS   += $(INCLUDES) -I$(VDRDIR)/include
+ 	LFLAGS   += -shared --whole-archive
+ 	DEFINES  += -D_GNU_SOURCE -DVDRVERSNUM=$(VDRNUM)
+ 
+@@ -57,7 +57,7 @@
+ all:
+ 	@echo
+ 	@echo -n "Building $(TARGET) "
+-	for GAME in $(GAMES); do cd $$GAME; make all; cd -; done
++	for GAME in $(GAMES); do cd $$GAME; make all DEFINES="$(DEFINES)" CFLAGS="$(CFLAGS)"; cd -; done
+ 	@rm -f $(TARGET)
+ 	@make $(TARGET)
+ 	@echo " done"
+--- games-0.6.3/minesweeper/Makefile
++++ games-0.6.3/minesweeper/Makefile
+@@ -1,6 +1,6 @@
+ GAME     = minesweeper
+ OBJS     = minesweeper.o
+-CFLAGS   = -g -pipe -O2 -Wall -Woverloaded-virtual
++CFLAGS  ?= -g -pipe -O2 -Wall -Woverloaded-virtual
+ 
+ all: $(OBJS)
+ 	@ar -r $(GAME).a $(OBJS)
+@@ -11,4 +11,4 @@
+ 
+ .cpp.o:
+ 	@echo -n "."
+-	g++ $(CFLAGS) -c $<
++	g++ $(DEFINES) $(CFLAGS) -c $<
+--- games-0.6.3/snake/Makefile
++++ games-0.6.3/snake/Makefile
+@@ -1,6 +1,6 @@
+ GAME     = snake
+ OBJS     = snake.o
+-CFLAGS   = -g -pipe -O2 -Wall -Woverloaded-virtual
++CFLAGS  ?= -g -pipe -O2 -Wall -Woverloaded-virtual
+ 
+ all: $(OBJS)
+ 	@ar -r $(GAME).a $(OBJS)
+@@ -11,4 +11,4 @@
+ 
+ .cpp.o:
+ 	@echo -n "."
+-	g++ $(CFLAGS) -c $<
++	g++ $(DEFINES) $(CFLAGS) -c $<
+--- games-0.6.3/tetris/Makefile
++++ games-0.6.3/tetris/Makefile
+@@ -1,6 +1,6 @@
+ GAME     = tetris
+ OBJS     = tetris.o
+-CFLAGS   = -g -pipe -O2 -Wall -Woverloaded-virtual
++CFLAGS  ?= -g -pipe -O2 -Wall -Woverloaded-virtual
+ 
+ all: $(OBJS)
+ 	@ar -r $(GAME).a $(OBJS)
+@@ -11,4 +11,4 @@
+ 
+ .cpp.o:
+ 	@echo -n "."
+-	g++ $(CFLAGS) -c $<
++	g++ $(DEFINES) $(CFLAGS) -c $<
+--- games-0.6.3/tictactoe/Makefile
++++ games-0.6.3/tictactoe/Makefile
+@@ -1,6 +1,6 @@
+ GAME     = tictactoe
+ OBJS     = tictactoe.o
+-CFLAGS   = -g -pipe -O2 -Wall -Woverloaded-virtual
++CFLAGS  ?= -g -pipe -O2 -Wall -Woverloaded-virtual
+ 
+ all: $(OBJS)
+ 	@ar -r $(GAME).a $(OBJS)
+@@ -11,4 +11,4 @@
+ 
+ .cpp.o:
+ 	@echo -n "."
+-	g++ $(CFLAGS) -c $<
++	g++ $(DEFINES) $(CFLAGS) -c $<
+--- games-0.6.3/tron/Makefile
++++ games-0.6.3/tron/Makefile
+@@ -1,6 +1,6 @@
+ GAME     = tron
+ OBJS     = tron.o
+-CFLAGS   = -g -pipe -O2 -Wall -Woverloaded-virtual
++CFLAGS  ?= -g -pipe -O2 -Wall -Woverloaded-virtual
+ 
+ all: $(OBJS)
+ 	@ar -r $(GAME).a $(OBJS)
+@@ -11,4 +11,4 @@
+ 
+ .cpp.o:
+ 	@echo -n "."
+-	g++ $(CFLAGS) -c $<
++	g++ $(DEFINES) $(CFLAGS) -c $<
+--- games-0.6.3/plugin.cpp
++++ games-0.6.3/plugin.cpp
+@@ -1,5 +1,5 @@
+-#include <plugin.h>
+-#include <osd.h>
++#include <vdr/plugin.h>
++#include <vdr/osd.h>
+ 
+ extern int launcher_menu(char ***m);
+ extern int launcher_start(int g, int x, int y, int s, int c);
+--- games-0.6.3/screen.cpp
++++ games-0.6.3/screen.cpp
+@@ -5,7 +5,7 @@
+ #ifdef SDL
+ 	#include <SDL.h>
+ #else
+-	#include <osd.h>
++	#include <vdr/osd.h>
+ #endif
+ 
+ #include "defines.h"

Modified: vdr/vdr-plugin-games/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-games/trunk/debian/rules?rev=8476&op=diff
==============================================================================
--- vdr/vdr-plugin-games/trunk/debian/rules (original)
+++ vdr/vdr-plugin-games/trunk/debian/rules Wed Mar 17 00:43:52 2010
@@ -5,15 +5,14 @@
 
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=.
 
 common-build-arch::
 	$(MAKE) all $(MAKE_OPTIONS)
 
-clean::
+cleanbuilddir::
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
 
 common-binary-predeb-arch::
 	sh /usr/share/vdr-dev/dependencies.sh
-

More information about the pkg-vdr-dvb-changes mailing list