[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-33-g5c333a4

[Thomas Weber]

tags 572407 pending
thanks

The following commit has been merged in the master branch:
commit 5c333a499d62e695f293cf7c1424061cdddda022
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Mar 20 15:01:07 2011 +0100

    Re-introduce debug packages for mips and mipsel (fix for 572407)

diff --git a/debian/changelog b/debian/changelog
index f89eb05..f4d3421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ octave3.2 (3.2.4-9) UNRELEASED; urgency=low
 
   * debian/in/control: Give an explicit package name as preference for the
     virtual build-dependency on libcurl4-dev (closes: #618139).
+  * Re-introduce debug packages for mips and mipsel (closes: #572407).
 
  -- Thomas Weber <tweber at debian.org>  Sun, 20 Mar 2011 14:52:22 +0100
 
diff --git a/debian/rules b/debian/rules
index 896c7cb..8d0b356 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,14 +93,6 @@ 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++
 
@@ -468,16 +460,7 @@ ifneq ($(PACKAGEVER),$(major))
 		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

-- 
octave