r6597 - in packages/trunk/pathogen: . debian debian/patches
Barry deFreese
bddebian-guest at alioth.debian.org
Wed Apr 16 20:07:10 UTC 2008
Author: bddebian-guest
Date: 2008-04-16 20:07:10 +0000 (Wed, 16 Apr 2008)
New Revision: 6597
Added:
packages/trunk/pathogen/debian/patches/
packages/trunk/pathogen/debian/patches/01_makefile.diff
packages/trunk/pathogen/debian/patches/02_fix_paths.diff
packages/trunk/pathogen/debian/patches/03_errormsg_cpp.diff
packages/trunk/pathogen/debian/patches/series
Removed:
packages/trunk/pathogen/Makefile
packages/trunk/pathogen/src/
Modified:
packages/trunk/pathogen/debian/changelog
packages/trunk/pathogen/debian/control
packages/trunk/pathogen/debian/rules
Log:
* Add quilt patch system for old source changes.
+ 01_Makefile.diff - Add install: target.
+ 02_fix_paths.diff - Fix paths to data files.
+ 03_errormsg_cpp.diff - New file errormsg.cpp.
Remove src modified files.
Deleted: packages/trunk/pathogen/Makefile
===================================================================
--- packages/trunk/pathogen/Makefile 2008-04-16 19:10:41 UTC (rev 6596)
+++ packages/trunk/pathogen/Makefile 2008-04-16 20:07:10 UTC (rev 6597)
@@ -1,28 +0,0 @@
-# Pathogen Warrior
-#
-# Linux Makefile
-# Contributed by Ion
-#
-# $Id: Makefile,v 1.2 2004/07/12 16:05:50 tonic Exp $
-# $Revision: 1.2 $
-
-sources := $(wildcard src/*.cpp)
-objects := $(sources:%.cpp=%.o)
-
-all: pathogen
-
-CXXFLAGS := $(shell sdl-config --cflags)
-LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lGLU -lGL
-
-pathogen: $(objects)
- $(CXX) $(LDFLAGS) -o $@ $^
-
-install:
- mkdir -p $(DESTDIR)/usr/games
- mkdir -p $(DESTDIR)/usr/share/pathogen
- install -o root -g games -m 644 data/* $(DESTDIR)/usr/share/pathogen
- install -o root -g games -m 755 pathogen $(DESTDIR)/usr/games
-
-.PHONY: clean
-clean:
- $(RM) pathogen $(objects)
Modified: packages/trunk/pathogen/debian/changelog
===================================================================
--- packages/trunk/pathogen/debian/changelog 2008-04-16 19:10:41 UTC (rev 6596)
+++ packages/trunk/pathogen/debian/changelog 2008-04-16 20:07:10 UTC (rev 6597)
@@ -6,6 +6,10 @@
* Make clean not ignore errors.
* Add Games Team VCS tags.
* Fix up copyright file.
+ * Add quilt patch system for old source changes.
+ + 01_Makefile.diff - Add install: target.
+ + 02_fix_paths.diff - Fix paths to data files.
+ + 03_errormsg_cpp.diff - New file errormsg.cpp.
* Bump debhelper build-dep and compat to 5.
* Bump Standards Version to 3.7.3. (No changes needed).
Modified: packages/trunk/pathogen/debian/control
===================================================================
--- packages/trunk/pathogen/debian/control 2008-04-16 19:10:41 UTC (rev 6596)
+++ packages/trunk/pathogen/debian/control 2008-04-16 20:07:10 UTC (rev 6597)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5.0.0), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev
Standards-Version: 3.7.3
Vcs-Svn: ssh://svn.debian.org/svn/pkg-games/packages/trunk/pathogen/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pathogen/?op=log
Added: packages/trunk/pathogen/debian/patches/01_makefile.diff
===================================================================
--- packages/trunk/pathogen/debian/patches/01_makefile.diff (rev 0)
+++ packages/trunk/pathogen/debian/patches/01_makefile.diff 2008-04-16 20:07:10 UTC (rev 6597)
@@ -0,0 +1,28 @@
+Index: pathogen-1.1.1/Makefile
+===================================================================
+--- pathogen-1.1.1.orig/Makefile 2008-04-16 15:37:49.000000000 -0400
++++ pathogen-1.1.1/Makefile 2008-04-16 15:39:56.000000000 -0400
+@@ -6,8 +6,8 @@
+ # $Id: Makefile,v 1.2 2004/07/12 16:05:50 tonic Exp $
+ # $Revision: 1.2 $
+
+-sources := $(wildcard *.cpp)
+-objects := $(sources:%.cpp=%.o) errormsg.o
++sources := $(wildcard src/*.cpp)
++objects := $(sources:%.cpp=%.o)
+
+ all: pathogen
+
+@@ -17,6 +17,12 @@
+ pathogen: $(objects)
+ $(CXX) $(LDFLAGS) -o $@ $^
+
++install:
++ mkdir -p $(DESTDIR)/usr/games
++ mkdir -p $(DESTDIR)/usr/share/pathogen
++ install -o root -g games -m 644 data/* $(DESTDIR)/usr/share/pathogen
++ install -o root -g games -m 755 pathogen $(DESTDIR)/usr/games
++
+ .PHONY: clean
+ clean:
+ $(RM) pathogen $(objects)
Added: packages/trunk/pathogen/debian/patches/02_fix_paths.diff
===================================================================
--- packages/trunk/pathogen/debian/patches/02_fix_paths.diff (rev 0)
+++ packages/trunk/pathogen/debian/patches/02_fix_paths.diff 2008-04-16 20:07:10 UTC (rev 6597)
@@ -0,0 +1,59 @@
+Index: pathogen-1.1.1/src/BuildState.cpp
+===================================================================
+--- pathogen-1.1.1.orig/src/BuildState.cpp 2008-04-16 15:42:15.000000000 -0400
++++ pathogen-1.1.1/src/BuildState.cpp 2008-04-16 15:43:20.000000000 -0400
+@@ -147,17 +147,17 @@
+
+ BOOL BuildState::init()
+ {
+- mHexImage = loadImage("data/hex.png");
+- mBallImage = loadImage("data/ball.png");
+- mShineImage = loadImage("data/shine.png");
+- mLinkImages[0] = loadImage("data/link1.png");
+- mLinkImages[1] = loadImage("data/link2.png");
+- mLinkImages[2] = loadImage("data/link3.png");
+- mMapImage = loadImage("data/map.png");
+- mCircleImage = loadImage("data/circle.png");
+- mBlockImage = loadImage("data/block.png");
+- mSquareImage = loadImage("data/square.png");
+- mMapMask = IMG_Load("data/mapmask.png");
++ mHexImage = loadImage("/usr/share/pathogen/hex.png");
++ mBallImage = loadImage("/usr/share/pathogen/ball.png");
++ mShineImage = loadImage("/usr/share/pathogen/shine.png");
++ mLinkImages[0] = loadImage("/usr/share/pathogen/link1.png");
++ mLinkImages[1] = loadImage("/usr/share/pathogen/link2.png");
++ mLinkImages[2] = loadImage("/usr/share/pathogen/link3.png");
++ mMapImage = loadImage("/usr/share/pathogen/map.png");
++ mCircleImage = loadImage("/usr/share/pathogen/circle.png");
++ mBlockImage = loadImage("/usr/share/pathogen/block.png");
++ mSquareImage = loadImage("/usr/share/pathogen/square.png");
++ mMapMask = IMG_Load("/usr/share/pathogen/mapmask.png");
+
+ return TRUE;
+ }
+Index: pathogen-1.1.1/src/GameApp.cpp
+===================================================================
+--- pathogen-1.1.1.orig/src/GameApp.cpp 2008-04-16 15:43:35.000000000 -0400
++++ pathogen-1.1.1/src/GameApp.cpp 2008-04-16 15:44:29.000000000 -0400
+@@ -46,7 +46,7 @@
+ if (!result)
+ return result;
+
+- mFont = new Font("data/font.png");
++ mFont = new Font("/usr/share/pathogen/font.png");
+
+ mBuildState = new BuildState;
+ mBuildState->init();
+Index: pathogen-1.1.1/src/sound.cpp
+===================================================================
+--- pathogen-1.1.1.orig/src/sound.cpp 2008-04-16 15:44:35.000000000 -0400
++++ pathogen-1.1.1/src/sound.cpp 2008-04-16 15:44:55.000000000 -0400
+@@ -24,7 +24,7 @@
+
+
+ #define CHANNELS 8
+-#define MUSICFILE "data/music.s3m"
++#define MUSICFILE "/usr/share/pathogen/music.s3m"
+ #define MUSICVOLMUL 0.7f
+ #define SFXVOLMUL 0.85f
+
Added: packages/trunk/pathogen/debian/patches/03_errormsg_cpp.diff
===================================================================
--- packages/trunk/pathogen/debian/patches/03_errormsg_cpp.diff (rev 0)
+++ packages/trunk/pathogen/debian/patches/03_errormsg_cpp.diff 2008-04-16 20:07:10 UTC (rev 6597)
@@ -0,0 +1,61 @@
+Index: pathogen-1.1.1/src/errormsg.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ pathogen-1.1.1/src/errormsg.cpp 2008-04-16 15:47:46.000000000 -0400
+@@ -0,0 +1,56 @@
++/* Pathogen Warrior
++ * Copyright 2004 Jetro Lauha - http://iki.fi/jetro/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ * $Id: errormsg.c,v 1.4 2004/07/14 15:37:09 tonic Exp $
++ * $Revision: 1.4 $
++ */
++
++#ifdef WIN32
++#define WIN32_LEAN_AND_MEAN
++#include <windows.h>
++#endif
++
++#include <stdlib.h>
++#include <stdio.h>
++#include <stdarg.h>
++
++#include "errormsg.h"
++
++
++static void errorBox(char *title, char *msg, va_list ap)
++{
++#ifdef WIN32
++ char s[1000];
++ vsprintf(s,msg,ap);
++ MessageBox(0, s, title, MB_OK | MB_APPLMODAL | MB_ICONEXCLAMATION);
++#else
++ fflush(stderr);
++ fflush(stdout);
++ fprintf(stderr, "\n%s: ", title);
++ vfprintf(stderr, msg, ap);
++ fprintf(stderr, "\n");
++ fflush(stderr);
++#endif
++}
++
++
++void errorMessage(char *title, char *msg, ...)
++{
++ va_list ap;
++ va_start(ap, msg);
++ errorBox(title, msg, ap);
++}
Added: packages/trunk/pathogen/debian/patches/series
===================================================================
--- packages/trunk/pathogen/debian/patches/series (rev 0)
+++ packages/trunk/pathogen/debian/patches/series 2008-04-16 20:07:10 UTC (rev 6597)
@@ -0,0 +1,3 @@
+01_makefile.diff
+02_fix_paths.diff
+03_errormsg_cpp.diff
Modified: packages/trunk/pathogen/debian/rules
===================================================================
--- packages/trunk/pathogen/debian/rules 2008-04-16 19:10:41 UTC (rev 6596)
+++ packages/trunk/pathogen/debian/rules 2008-04-16 20:07:10 UTC (rev 6597)
@@ -6,6 +6,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -15,7 +17,7 @@
endif
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
dh_testdir
# Add here commands to configure the package.
@@ -33,7 +35,8 @@
touch build-stamp
-clean:
+clean: clean-stamp unpatch
+clean-stamp:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
More information about the Pkg-games-commits
mailing list