[SCM] flac packaging branch, master, updated. debian/1.2.1-1.2-1-g5246244

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5246244731968845975a5ddd320d78c60e597c19
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Aug 3 15:43:45 2009 +0200

    libFLAC.so.8.2.0 contains text relocations from non-PIC code. This is a
    policy violation if done without really good reasons.
    
    The build output depends on the kernel architecture. i386 for example
    may report i686 or x86_64. The configure script needs to get the correct
    architecture via a --build parameter from DEB_HOST_GNU_TYPE.

diff --git a/debian/changelog b/debian/changelog
index 48798b1..4300611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+flac (1.2.1-1.3) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Disable use of asembler optimizations. (closes: #525826)
+  * Provide proper architecture information to build system. (closes: #525829)
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 27 Apr 2009 13:09:23 +0000
+
 flac (1.2.1-1.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index cb26220..3920439 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: flac
 Section: sound
 Priority: optional
 Maintainer: Joshua Kwan <joshk at triplehelix.org>
-Build-Depends: debhelper (>= 4), nasm (>= 0.99.02-1) [i386], doxygen, libid3-3.8.3-dev (>= 3.8.3-4.2), libogg-dev, g++ (>= 2:3.2), dpatch
+Build-Depends: debhelper (>= 4), doxygen, libid3-3.8.3-dev (>= 3.8.3-4.2), libogg-dev, g++ (>= 2:3.2), dpatch
 Standards-Version: 3.7.2
 
 Package: flac
diff --git a/debian/rules b/debian/rules
index 6bc2c4b..a4d7f72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,33 +7,27 @@ top_srcdir:=$(shell pwd)
 tmp:=debian/tmp
 tmp_absolute:=$(top_srcdir)/$(tmp)
 
-CFLAGS=-g
-
-ifeq "$(findstring debug,$(DEB_BUILD_OPTIONS))" ""
-CFLAGS += -O2
-else
-CFLAGS += -O0
-endif
-
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
-ifeq ($(DEB_HOST_ARCH),powerpc)
-EXTRA_CONFIGURE_ARGS:=--disable-asm-optimizations
-else
 ifeq ($(DEB_HOST_ARCH),m68k)
 CFLAGS += -fno-inline-functions
-else
-EXTRA_CONFIGURE_ARGS=
 endif
+
+CONFIGURE_ARGS = --build=$(DEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+CONFIGURE_ARGS += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
 configure: patch configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
 
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
-		--mandir=/usr/share/man --disable-rpath $(EXTRA_CONFIGURE_ARGS)
-		--disable-xmms-plugin
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure $(CONFIGURE_ARGS) \
+		--prefix=/usr --mandir=/usr/share/man --disable-rpath \
+		--disable-xmms-plugin \
+		--disable-asm-optimizations
 	sh debian/fixrpath
 	touch $@
 

-- 
flac packaging