r6585 - in packages/trunk/pathogen: . debian src
Barry deFreese
bddebian-guest at alioth.debian.org
Wed Apr 16 16:46:49 UTC 2008
Author: bddebian-guest
Date: 2008-04-16 16:46:49 +0000 (Wed, 16 Apr 2008)
New Revision: 6585
Added:
packages/trunk/pathogen/debian/
packages/trunk/pathogen/debian/changelog
packages/trunk/pathogen/debian/compat
packages/trunk/pathogen/debian/control
packages/trunk/pathogen/debian/copyright
packages/trunk/pathogen/debian/dirs
packages/trunk/pathogen/debian/docs
packages/trunk/pathogen/debian/manpages
packages/trunk/pathogen/debian/menu
packages/trunk/pathogen/debian/pathogen.6
packages/trunk/pathogen/debian/rules
packages/trunk/pathogen/src/errormsg.cpp
Modified:
packages/trunk/pathogen/Makefile
packages/trunk/pathogen/src/BuildState.cpp
packages/trunk/pathogen/src/GameApp.cpp
packages/trunk/pathogen/src/sound.cpp
Log:
[svn-inject] Applying Debian modifications to trunk
Modified: packages/trunk/pathogen/Makefile
===================================================================
--- packages/trunk/pathogen/Makefile 2008-04-16 16:46:15 UTC (rev 6584)
+++ packages/trunk/pathogen/Makefile 2008-04-16 16:46:49 UTC (rev 6585)
@@ -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)
Property changes on: packages/trunk/pathogen/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/trunk/pathogen/debian/changelog
===================================================================
--- packages/trunk/pathogen/debian/changelog (rev 0)
+++ packages/trunk/pathogen/debian/changelog 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1,19 @@
+pathogen (1.1.1-2) unstable; urgency=low
+
+ * New Maintainer. (Closes: #461897).
+ + Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+ * Add myself to uploaders.
+ * Make clean not ignore errors.
+ * Add Games Team VCS tags.
+ * Fix up copyright file.
+ * Bump debhelper build-dep and compat to 5.
+ * Bump Standards Version to 3.7.3. (No changes needed).
+
+ -- Barry deFreese <bddebian at comcast.net> Wed, 16 Apr 2008 12:13:25 -0400
+
+pathogen (1.1.1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Gürkan Sengün <gurkan at linuks.mine.nu> Wed, 14 Jul 2004 00:03:48 +0200
+
Added: packages/trunk/pathogen/debian/compat
===================================================================
--- packages/trunk/pathogen/debian/compat (rev 0)
+++ packages/trunk/pathogen/debian/compat 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1 @@
+5
Added: packages/trunk/pathogen/debian/control
===================================================================
--- packages/trunk/pathogen/debian/control (rev 0)
+++ packages/trunk/pathogen/debian/control 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1,21 @@
+Source: pathogen
+Section: games
+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
+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
+
+Package: pathogen
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Puzzle game about matching 3D model structures
+ Pathogen Warrior is a puzzle game about matching 3D model structures with
+ a 2D hexagon map. It was one of the entrants to the 4th Ludum Dare 48-hour
+ game development competition. The theme of the competition was "Infection".
+ In Pathogen Warrior, the player's task is to match rotating 3D pathogen
+ structures with a 2D model using a hexagon map. The time to accomplish
+ the task is limited, and after successfully completing one pathogen, the
+ player is advanced to next level, which has a more challenging pathogen.
Added: packages/trunk/pathogen/debian/copyright
===================================================================
--- packages/trunk/pathogen/debian/copyright (rev 0)
+++ packages/trunk/pathogen/debian/copyright 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1,31 @@
+This package was debianized by Gürkan Sengün <gurkan at linuks.mine.nu> on
+Wed, 14 Jul 2004 00:03:48 +0200.
+
+Maintenance was taken over by Debian Games Team
+<pkg-games-devel at lists.alioth.debian.org> on Wed, 16 Apr 2008 12:37:00 -0400.
+
+It was downloaded from http://iki.fi/jetro/
+
+Upstream Author: Jetro Lauha <jetro+pathogendebian at NOSPAM.iki.fi>
+
+Copyright: Copyright (C) 2004 Jetro Lauha <jetro+pathogendebian at NOSPAM.iki.fi>
+
+ 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 package; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2004, Gürkan Sengün <gurkan at linuks.mine.nu> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: packages/trunk/pathogen/debian/dirs
===================================================================
--- packages/trunk/pathogen/debian/dirs (rev 0)
+++ packages/trunk/pathogen/debian/dirs 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1 @@
+usr/games
Added: packages/trunk/pathogen/debian/docs
===================================================================
--- packages/trunk/pathogen/debian/docs (rev 0)
+++ packages/trunk/pathogen/debian/docs 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1,3 @@
+README.txt
+timelog.txt
+postmortem.txt
Added: packages/trunk/pathogen/debian/manpages
===================================================================
--- packages/trunk/pathogen/debian/manpages (rev 0)
+++ packages/trunk/pathogen/debian/manpages 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1 @@
+debian/pathogen.6
Added: packages/trunk/pathogen/debian/menu
===================================================================
--- packages/trunk/pathogen/debian/menu (rev 0)
+++ packages/trunk/pathogen/debian/menu 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1,2 @@
+?package(pathogen):needs="X11" section="Games/Strategy"\
+ title="Pathogen Warrior" command="/usr/games/pathogen"
Added: packages/trunk/pathogen/debian/pathogen.6
===================================================================
--- packages/trunk/pathogen/debian/pathogen.6 (rev 0)
+++ packages/trunk/pathogen/debian/pathogen.6 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1,26 @@
+.TH PATHOGEN 6 "July 14, 2004"
+.SH NAME
+pathogen \- Puzzle game about matching 3D model structures
+.SH SYNOPSIS
+.B pathogen
+.SH DESCRIPTION
+This manual page documents briefly the
+.B pathogen
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBPathogen Warrior\fP is a puzzle game about matching 3D model structures
+with a 2D hexagon map. It was one of the entrants to the 4th Ludum Dare
+48-hour game development competition. The theme of the competition was
+"Infection". In Pathogen Warrior, the player's task is to match rotating
+3D pathogen structures with a 2D model using a hexagon map. The time to
+accomplish the task is limited, and after successfully completing one
+pathogen, the player is advanced to next level, which has a more challenging
+pathogen.
+.SH AUTHOR
+This manual page was written by Gürkan Sengün <gurkan at linuks.mine.nu>,
+for the Debian project (but may be used by others).
Added: packages/trunk/pathogen/debian/rules
===================================================================
--- packages/trunk/pathogen/debian/rules (rev 0)
+++ packages/trunk/pathogen/debian/rules 2008-04-16 16:46:49 UTC (rev 6585)
@@ -0,0 +1,81 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+ #/usr/bin/docbook-to-man debian/pathogen.sgml > pathogen.1
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/pathogen.
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/pathogen
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# 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
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: packages/trunk/pathogen/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/trunk/pathogen/src/BuildState.cpp
===================================================================
--- packages/trunk/pathogen/src/BuildState.cpp 2008-04-16 16:46:15 UTC (rev 6584)
+++ packages/trunk/pathogen/src/BuildState.cpp 2008-04-16 16:46:49 UTC (rev 6585)
@@ -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;
}
Modified: packages/trunk/pathogen/src/GameApp.cpp
===================================================================
--- packages/trunk/pathogen/src/GameApp.cpp 2008-04-16 16:46:15 UTC (rev 6584)
+++ packages/trunk/pathogen/src/GameApp.cpp 2008-04-16 16:46:49 UTC (rev 6585)
@@ -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();
Added: packages/trunk/pathogen/src/errormsg.cpp
===================================================================
--- packages/trunk/pathogen/src/errormsg.cpp (rev 0)
+++ packages/trunk/pathogen/src/errormsg.cpp 2008-04-16 16:46:49 UTC (rev 6585)
@@ -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);
+}
Modified: packages/trunk/pathogen/src/sound.cpp
===================================================================
--- packages/trunk/pathogen/src/sound.cpp 2008-04-16 16:46:15 UTC (rev 6584)
+++ packages/trunk/pathogen/src/sound.cpp 2008-04-16 16:46:49 UTC (rev 6585)
@@ -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
More information about the Pkg-games-commits
mailing list