r8814 - packages/trunk/hitori/debian

Sun Feb 15 20:45:17 UTC 2009

Author: pdewacht-guest
Date: 2009-02-15 20:45:17 +0000 (Sun, 15 Feb 2009)
New Revision: 8814

Removed:
   packages/trunk/hitori/debian/patches/
Modified:
   packages/trunk/hitori/debian/changelog
   packages/trunk/hitori/debian/control
   packages/trunk/hitori/debian/copyright
   packages/trunk/hitori/debian/rules
   packages/trunk/hitori/debian/watch
Log:
get rid of my attempts to build this with gtk 2.12 (2.14 will be uploaded soon enough)


Modified: packages/trunk/hitori/debian/changelog
===================================================================

--- packages/trunk/hitori/debian/changelog	2009-02-15 20:00:59 UTC (rev 8813)
+++ packages/trunk/hitori/debian/changelog	2009-02-15 20:45:17 UTC (rev 8814)
@@ -1,8 +1,6 @@
 hitori (0.2.1-1) unstable; urgency=low
 
   * Initial release (Closes: #490222)
-  * The game is patched to use GnomeVFS to launch its help file. This patch
-    can be removed when GTK+ 2.14 enters the archive.
 
  -- Peter De Wachter <pdewacht at gmail.com>  Wed, 03 Sep 2008 20:04:39 +0200
 

Modified: packages/trunk/hitori/debian/control
===================================================================
--- packages/trunk/hitori/debian/control	2009-02-15 20:00:59 UTC (rev 8813)
+++ packages/trunk/hitori/debian/control	2009-02-15 20:45:17 UTC (rev 8814)
@@ -3,9 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, gnome-common,
- gnome-doc-utils, docbook-xml, intltool, libgtk2.0-dev (>= 2.12),
- libgnomevfs2-dev
+Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.14), chrpath
 Standards-Version: 3.8.0
 Homepage: http://tecnocode.co.uk/projects/hitori/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/hitori/

Modified: packages/trunk/hitori/debian/copyright
===================================================================
--- packages/trunk/hitori/debian/copyright	2009-02-15 20:00:59 UTC (rev 8813)
+++ packages/trunk/hitori/debian/copyright	2009-02-15 20:45:17 UTC (rev 8814)
@@ -11,7 +11,7 @@
 
 Copyright:
 
-    Copyright (C) Philip Withnall 2007-2008 <philip at tecnocode.co.uk>
+    Copyright Philip Withnall 2007-2008 <philip at tecnocode.co.uk>
 
 License:
 
@@ -37,10 +37,11 @@
     Texts, and no Back-Cover Texts.
 
 On Debian systems the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL'. The text of
-the GNU Free Documentation License can be found in the file
+can be found in the file `/usr/share/common-licenses/GPL-3'. The text
+of the GNU Free Documentation License can be found in the file
 `/usr/share/common-licenses/GFDL-1.2'.
 
 
-The Debian packaging is (C) 2008, Peter De Wachter <pdewacht at gmail.com>
-and is licensed under the same license (GPL) as the program. See above.
+The Debian packaging is Copyright 2008, Peter De Wachter
+<pdewacht at gmail.com> and is licensed under the same license (GPL) as
+the program. See above.

Modified: packages/trunk/hitori/debian/rules
===================================================================
--- packages/trunk/hitori/debian/rules	2009-02-15 20:00:59 UTC (rev 8813)
+++ packages/trunk/hitori/debian/rules	2009-02-15 20:45:17 UTC (rev 8814)
@@ -3,46 +3,61 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-SHELL = /bin/bash
 
-include /usr/share/quilt/quilt.make
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-build: patch build-stamp
-build-stamp:
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  CROSS = --build $(DEB_HOST_GNU_TYPE)
+else
+  CROSS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
-	NOCONFIGURE=1 ./autogen.sh
-# The GENERAL flags make configure skip its version check. Remove when we have GTK+ 2.14.
-	./configure \
-		--prefix /usr \
-		--bindir /usr/games \
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	./configure $(CROSS) \
+		--prefix=/usr \
+		--bindir=/usr/games \
 		--disable-scrollkeeper \
-		GENERAL_CFLAGS="`pkg-config --cflags gtk+-2.0 gmodule-export-2.0 gnome-vfs-2.0`" \
-		GENERAL_LIBS="`pkg-config --libs gtk+-2.0 gmodule-export-2.0 gnome-vfs-2.0`"
+		CFLAGS="$(CFLAGS)" \
+		LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
 	$(MAKE)
+	chrpath -d src/hitori #dealing with broken libtool the lazy way
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean configure config.sub config.guess aclocal.m4 libtool ltmain.sh \
-		po/Makefile.in.in po/POTFILES \
-		{.,src,help,data,data/icons,data/icons/*}/Makefile.in
+	dh_clean config.sub config.guess
 
-install: build install-stamp
-install-stamp:
+install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/hitori
-	touch install-stamp
 
-binary: install
+binary: binary-arch binary-indep
+
+binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_install
 	dh_installchangelogs ChangeLog
 # There are two changelogs!
-	install help/ChangeLog debian/hitori/usr/share/doc/hitori/changelog.help
+	install help/ChangeLog debian/hitori/usr/share/doc/hitori/changelog.documentation
 	dh_installdocs
 	dh_installman
 	dh_installmenu
@@ -58,4 +73,8 @@
 	dh_md5sums
 	dh_builddeb
 
-.PHONY: build clean install binary
+binary-indep:
+# Nothing to do.
+
+
+.PHONY: build clean install binary binary-arch binary-indep

Modified: packages/trunk/hitori/debian/watch
===================================================================
--- packages/trunk/hitori/debian/watch	2009-02-15 20:00:59 UTC (rev 8813)
+++ packages/trunk/hitori/debian/watch	2009-02-15 20:45:17 UTC (rev 8814)
@@ -1,3 +1,4 @@
 version=3
 
-http://tecnocode.co.uk/projects/hitori/ http://tecnocode.co.uk/downloads/hitori-(.*)\.tar\.gz
+http://tecnocode.co.uk/projects/hitori/ \
+  http://tecnocode.co.uk/downloads/hitori-(.*)\.tar\.gz


