r4758 - packages/trunk/allacrost/debian

[Jordà Polo]

Author: jorda-guest
Date: 2007-11-24 18:08:54 +0000 (Sat, 24 Nov 2007)
New Revision: 4758

Modified:
   packages/trunk/allacrost/debian/changelog
   packages/trunk/allacrost/debian/control
   packages/trunk/allacrost/debian/rules
Log:
* Only specify --buld and --host when needed.
* XS-Vcs -> Vcs.


Modified: packages/trunk/allacrost/debian/changelog
===================================================================
--- packages/trunk/allacrost/debian/changelog	2007-11-24 18:04:56 UTC (rev 4757)
+++ packages/trunk/allacrost/debian/changelog	2007-11-24 18:08:54 UTC (rev 4758)
@@ -7,12 +7,14 @@
     + Added Homepage field.
   * debian/allacrost-editor.menu: Section changed to «Games/Tools».
   * Simplified allacrost-data.install and removed unneeded *.dirs files.
+  * debian/rules: Only specify both --build and --host when it is actually
+    needed.
 
   [ Gonéri Le Bouder ]
   * Add a watchfile.
 
   [ Cyril Brulebois ]
-  * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
+  * Added Vcs-Svn and Vcs-Browser fields in the control file.
 
  -- Jordà Polo <jorda at ettin.org>  Tue, 26 Jun 2007 17:45:06 +0200
 

Modified: packages/trunk/allacrost/debian/control
===================================================================
--- packages/trunk/allacrost/debian/control	2007-11-24 18:04:56 UTC (rev 4757)
+++ packages/trunk/allacrost/debian/control	2007-11-24 18:08:54 UTC (rev 4758)
@@ -6,8 +6,8 @@
 Build-Depends: debhelper (>= 5), quilt (>= 0.40), autotools-dev, freeglut3-dev, libpng12-dev, libjpeg62-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libluabind-dev, libqt4-dev, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 Homepage: http://www.allacrost.org/
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/allacrost/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/allacrost/?op=log
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/allacrost/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/allacrost/?op=log
 
 Package: allacrost-demo
 Architecture: any

Modified: packages/trunk/allacrost/debian/rules
===================================================================
--- packages/trunk/allacrost/debian/rules	2007-11-24 18:04:56 UTC (rev 4757)
+++ packages/trunk/allacrost/debian/rules	2007-11-24 18:08:54 UTC (rev 4758)
@@ -6,11 +6,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# 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)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+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
+
 CXXFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -21,7 +25,7 @@
 
 config-stamp: configure
 	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	./configure $(confflags) \
 	            --prefix=/usr \
 	            --bindir=\$${prefix}/games \
 	            --datadir=\$${prefix}/share/games/allacrost \