r4712 - in packages/trunk/qonk/debian: . patches
Barry deFreese
bddebian-guest at alioth.debian.org
Mon Nov 19 04:20:55 UTC 2007
Author: bddebian-guest
Date: 2007-11-19 04:20:55 +0000 (Mon, 19 Nov 2007)
New Revision: 4712
Added:
packages/trunk/qonk/debian/patches/10_build_environment.diff
packages/trunk/qonk/debian/patches/series
packages/trunk/qonk/debian/qonk.desktop
Removed:
packages/trunk/qonk/debian/patches/00-invalid_operator.patch
Modified:
packages/trunk/qonk/debian/changelog
packages/trunk/qonk/debian/control
packages/trunk/qonk/debian/rules
Log:
* New upstream release
* Move from simple-patch-sys to quilt
* 10_build_environment.diff - Fix upstream build issues
+ Thanks to Ben Asselstine for the fix
* Autoreconf on build to pick up fixes from patch
* Add build-deps for autoconf, automake, and libtool
* Add myself to uploaders
* Add VCS fields in control
* Add desktop file
Modified: packages/trunk/qonk/debian/changelog
===================================================================
--- packages/trunk/qonk/debian/changelog 2007-11-19 04:07:28 UTC (rev 4711)
+++ packages/trunk/qonk/debian/changelog 2007-11-19 04:20:55 UTC (rev 4712)
@@ -1,3 +1,18 @@
+qonk (0.3.1-1) UNRELEASED; urgency=low
+
+ [ Barry deFreese ]
+ * New upstream release
+ * Move from simple-patch-sys to quilt
+ * 10_build_environment.diff - Fix upstream build issues
+ + Thanks to Ben Asselstine for the fix
+ * Autoreconf on build to pick up fixes from patch
+ * Add build-deps for autoconf, automake, and libtool
+ * Add myself to uploaders
+ * Add VCS fields in control
+ * Add desktop file
+
+ -- Barry deFreese <bddebian at comcast.net> Sun, 18 Nov 2007 22:59:58 -0500
+
qonk (0.3.0-2) unstable; urgency=low
* A typo in upstream code prevented from locating the font.ttf file.
Modified: packages/trunk/qonk/debian/control
===================================================================
--- packages/trunk/qonk/debian/control 2007-11-19 04:07:28 UTC (rev 4711)
+++ packages/trunk/qonk/debian/control 2007-11-19 04:20:55 UTC (rev 4712)
@@ -2,11 +2,13 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Martín Ferrari <martin.ferrari at gmail.com>
-Build-Depends: cdbs, debhelper (>= 5), libsdl1.2-dev, libsdl-ttf2.0-dev,
- libsdl-gfx1.2-dev, libsdl-image1.2-dev, patchutils
+Uploaders: Martín Ferrari <martin.ferrari at gmail.com>, Barry deFreese <bddebian at comcast.net>
+Build-Depends: cdbs, debhelper (>= 5), quilt, autoconf, automake, libtool, libsdl1.2-dev, libsdl-ttf2.0-dev,
+ libsdl-gfx1.2-dev, libsdl-image1.2-dev
Standards-Version: 3.7.2
Homepage: http://sourceforge.net/projects/qonk/
+Vcs-Svn: ssh://svn.debian.org/svn/pkg-games/packages/trunk/qonk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/qonk/?op=log
Package: qonk
Architecture: any
Deleted: packages/trunk/qonk/debian/patches/00-invalid_operator.patch
===================================================================
--- packages/trunk/qonk/debian/patches/00-invalid_operator.patch 2007-11-19 04:07:28 UTC (rev 4711)
+++ packages/trunk/qonk/debian/patches/00-invalid_operator.patch 2007-11-19 04:20:55 UTC (rev 4712)
@@ -1,11 +0,0 @@
---- qonk-0.3.0/src/fonts.cpp.orig 2007-10-16 02:35:33.000000000 -0300
-+++ qonk-0.3.0/src/fonts.cpp 2007-10-16 02:35:39.000000000 -0300
-@@ -8,7 +8,7 @@
-
- Font::Font( char* fileName, int size ) {
- std::string s = PKG_DATA_DIR;
-- s =+ fileName;
-+ s += fileName;
-
- if (font = TTF_OpenFont (s.c_str(), size)) {
- TTF_SetFontStyle( font, TTF_STYLE_NORMAL );
Added: packages/trunk/qonk/debian/patches/10_build_environment.diff
===================================================================
--- packages/trunk/qonk/debian/patches/10_build_environment.diff (rev 0)
+++ packages/trunk/qonk/debian/patches/10_build_environment.diff 2007-11-19 04:20:55 UTC (rev 4712)
@@ -0,0 +1,179 @@
+diff -uNrd qonk-0.3.1.orig/Makefile.am qonk-0.3.1/Makefile.am
+--- qonk-0.3.1.orig/Makefile.am 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/Makefile.am 2007-11-18 20:47:03.000000000 -0500
+@@ -1,4 +1,5 @@
+ SUBDIRS = guichan src data
++AUTOMAKE_OPTIONS=foreign
+
+ EXTRA_DIST = autogen.sh README COPYING missing TODO HISTORY THANKYOU
+
+diff -uNrd qonk-0.3.1.orig/src/canvas.h qonk-0.3.1/src/canvas.h
+--- qonk-0.3.1.orig/src/canvas.h 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/canvas.h 2007-11-18 20:55:30.000000000 -0500
+@@ -10,7 +10,7 @@
+
+ #include <SDL/SDL.h>
+
+-#include "guichan/guichan/sdl.hpp"
++#include "guichan/sdl.hpp"
+
+ class Coordinate;
+ class Font;
+diff -uNrd qonk-0.3.1.orig/src/controloptions.cpp qonk-0.3.1/src/controloptions.cpp
+--- qonk-0.3.1.orig/src/controloptions.cpp 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/controloptions.cpp 2007-11-18 20:57:10.000000000 -0500
+@@ -1,7 +1,7 @@
+ #include <iostream>
+ #include <map>
+
+-#include "guichan/guichan.hpp"
++#include "guichan.hpp"
+
+ #include "ui/menuaction.h"
+
+diff -uNrd qonk-0.3.1.orig/src/gameoptions.cpp qonk-0.3.1/src/gameoptions.cpp
+--- qonk-0.3.1.orig/src/gameoptions.cpp 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/gameoptions.cpp 2007-11-18 20:56:00.000000000 -0500
+@@ -3,7 +3,7 @@
+
+ #include <SDL/SDL.h>
+
+-#include "guichan/guichan.hpp"
++#include "guichan.hpp"
+
+ #include "ui/menuaction.h"
+
+diff -uNrd qonk-0.3.1.orig/src/Makefile.am qonk-0.3.1/src/Makefile.am
+--- qonk-0.3.1.orig/src/Makefile.am 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/Makefile.am 2007-11-18 20:50:33.000000000 -0500
+@@ -1,5 +1,4 @@
+ SUBDIRS = lisp ui
+-
+ INCLUDES = -I$(top_srcdir)/guichan
+
+ AM_CPPFLAGS=-DPKG_DATA_DIR="\"$(pkgdatadir)/\""
+diff -uNrd qonk-0.3.1.orig/src/menumanager.h qonk-0.3.1/src/menumanager.h
+--- qonk-0.3.1.orig/src/menumanager.h 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/menumanager.h 2007-11-18 20:50:40.000000000 -0500
+@@ -14,6 +14,7 @@
+ class GameOptions;
+
+ class MenuSystem;
++#include "ui/menuaction.h"
+
+ /**
+ * MenuManager forms the facade for interacting with the game's menus.
+@@ -66,7 +67,7 @@
+ VideoOptions &getVideoOptions() const { return *videoOptions; };
+ };
+
+-class QuitAction : public MenuAction
++class QuitAction : public MenuAction
+ {
+ Main &main;
+
+diff -uNrd qonk-0.3.1.orig/src/sdl_driver.h qonk-0.3.1/src/sdl_driver.h
+--- qonk-0.3.1.orig/src/sdl_driver.h 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/sdl_driver.h 2007-11-18 20:55:42.000000000 -0500
+@@ -9,8 +9,8 @@
+
+ #include <SDL/SDL.h>
+
+-#include "guichan/guichan.hpp"
+-#include "guichan/guichan/sdl.hpp"
++#include "guichan.hpp"
++#include "guichan/sdl.hpp"
+
+ #include "input.h"
+
+diff -uNrd qonk-0.3.1.orig/src/ui/Makefile.am qonk-0.3.1/src/ui/Makefile.am
+--- qonk-0.3.1.orig/src/ui/Makefile.am 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/ui/Makefile.am 2007-11-18 20:39:42.000000000 -0500
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS=-DPKG_DATA_DIR="\"$(pkgdatadir)/\""
+
+-INCLUDES = -I$(top_srcdir)/guichan
++INCLUDES = -I$(top_srcdir)/guichan -I$(top_srcdir)/src
+
+ noinst_LIBRARIES = libui.a
+
+diff -uNrd qonk-0.3.1.orig/src/ui/menuaction.cpp qonk-0.3.1/src/ui/menuaction.cpp
+--- qonk-0.3.1.orig/src/ui/menuaction.cpp 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/ui/menuaction.cpp 2007-11-18 20:52:51.000000000 -0500
+@@ -1,4 +1,4 @@
+-#include "guichan/guichan.hpp"
++#include "guichan.hpp"
+
+ #include "menuaction.h"
+
+diff -uNrd qonk-0.3.1.orig/src/ui/menuaction.h qonk-0.3.1/src/ui/menuaction.h
+--- qonk-0.3.1.orig/src/ui/menuaction.h 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/ui/menuaction.h 2007-11-18 20:53:41.000000000 -0500
+@@ -7,7 +7,7 @@
+ #ifndef MENUACTION_H
+ #define MENUACTION_H
+
+-#include "guichan/guichan.hpp"
++#include "guichan.hpp"
+
+ /* TODO: Realize all customized behavior with specific MenuEntry subclasses
+ * and remove the need for a MenuAction delegate object.
+diff -uNrd qonk-0.3.1.orig/src/ui/menuentry.cpp qonk-0.3.1/src/ui/menuentry.cpp
+--- qonk-0.3.1.orig/src/ui/menuentry.cpp 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/ui/menuentry.cpp 2007-11-18 20:54:01.000000000 -0500
+@@ -1,4 +1,4 @@
+-#include "guichan/guichan.hpp"
++#include "guichan.hpp"
+
+ #include "menuentry.h"
+ #include "menusystem.h"
+diff -uNrd qonk-0.3.1.orig/src/ui/menuentry.h qonk-0.3.1/src/ui/menuentry.h
+--- qonk-0.3.1.orig/src/ui/menuentry.h 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/ui/menuentry.h 2007-11-18 20:53:55.000000000 -0500
+@@ -7,7 +7,7 @@
+ #ifndef MENUENTRY_H
+ #define MENUENTRY_H
+
+-#include "guichan/guichan.hpp"
++#include "guichan.hpp"
+
+ class MenuSystem;
+
+diff -uNrd qonk-0.3.1.orig/src/ui/menu.h qonk-0.3.1/src/ui/menu.h
+--- qonk-0.3.1.orig/src/ui/menu.h 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/ui/menu.h 2007-11-18 20:54:08.000000000 -0500
+@@ -9,7 +9,7 @@
+
+ #include <vector>
+
+-#include "guichan/guichan.hpp"
++#include "guichan.hpp"
+
+ class MenuSystem;
+ class MenuEntry;
+diff -uNrd qonk-0.3.1.orig/src/ui/menusystem.h qonk-0.3.1/src/ui/menusystem.h
+--- qonk-0.3.1.orig/src/ui/menusystem.h 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/ui/menusystem.h 2007-11-18 20:54:20.000000000 -0500
+@@ -9,8 +9,8 @@
+
+ #include <map>
+
+-#include "guichan/guichan.hpp"
+-#include "guichan/guichan/sdl.hpp"
++#include "guichan.hpp"
++#include "guichan/sdl.hpp"
+
+ #include "menu.h"
+
+diff -uNrd qonk-0.3.1.orig/src/videooptions.cpp qonk-0.3.1/src/videooptions.cpp
+--- qonk-0.3.1.orig/src/videooptions.cpp 2007-09-14 01:43:03.000000000 -0400
++++ qonk-0.3.1/src/videooptions.cpp 2007-11-18 20:55:52.000000000 -0500
+@@ -3,7 +3,7 @@
+
+ #include <SDL/SDL.h>
+
+-#include "guichan/guichan.hpp"
++#include "guichan.hpp"
+
+ #include "ui/menuaction.h"
+
Added: packages/trunk/qonk/debian/patches/series
===================================================================
--- packages/trunk/qonk/debian/patches/series (rev 0)
+++ packages/trunk/qonk/debian/patches/series 2007-11-19 04:20:55 UTC (rev 4712)
@@ -0,0 +1 @@
+10_build_environment.diff
Added: packages/trunk/qonk/debian/qonk.desktop
===================================================================
--- packages/trunk/qonk/debian/qonk.desktop (rev 0)
+++ packages/trunk/qonk/debian/qonk.desktop 2007-11-19 04:20:55 UTC (rev 4712)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qonk
+GenericName=qonk
+Comment=Conquer the planets
+Type=Application
+Exec=qonk
+Icon=qonk
+Terminal=false
+Categories=Game;StrategyGame;
+
Modified: packages/trunk/qonk/debian/rules
===================================================================
--- packages/trunk/qonk/debian/rules 2007-11-19 04:07:28 UTC (rev 4711)
+++ packages/trunk/qonk/debian/rules 2007-11-19 04:20:55 UTC (rev 4712)
@@ -1,9 +1,12 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+DEB_AUTO_UPDATE_AUTOCONF = 2.61
+DEB_AUTO_UPDATE_AUTOMAKE = 1.10
+DEB_AUTO_UPDATE_LIBTOOL := 1.5
DEB_AUTO_CLEANUP_RCS := yes
DEB_INSTALL_CHANGELOGS_ALL := HISTORY
DEB_CONFIGURE_EXTRA_FLAGS := --bindir="\$${prefix}/games" \
More information about the Pkg-games-commits
mailing list