r10554 - packages/trunk/teg/debian

[Peter De Wachter]

Author: pdewacht-guest
Date: 2009-11-21 21:04:15 +0000 (Sat, 21 Nov 2009)
New Revision: 10554

Modified:
   packages/trunk/teg/debian/changelog
   packages/trunk/teg/debian/control
   packages/trunk/teg/debian/rules
Log:
teg: refresh config.sub/guess on build for avr32 port


Modified: packages/trunk/teg/debian/changelog
===================================================================
--- packages/trunk/teg/debian/changelog	2009-11-21 20:44:46 UTC (rev 10553)
+++ packages/trunk/teg/debian/changelog	2009-11-21 21:04:15 UTC (rev 10554)
@@ -6,11 +6,14 @@
     + Remove unnecessary comments.
 
   [ Peter De Wachter ]
-  * debian/rules: unpatch before cleaning (Closes: #538689)
+  * debian/rules:
+    + Unpatch before cleaning (Closes: #538689)
+    + Update config.sub and config.guess before building (Closes: #546020)
   * Replaced libreadline5-dev build dependency with libreadline-dev
     (Closes: #553866)
+  * Bumped Standards-Version to 3.8.3, no changes required. 
 
- -- Peter De Wachter <pdewacht at gmail.com>  Sat, 21 Nov 2009 21:27:25 +0100
+ -- Peter De Wachter <pdewacht at gmail.com>  Sat, 21 Nov 2009 21:54:56 +0100
 
 teg (0.11.2+debian-2) unstable; urgency=low
 

Modified: packages/trunk/teg/debian/control
===================================================================
--- packages/trunk/teg/debian/control	2009-11-21 20:44:46 UTC (rev 10553)
+++ packages/trunk/teg/debian/control	2009-11-21 21:04:15 UTC (rev 10554)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Cyril Brulebois <kibi at debian.org>, Evgeni Golov <sargentd at die-welt.net>
-Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5.0.0), gettext, intltool, libtool, librsvg2-dev, libart-2.0-dev, libatk1.0-dev, libbonobo2-dev, libbonoboui2-dev, libfreetype6-dev, libgconf2-dev, libglib2.0-dev, libgnome2-dev, libgnomecanvas2-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomevfs2-dev (>= 2.0.2-4), libgtk2.0-dev (>= 2.0.6), liborbit2-dev, libpango1.0-dev, libpopt-dev, libxml2-dev, zlib1g-dev, libreadline-dev, quilt
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, gettext, intltool, libtool, librsvg2-dev, libart-2.0-dev, libatk1.0-dev, libbonobo2-dev, libbonoboui2-dev, libfreetype6-dev, libgconf2-dev, libglib2.0-dev, libgnome2-dev, libgnomecanvas2-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomevfs2-dev (>= 2.0.2-4), libgtk2.0-dev (>= 2.0.6), liborbit2-dev, libpango1.0-dev, libpopt-dev, libxml2-dev, zlib1g-dev, libreadline-dev, quilt
 Homepage: http://teg.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/teg/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/teg/?op=log

Modified: packages/trunk/teg/debian/rules
===================================================================
--- packages/trunk/teg/debian/rules	2009-11-21 20:44:46 UTC (rev 10553)
+++ packages/trunk/teg/debian/rules	2009-11-21 21:04:15 UTC (rev 10554)
@@ -14,11 +14,28 @@
 endif
 
 
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
 
+
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	LDFLAGS="-Wl,-z,defs -Wl,--as-needed" ./configure --prefix=/usr \
+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
+	LDFLAGS="-Wl,-z,defs -Wl,--as-needed" ./configure $(CROSS) \
+		--prefix=/usr \
 		--bindir=/usr/games \
 		--sysconfdir=/etc \
 		--datadir=/usr/share/games/teg \
@@ -40,6 +57,7 @@
 	# Make distclean doesn't do its job.
 	rm -f intltool-update
 	-find docs/gnome-help -name '*.html' -delete
+	rm -f config.sub config.guess
 	dh_clean po/*.gmo configure-stamp build-stamp config.log config.status
 
 install: build