--- hexxagon-1.0pl1.orig/src/libhexx/bitboard64.h +++ hexxagon-1.0pl1/src/libhexx/bitboard64.h @@ -25,6 +25,7 @@ #include #include +#include namespace libhexx { @@ -52,7 +53,7 @@ void printInHex() { - printf("0x%X, 0x%X\n", lowbits, highbits); + std::printf("0x%X, 0x%X\n", lowbits, highbits); }; friend std::ostream& operator<<(std::ostream &output, const class BitBoard64 &b); @@ -62,6 +63,9 @@ uint32_t lowbits, highbits; }; + + std::ostream& operator<<(std::ostream &output, const class BitBoard64 &b); + std::istream& operator>>(std::istream &input, class BitBoard64 &b); } #endif --- hexxagon-1.0pl1.orig/src/libhexx/move.cpp +++ hexxagon-1.0pl1/src/libhexx/move.cpp @@ -20,8 +20,8 @@ */ -#include "board.h" #include "move.h" +#include "board.h" #include #include --- hexxagon-1.0pl1.orig/src/libhexx/move.h +++ hexxagon-1.0pl1/src/libhexx/move.h @@ -20,8 +20,8 @@ */ -#ifndef _MOVE_H -#define _MOVE_H +#ifndef _HEXXAGONMOVE_H +#define _HEXXAGONMOVE_H #include "board.h" --- hexxagon-1.0pl1.orig/src/gui/gtkhexxagonboard.cpp +++ hexxagon-1.0pl1/src/gui/gtkhexxagonboard.cpp @@ -138,8 +138,8 @@ posx += width * offset / 2; posy += height * offset / 2; - int x = (int) round(posx) + xoff; - int y = (int) round(posy) + yoff; + int nx = (int) round(posx) + xoff; + int ny = (int) round(posy) + yoff; int type; LookUp lookup(bbMask); @@ -173,10 +173,10 @@ Glib::RefPtr gc = Gdk::GC::create(back); gc->set_clip_mask(mask[type]); - gc->set_clip_origin(x, y); + gc->set_clip_origin(nx, ny); if(back && map_board[type]) - back->draw_drawable(gc, map_board[type], 0, 0, x, y, -1, -1); + back->draw_drawable(gc, map_board[type], 0, 0, nx, ny, -1, -1); cellNo++; } @@ -224,12 +224,12 @@ posx += width * offset / 2; posy += height * offset / 2; - int x = (int) round(posx + w / 2) + xoff; - int y = (int) round(posy + h / 2) + yoff; + int nx = (int) round(posx + w / 2) + xoff; + int ny = (int) round(posy + h / 2) + yoff; // Now we got the place for cell cellNo - double dx = inx - x; - double dy = iny - y; + double dx = inx - nx; + double dy = iny - ny; double a = (w/2)*(w/2); double b = (h/2)*(h/2); --- hexxagon-1.0pl1.orig/images/marble/copyright +++ hexxagon-1.0pl1/images/marble/copyright @@ -0,0 +1 @@ +This tileset was drawn entirely by myself (Michael Piefel) with GIMP. It is public domain. --- hexxagon-1.0pl1.orig/images/debian/copyright +++ hexxagon-1.0pl1/images/debian/copyright @@ -0,0 +1,3 @@ +This tileset is based on the original, but with Debian Swirl and Linux Penguin +as playing stones. The logos where taken from http://www.debian.org/logos/ and +http://www.isc.tamu.edu/~lewing/linux/, respectively. --- hexxagon-1.0pl1.orig/debian/rules +++ hexxagon-1.0pl1/debian/rules @@ -0,0 +1,112 @@ +#!/usr/bin/make -f +# 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 + +# Proper autotools handling as per autotools-dev/README.Debian +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) +else + CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + mv config.sub config.sub.upstream && ln -s /usr/share/misc/config.sub + mv config.guess config.guess.upstream && ln -s /usr/share/misc/config.guess + touch images/Makefile.in Makefile.in # Prevent automake call + touch src/libhexx/Makefile.in src/gui/Makefile.in src/Makefile.in + ./configure $(CONFFLAGS) --prefix=/usr \ + '--mandir=$${prefix}/share/man' '--infodir=$${prefix}/share/info' \ + '--bindir=$${prefix}/games' + rm config.sub && mv config.sub.upstream config.sub + rm config.guess && mv config.guess.upstream config.guess + + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + mv config.sub config.sub.upstream && ln -s /usr/share/misc/config.sub + mv config.guess config.guess.upstream && ln -s /usr/share/misc/config.guess + # Add here commands to compile the package. + $(MAKE) + #/usr/bin/docbook-to-man debian/hexxagon.sgml > hexxagon.1 + rm config.sub && mv config.sub.upstream config.sub + rm config.guess && mv config.guess.upstream config.guess + + 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) distclean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/hexxagon. + $(MAKE) install prefix=$(CURDIR)/debian/hexxagon/usr + cp debian/hexxagon.1 debian/hexxagon/usr/share/man/man1/hexxagon.1 + + +# 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_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit + dh_installcron + dh_installman + dh_installinfo +# dh_undocumented + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- hexxagon-1.0pl1.orig/debian/hexxagon.docs +++ hexxagon-1.0pl1/debian/hexxagon.docs @@ -0,0 +1 @@ +README --- hexxagon-1.0pl1.orig/debian/control +++ hexxagon-1.0pl1/debian/control @@ -0,0 +1,18 @@ +Source: hexxagon +Section: games +Priority: optional +Maintainer: Michael Piefel +Build-Depends: debhelper (>> 5), libgtkmm-2.4-dev, autotools-dev +Standards-Version: 3.8.3 + +Package: hexxagon +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Hexagonal Ataxx clone + The goal of the game is to conquer as much of the board as possible. + This is done by capturing the opponent’s pieces or by cloning your own. + The board is a hexagon built from smaller hexagons. + . + Hexxagon is just like Ataxx apart from the board design; + the Ataxx board is square and the Hexxagon board is hexagonal. + Hexxagon also offers alternatives boards. --- hexxagon-1.0pl1.orig/debian/changelog +++ hexxagon-1.0pl1/debian/changelog @@ -0,0 +1,100 @@ +hexxagon (1.0pl1-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "ftbfs with GCC-4.7": apply patch from Paul Tagliamonte that + disambiguates variable names. + Closes: #667200 + + -- gregor herrmann Sat, 05 May 2012 15:22:29 +0200 + +hexxagon (1.0pl1-3) unstable; urgency=low + + * Builds from source even with new GCC (closes: #551934, #560503, #564198) + * debian/watch: Find .bz2 files (closes: #449989) + * debian/copyight: Fix copyright and address; update URLs + + -- Michael Piefel Sun, 15 Nov 2009 21:34:00 +0100 + +hexxagon (1.0pl1-2) unstable; urgency=low + + * Fix for GCC 4.2 (closes: #361563) + + -- Michael Piefel Thu, 27 Apr 2006 16:37:41 +0200 + +hexxagon (1.0pl1-1) unstable; urgency=low + + * Massive deviation from upstream, as upstream seems inoperational. + Therefore http://people.debian.org/~piefel/hexxagon_1.0pl1.orig.tar.gz + is the preliminary new upstream. + * Added option to change tileset, and added some tilesets (closes: #328052) + + -- Michael Piefel Wed, 14 Sep 2005 16:35:44 +0200 + +hexxagon (1.0-2) unstable; urgency=low + + * Recompile with new GCC (new C++ ABI) + + -- Michael Piefel Tue, 26 Jul 2005 11:09:15 +0200 + +hexxagon (1.0-1) unstable; urgency=low + + * New upstream. + * The text client has vanished. Therefore the package hexxagon-text + has gone as well. + * Cleaned up build-deps (closes: #268602) + * Game shows clearly who has won (closes: #242339) + + -- Michael Piefel Mon, 24 Jan 2005 13:32:36 +0100 + +hexxagon (0.3.3-1) unstable; urgency=low + + * New upstream. This makes the computer quite smart again and thereby + closes: #263786 in a different way than the bug submitter intended. + Since the submitter was upstream and fixed it himself, I guess this fix + counts. Unfortunately, now the game is too strong for me once more. + * Add watch file. + + -- Michael Piefel Mon, 09 Aug 2004 11:18:33 +0200 + +hexxagon (0.3.2-2) unstable; urgency=low + + * Don't install not gzipped version of man page with gz suffix + (closes: #242678) + + -- Michael Piefel Thu, 08 Apr 2004 11:52:56 +0200 + +hexxagon (0.3.2-1) unstable; urgency=low + + * New upstream + + -- Michael Piefel Tue, 06 Apr 2004 16:09:47 +0200 + +hexxagon (0.3.1-4) unstable; urgency=low + + * I don't play it either, but it's simple + * add proper config.* handling (closes: #197917) + * convert to GTK+ 2.0 + * add a man page (closes: #136105) + + -- Michael Piefel Fri, 05 Sep 2003 15:43:12 +0200 + +hexxagon (0.3.1-3) unstable; urgency=low + + * the "i never play this, please adopt" release. + * Replaced multiline string by gcc-3.3 compatible one. + (Closes: #196408, thanks Andreas Metzler) + + -- Erich Schubert Tue, 15 Jul 2003 17:22:53 +0200 + +hexxagon (0.3.1-2) unstable; urgency=low + + * Improved Description (Thanks, Meinolf Sander) + + -- Erich Schubert Sat, 30 Mar 2002 10:43:39 +0100 + +hexxagon (0.3.1-1) unstable; urgency=low + + * Initial Release (Closes: #134770). + + -- Erich Schubert Wed, 20 Feb 2002 00:32:35 +0100 + --- hexxagon-1.0pl1.orig/debian/compat +++ hexxagon-1.0pl1/debian/compat @@ -0,0 +1 @@ +5 --- hexxagon-1.0pl1.orig/debian/hexxagon.dirs +++ hexxagon-1.0pl1/debian/hexxagon.dirs @@ -0,0 +1,3 @@ +usr/games +usr/share/doc/hexxagon +usr/share/man/man1 --- hexxagon-1.0pl1.orig/debian/copyright +++ hexxagon-1.0pl1/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Erich Schubert on +Wed, 20 Feb 2002 00:32:35 +0100. + +It was downloaded from http://www.nesqi.se/hexxagon/ + +Upstream Author: Erik Jonsson + +Hexxagon is licensed under the GNU General Public License (GPL.) + +Copyright: + Copyright (C) 2001 Erik Jonsson. + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License Version 2 can be found in `/usr/share/common-licenses/GPL-2'. + --- hexxagon-1.0pl1.orig/debian/docs +++ hexxagon-1.0pl1/debian/docs @@ -0,0 +1 @@ +README --- hexxagon-1.0pl1.orig/debian/watch +++ hexxagon-1.0pl1/debian/watch @@ -0,0 +1,6 @@ +# format version number, currently 3; this line is compulsory! +version=3 + +# Line continuations are performed with \ +http://www.nesqi.se/hexxagon/index.php?page=40_Download \ +hexxagon/download/hexxagon-([\d\.]*)\.tar\.[gb]z2? --- hexxagon-1.0pl1.orig/debian/hexxagon.menu +++ hexxagon-1.0pl1/debian/hexxagon.menu @@ -0,0 +1,2 @@ +?package(hexxagon):needs="X11" section="Games/Puzzles" \ + title="Hexxagon" command="/usr/games/hexxagon" --- hexxagon-1.0pl1.orig/debian/hexxagon.1 +++ hexxagon-1.0pl1/debian/hexxagon.1 @@ -0,0 +1,27 @@ +.TH HEXXAGON 1 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +hexxagon \- Hexagonal Ataxx-style game +.SH SYNOPSIS +.B hexxagon +.SH "DESCRIPTION" +This manual page documents briefly the +.BR hexxagon +command. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. + +.B hexxagon +is a nice clone of Ataxx, only in hexagonal form. + +Click on one of your pieces to move or jump. Moving will create a new piece, +jumping will, well, jump. When you put one of your pieces next to your +opponent's pieces, those will change color. +.SH OPTIONS +This program doesn't take any command line options. +.SH AUTHOR +This manual page was written by Michael Piefel , +for the Debian GNU/Linux system (but may be used by others). + +Hexxagon was written by Erik Jonsson .