[SCM] lbt packaging branch, master, updated. upstream/1.2.1-7-ga8d9895

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 4fdf92e6d5df229e11a0ad493eef880c0d4ec042
Author: Ralf Treinen <treinen at debian.org>
Date:   Wed Aug 3 09:47:21 2005 +0200

    Imported Debian patch 1.2.2-3

diff --git a/debian/changelog b/debian/changelog
index 119dfbb..b1e1a61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lbt (1.2.2-3) unstable; urgency=low
+
+  * Compile with -O3 instad of -O2 on m68 to work around a gcc-4.0 bug on
+    m68k (closes: Bug#320691).
+  * Compile with "-O0" when "noopt" is in DEB_BUILD_OPTIONS.
+
+ -- Ralf Treinen <treinen at debian.org>  Wed,  3 Aug 2005 09:47:21 +0200
+
 lbt (1.2.2-2) unstable; urgency=low
 
   * Standards-version 3.6.2 (no change).
diff --git a/debian/rules b/debian/rules
index e2ac1a9..d2c2e84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,18 +4,21 @@
 #export DH_VERBOSE=1
 
 # workaround for gcc-4.0 bug on m68k
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-ifeq ($(DEB_HOST_GNU_TYPE),"m68k-linux-gnu")
-	OPTFLAGS = "-O2"
-else
-	OPTFLAGS = "-O3"
+export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq ($(DEB_HOST_ARCH),m68k)
+  OPTFLAGS = -O2
+else		
+  OPTFLAGS = -O3
 endif
 
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  OPTFLAGS = -O0
+endif
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
+  OPTFLAGS += -g
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
+  INSTALL_PROGRAM += -s
 endif
 
 build: build-stamp

-- 
lbt packaging