[maemo-commits] [maemo-commits] r13107 - in projects/haf/trunk/osso-gnomevfs-extra: . debian

[From: subversion at stage.maemo.org]

Author: martyn
Date: 2007-08-10 15:25:12 +0300 (Fri, 10 Aug 2007)
New Revision: 13107

Modified:
   projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
   projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
   projects/haf/trunk/osso-gnomevfs-extra/debian/rules
Log:
	* debian/rules: Fix building with the new Scratchbox toolchain,
	fixes NB#65416.


Modified: projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2007-08-10 12:19:47 UTC (rev 13106)
+++ projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2007-08-10 12:25:12 UTC (rev 13107)
@@ -1,3 +1,8 @@
+2007-08-10  Martyn Russell  <martyn at imendio.com>
+
+	* debian/rules: Fix building with the new Scratchbox toolchain,
+	fixes NB#65416.
+
 2007-06-01  Richard Hult  <richard at imendio.com>
 
 	* Release 1.9.4.

Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2007-08-10 12:19:47 UTC (rev 13106)
+++ projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2007-08-10 12:25:12 UTC (rev 13107)
@@ -1,3 +1,9 @@
+osso-gnomevfs-extra (1.9.4-2~unreleased) unstable; urgency=low
+
+  * Fixes: NB#65416, osso-gnomevfs-extra won't build
+
+ -- Martyn Russell <martyn at imendio.com>  Fri, 10 Aug 2007 17:00:00 +0100
+
 osso-gnomevfs-extra (1.9.4-1) unstable; urgency=low
 
   * Improve robustness when restarting the daemon

Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/rules
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/debian/rules	2007-08-10 12:19:47 UTC (rev 13106)
+++ projects/haf/trunk/osso-gnomevfs-extra/debian/rules	2007-08-10 12:25:12 UTC (rev 13107)
@@ -3,6 +3,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+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