Package: hexxagon
Version: 1.0pl1-2
Severity: important
Tags: patch
Justification: fails to build from source
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu karmic ubuntu-patch
*** /tmp/tmp9PGSiM
In Ubuntu, we've applied the attached patch. It now builds from source,
fixes some lithian bugs and closes the debian #449989 bug.
It achieves the following:
* src/libhexx/bitboard64.h: Fixed printf not defined
(LP: #457652)
* src/libhexx/move.h: Changed _MOVE_H to _HEXXAGONMOVE_H
to avoid collision with gcc c++/4.4/bits/move.h
* debian/watch: Find .bz2 files (closes: #449989)
* debian/control: added comma (,) between depends
* debian/rules: Fixed debian-rules-ignores-make-clean-error
and debian-rules-sets-DH_COMPAT
* debian/compat: Created
* debian/copyright: Fixed old-fsf-address-in-copyright-file
and copyright-without-copyright-notice
We thought you might be interested in doing the same.
-- System Information:
Debian Release: squeeze/sid
APT prefers karmic-updates
APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 'karmic')
Architecture: i386 (i686)
Kernel: Linux 2.6.31-14-generic (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u hexxagon-1.0pl1/src/libhexx/bitboard64.h hexxagon-1.0pl1/src/libhexx/bitboard64.h
--- hexxagon-1.0pl1/src/libhexx/bitboard64.h
+++ hexxagon-1.0pl1/src/libhexx/bitboard64.h
@@ -25,6 +25,7 @@
#include <netinet/in.h>
#include <iostream>
+#include <stdio.h>
namespace libhexx
{
diff -u hexxagon-1.0pl1/debian/changelog hexxagon-1.0pl1/debian/changelog
diff -u hexxagon-1.0pl1/debian/control hexxagon-1.0pl1/debian/control
--- hexxagon-1.0pl1/debian/control
+++ hexxagon-1.0pl1/debian/control
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Michael Piefel <pie...@debian.org>
Build-Depends: debhelper (>> 5), libgtkmm-2.4-dev, autotools-dev
-Standards-Version: 3.7.0
+Standards-Version: 3.8.3
Package: hexxagon
Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}
+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.
diff -u hexxagon-1.0pl1/debian/rules hexxagon-1.0pl1/debian/rules
--- hexxagon-1.0pl1/debian/rules
+++ hexxagon-1.0pl1/debian/rules
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=5
-
# 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)
@@ -62,7 +59,7 @@
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
diff -u hexxagon-1.0pl1/debian/copyright hexxagon-1.0pl1/debian/copyright
--- hexxagon-1.0pl1/debian/copyright
+++ hexxagon-1.0pl1/debian/copyright
@@ -8,6 +8,9 @@
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
@@ -20,8 +23,8 @@
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.
+ 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 Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -u hexxagon-1.0pl1/debian/watch hexxagon-1.0pl1/debian/watch
--- hexxagon-1.0pl1/debian/watch
+++ hexxagon-1.0pl1/debian/watch
@@ -1,8 +1,8 @@
-# format version number, currently 2; this line is compulsory!
-version=2
+# format version number, currently 3; this line is compulsory!
+version=3
# Line continuations are performed with \
# This is a variant HTTP format with more possibilities:
# Homepage Pattern [Version [Action]]
-http://www.nesqi.se/hexxagon/ download/hexxagon-([\d\.]*).tar.gz
+http://www.nesqi.se/hexxagon/index.php?page=40_Download hexxagon/download/hexxagon-([\d\.]*).tar.(?:gz|bz2)
only in patch2:
unchanged:
--- hexxagon-1.0pl1.orig/debian/compat
+++ hexxagon-1.0pl1/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- 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"
only in patch2:
unchanged:
--- 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 <sys/timeb.h>
#include <stdlib.h>
