r3294 - in packages/trunk/bastet/debian: . patches
Nacho Barrientos Arias
nacho at alioth.debian.org
Mon Jul 9 19:54:01 UTC 2007
Author: nacho
Date: 2007-07-09 19:54:01 +0000 (Mon, 09 Jul 2007)
New Revision: 3294
Added:
packages/trunk/bastet/debian/patches/01_Makefile.patch
packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.patch
packages/trunk/bastet/debian/patches/series
Removed:
packages/trunk/bastet/debian/patches/00list
packages/trunk/bastet/debian/patches/01_Makefile.dpatch
packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.dpatch
Modified:
packages/trunk/bastet/debian/changelog
packages/trunk/bastet/debian/control
packages/trunk/bastet/debian/copyright
packages/trunk/bastet/debian/menu
packages/trunk/bastet/debian/rules
Log:
menu transition. switching to quilt. more minor changes.
Modified: packages/trunk/bastet/debian/changelog
===================================================================
--- packages/trunk/bastet/debian/changelog 2007-07-09 16:43:46 UTC (rev 3293)
+++ packages/trunk/bastet/debian/changelog 2007-07-09 19:54:01 UTC (rev 3294)
@@ -1,3 +1,16 @@
+bastet (0.41-5) unstable; urgency=low
+
+ * debian/control
+ - New comaintainer email address.
+ - Switching to quilt.
+ * debian/menu
+ - Games::Tetris-Like no longer exists, switching to Games::Blocks
+ according to Debian menu transition.
+ <http://lists.debian.org/debian-devel-announce/2007/07/msg00000.html>
+ - Capitalizing the title.
+
+ -- Nacho Barrientos Arias <nacho at debian.org> Mon, 09 Jul 2007 21:16:13 +0200
+
bastet (0.41-4) unstable; urgency=low
* New maintainer (closes: #387203).
Modified: packages/trunk/bastet/debian/control
===================================================================
--- packages/trunk/bastet/debian/control 2007-07-09 16:43:46 UTC (rev 3293)
+++ packages/trunk/bastet/debian/control 2007-07-09 19:54:01 UTC (rev 3294)
@@ -2,8 +2,8 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Nacho Barrientos Arias <chipi at criptonita.com>
-Build-Depends: debhelper (>= 5), libncurses5-dev | libncurses-dev, dpatch
+Uploaders: Nacho Barrientos Arias <nacho at debian.org>
+Build-Depends: debhelper (>= 5), libncurses5-dev | libncurses-dev, quilt (>= 0.40)
Standards-Version: 3.7.2
Package: bastet
Modified: packages/trunk/bastet/debian/copyright
===================================================================
--- packages/trunk/bastet/debian/copyright 2007-07-09 16:43:46 UTC (rev 3293)
+++ packages/trunk/bastet/debian/copyright 2007-07-09 19:54:01 UTC (rev 3294)
@@ -55,5 +55,5 @@
The Debian packaging is (C)
2004-2006 David Moreno Garza <damog at damog.net>
- 2006 Nacho Barrientos Arias <chipi at criptonita.com>
+ 2006-2007 Nacho Barrientos Arias <nacho at debian.org>
and is licensed under the GPL, see above.
Modified: packages/trunk/bastet/debian/menu
===================================================================
--- packages/trunk/bastet/debian/menu 2007-07-09 16:43:46 UTC (rev 3293)
+++ packages/trunk/bastet/debian/menu 2007-07-09 19:54:01 UTC (rev 3294)
@@ -1,5 +1,5 @@
?package(bastet):\
needs="text"\
- section="Games/Tetris-like"\
- title="bastet"\
+ section="Games/Blocks"\
+ title="Bastet"\
command="/usr/games/bastet"
Deleted: packages/trunk/bastet/debian/patches/00list
===================================================================
--- packages/trunk/bastet/debian/patches/00list 2007-07-09 16:43:46 UTC (rev 3293)
+++ packages/trunk/bastet/debian/patches/00list 2007-07-09 19:54:01 UTC (rev 3294)
@@ -1,2 +0,0 @@
-01_Makefile.dpatch
-02_kFreeBSD_FTBFS_fix.dpatch
Deleted: packages/trunk/bastet/debian/patches/01_Makefile.dpatch
===================================================================
--- packages/trunk/bastet/debian/patches/01_Makefile.dpatch 2007-07-09 16:43:46 UTC (rev 3293)
+++ packages/trunk/bastet/debian/patches/01_Makefile.dpatch 2007-07-09 19:54:01 UTC (rev 3294)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile.dpatch
-## by:
-## David Moreno Garza <damog at damog.net>
-## Nacho Barrientos Arias <chipi at criptonita.com>
-##
-## DP: Adding destdir and fixing perm issues.
-
- at DPATCH@
---- bastet-0.41.orig/Makefile 2006-09-13 01:29:59.000000000 +0200
-+++ bastet-0.41/Makefile 2006-09-13 01:30:48.000000000 +0200
-@@ -1,8 +1,8 @@
- #makefile for bastet (c) 2004 Federico Poloni
-
- #default paths
--BIN_PREFIX=/usr/bin/
--DATA_PREFIX=/var/games/
-+BIN_PREFIX=$(DESTDIR)/usr/games/
-+DATA_PREFIX=$(DESTDIR)/var/games/
- HISCORE=bastet.scores
-
- #in order to handle highscores properly, bastet must be setuid.
-@@ -39,8 +39,4 @@
-
- install: $(EXNAME)
- cp $(EXNAME) $(BIN_PREFIX)
-- chown $(GAME_USER) $(BIN_PREFIX)$(EXNAME)
-- chmod u+s $(BIN_PREFIX)$(EXNAME)
- touch $(DATA_PREFIX)$(HISCORE)
-- chown $(GAME_USER) $(DATA_PREFIX)$(HISCORE)
-- chmod 644 $(DATA_PREFIX)$(HISCORE)
Added: packages/trunk/bastet/debian/patches/01_Makefile.patch
===================================================================
--- packages/trunk/bastet/debian/patches/01_Makefile.patch (rev 0)
+++ packages/trunk/bastet/debian/patches/01_Makefile.patch 2007-07-09 19:54:01 UTC (rev 3294)
@@ -0,0 +1,40 @@
+# 01_Makefile.patch
+# by:
+# David Moreno Garza <damog at damog.net>
+# Nacho Barrientos Arias <chipi at criptonita.com>
+#
+# Desc: Adding destdir and fixing some perms.
+
+Index: bastet-0.41/Makefile
+===================================================================
+--- bastet-0.41.orig/Makefile 2007-07-09 21:11:47.000000000 +0200
++++ bastet-0.41/Makefile 2007-07-09 21:39:23.000000000 +0200
+@@ -1,8 +1,8 @@
+ #makefile for bastet (c) 2004 Federico Poloni
+
+ #default paths
+-BIN_PREFIX=/usr/bin/
+-DATA_PREFIX=/var/games/
++BIN_PREFIX=$(DESTDIR)/usr/games/
++DATA_PREFIX=$(DESTDIR)/var/games/
+ HISCORE=bastet.scores
+
+ #in order to handle highscores properly, bastet must be setuid.
+@@ -11,7 +11,7 @@
+ GAME_USER=games
+
+ CC=gcc
+-CFLAGS=-Wall -DHIGHSCORE_FILE=\"$(DATA_PREFIX)$(HISCORE)\"
++CFLAGS=-Wall -DHIGHSCORE_FILE=\"$(DATA_PREFIX)$(HISCORE)\" $(DEBCFLAGS)
+ LDFLAGS=-lncurses
+ SOURCES=main.c game.c highscore.c bast.c
+ EXNAME=bastet
+@@ -39,8 +39,4 @@
+
+ install: $(EXNAME)
+ cp $(EXNAME) $(BIN_PREFIX)
+- chown $(GAME_USER) $(BIN_PREFIX)$(EXNAME)
+- chmod u+s $(BIN_PREFIX)$(EXNAME)
+ touch $(DATA_PREFIX)$(HISCORE)
+- chown $(GAME_USER) $(DATA_PREFIX)$(HISCORE)
+- chmod 644 $(DATA_PREFIX)$(HISCORE)
Deleted: packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.dpatch
===================================================================
--- packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.dpatch 2007-07-09 16:43:46 UTC (rev 3293)
+++ packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.dpatch 2007-07-09 19:54:01 UTC (rev 3294)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_kFreeBSD_FTBFS_fix.dpatch
-## by:
-## David Moreno Garza <damog at damog.net>
-## Nacho Barrientos Arias <chipi at criptonita.com>
-##
-## DP: Fixes #316921.
-
- at DPATCH@
---- bastet-0.41.orig/bast.c 2006-09-13 01:29:59.000000000 +0200
-+++ bastet-0.41/bast.c 2006-09-13 01:31:40.000000000 +0200
-@@ -1,7 +1,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <ncurses.h>
--#include <termio.h>
-+#include <termios.h>
- #include <assert.h>
- #include <unistd.h>
- #include <string.h>
Added: packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.patch
===================================================================
--- packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.patch (rev 0)
+++ packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.patch 2007-07-09 19:54:01 UTC (rev 3294)
@@ -0,0 +1,21 @@
+# 02_kFreeBSD_FTBFS_fix.patch
+# by:
+# Robert Millan <rmh at aybabtu.com>
+# David Moreno Garza <damog at damog.net>
+# Nacho Barrientos Arias <chipi at criptonita.com>
+#
+# Desc: Fixes #316921.
+
+Index: bastet-0.41/bast.c
+===================================================================
+--- bastet-0.41.orig/bast.c 2007-07-09 21:13:21.000000000 +0200
++++ bastet-0.41/bast.c 2007-07-09 21:13:33.000000000 +0200
+@@ -1,7 +1,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ncurses.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <assert.h>
+ #include <unistd.h>
+ #include <string.h>
Added: packages/trunk/bastet/debian/patches/series
===================================================================
--- packages/trunk/bastet/debian/patches/series (rev 0)
+++ packages/trunk/bastet/debian/patches/series 2007-07-09 19:54:01 UTC (rev 3294)
@@ -0,0 +1,2 @@
+01_Makefile.patch -p1
+02_kFreeBSD_FTBFS_fix.patch -p1
Modified: packages/trunk/bastet/debian/rules
===================================================================
--- packages/trunk/bastet/debian/rules 2007-07-09 16:43:46 UTC (rev 3293)
+++ packages/trunk/bastet/debian/rules 2007-07-09 19:54:01 UTC (rev 3294)
@@ -1,17 +1,17 @@
#!/usr/bin/make -f
-CFLAGS = -Wall -g
+DEBCFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
+ DEBCFLAGS += -O0
else
- CFLAGS += -O2
+ DEBCFLAGS += -O2
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
configure: configure-stamp
configure-stamp: patch
@@ -22,12 +22,10 @@
build-stamp: configure-stamp
dh_testdir
- $(MAKE)
+ $(MAKE) DEBCFLAGS="$(DEBCFLAGS)"
touch build-stamp
-clean: unpatch realclean
-
-realclean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
More information about the Pkg-games-commits
mailing list