r6668 - packages/trunk/boson/debian

[Gonéri Le Bouder]

Author: goneri
Date: 2008-04-20 01:08:36 +0000 (Sun, 20 Apr 2008)
New Revision: 6668

Modified:
   packages/trunk/boson/debian/changelog
   packages/trunk/boson/debian/rules
Log:
* fix a FTBFS on hppa by adding -mlong-calls, many thanks to                                                                  
  Thibaut VARENE (Closes: #476730)                                                                                            
* pass CFLAGS to cmake correctly


Modified: packages/trunk/boson/debian/changelog
===================================================================
--- packages/trunk/boson/debian/changelog	2008-04-20 00:48:41 UTC (rev 6667)
+++ packages/trunk/boson/debian/changelog	2008-04-20 01:08:36 UTC (rev 6668)
@@ -1,10 +1,12 @@
 boson (0.13-4) unstable; urgency=low
 
-  [ Gonéri Le Bouder ]
+  * fix a FTBFS on hppa by adding -mlong-calls, many thanks to
+    Thibaut VARENE (Closes: #476730)
+  * pass CFLAGS to cmake correctly 
   * add fix_desktop_files.diff to make the desktop files Freedesktop
-    compliant, Thanks Stefan Ebner
+    compliant, Thanks Stefan Ebner (Closes: #475063)
 
- -- Gonéri Le Bouder <goneri at rulezlan.org>  Tue, 08 Apr 2008 22:51:35 +0200
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Sun, 20 Apr 2008 02:41:24 +0200
 
 boson (0.13-3) unstable; urgency=low
 
@@ -283,3 +285,13 @@
 
  -- Mickael Marchand <marchand at kde.org>  Mon, 12 May 2003 23:25:02 +0200
 
+boson (0.13-4.1) unstable; urgency=low
+
+  [ Gonéri Le Bouder ]
+  * add fix_desktop_files.diff to make the desktop files Freedesktop
+    compliant, Thanks Stefan Ebner
+
+  [ Goneri Le Bouder ]
+  * 
+
+ -- Goneri Le Bouder <goneri at rulezlan.org>  Sun, 20 Apr 2008 02:41:24 +0200

Modified: packages/trunk/boson/debian/rules
===================================================================
--- packages/trunk/boson/debian/rules	2008-04-20 00:48:41 UTC (rev 6667)
+++ packages/trunk/boson/debian/rules	2008-04-20 01:08:36 UTC (rev 6668)
@@ -10,12 +10,21 @@
 	CFLAGS += -O2
 endif
 
+ifeq (hppa,$(DEB_BUILD_ARCH))
+ARCH_C_FLAGS=-mlong-calls
+ARCH_CXX_FLAGS=${ARCH_C_FLAGS}
+endif
+
 configure: configure-stamp
 configure-stamp:
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	dh_testdir
 	mkdir -p debian/build-area
-	cd debian/build-area && cmake -DCMAKE_INSTALL_PREFIX=/usr $(CURDIR)
+	cd debian/build-area && cmake --debug-output \
+                -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+                -D CMAKE_CXX_FLAGS_RELWITHDEBINFO="${CFLAGS} ${ARCH_CXX_FLAGS}" \
+                -D CMAKE_C_FLAGS_RELWITHDEBINFO="${CFLAGS} ${ARCH_C_FLAGS}" \
+                -DCMAKE_INSTALL_PREFIX=/usr $(CURDIR)
 
 	touch configure-stamp