[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-19-ga2fd336

[Thomas Weber]

tags 570771 pending
thanks

The following commit has been merged in the master branch:
commit b7301effc29651e2e32300b7f3d890e1fd922287
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Thu Mar 4 01:02:08 2010 +0100

    Compile on mips and mipsel without -dgb package; bug fix for 570771

diff --git a/debian/changelog b/debian/changelog
index 2d75fbe..344697d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ octave3.2 (3.2.4-3) UNRELEASED; urgency=low
 
   * debian/control: Remove Rafael Laboissiere from Uploaders (closes: #571833,
     #571835)
+  * debian/in/control: Compile without debug symbols on mips and mipsel
+    (closes: #570771). This means we ship with an almost empty -dbg package on
+    these architectures.
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 20:22:41 +0100
 
diff --git a/debian/rules b/debian/rules
index b779562..896c7cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,6 +93,14 @@ compilerflags	= -O0 -g0
 atlas		= --without-blas
 endif
 
+# drop debugging symbols for now (#570771)
+ifeq ($(DEB_BUILD_ARCH),mips)
+compilerflags	= -O2 
+endif
+ifeq ($(DEB_BUILD_ARCH),mipsel)
+compilerflags	= -O2 
+endif
+
 c_compiler	= gcc
 cxx_compiler	= g++
 
@@ -459,7 +467,18 @@ ifneq ($(PACKAGEVER),$(major))
 		usr/share/man/man1/octave$(major)-depends.1.gz \
 		usr/share/man/man1/octave$(PACKAGEVER)-depends.1.gz
 endif
+
+# crude hack for #570771
+ifeq ($(DEB_BUILD_ARCH),mips)
+	dh_strip -a 
+else 
+ifeq ($(DEB_BUILD_ARCH),mipsel)
+	dh_strip -a 
+else
 	dh_strip -a --dbg-package=$(PACKAGE)-dbg
+endif
+endif
+	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a

-- 
octave