[SCM] mplayer packaging branch, master, updated. debian/1.0.rc2+svn20090303-2-21-geb02a57

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 63f84eb8b014724263447bc37927154bec2ac5e7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 27 20:49:24 2009 +0100

    cleanup debian/rules: s/$(arch)/$(DEB_HOST_ARCH)
    
    this makes debian/rules follow the convention outlined in
    dpkg-architecture(1)
    cleanup debian/rules: handling of nostrip in DEB_BUILD_OPTIONS
    
    We configure mplayer with --enable-debug on all architectures but
    mipsen. This should close bug #520113.
    
    plus remove the fiddling with -fPIC -DPIC in config.mak, it didn't help
    anyway.

diff --git a/debian/rules b/debian/rules
index 0ba4417..0c0a639 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,17 +103,11 @@ ifeq ($(DEB_SOURCE),mplayer)
 DEB_BUILD_CONFIGURE += --disable-libdvdcss-internal --enable-dvdread --disable-mencoder
 endif
 
-#generate debugging symbols for mplayer-dbg
+# generate debugging symbols for mplayer-dbg for all archs but mipsen,
+# see bug #520113
+ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
 DEB_BUILD_CONFIGURE += --enable-debug
-
-#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-#DEB_BUILD_CONFIGURE += --enable-debug
-##some other stuff below
-#else
-#ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-#DEB_BUILD_CONFIGURE += --enable-debug=3
-#endif
-#endif
+endif
 
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -156,18 +150,11 @@ configure-arch-stamp: $(QUILT_STAMPFN)
 	# Add commands to configure the package here.
 	$(CLEAN_ENV) \
 	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE)
-
 	#tweak config.mak on request
-	# FIXME: this debian/rules does not honor 'nostrip'
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	mv config.mak  config.mak~~
 	sed '/FLAGS/s/ -O[0-9] /  /' config.mak~~ > config.mak
 endif
-	#workaround for bug 520113 (hopefully)
-ifeq (mips,$(DEB_HOST_ARCH_CPU))
-	mv config.mak  config.mak~~
-	sed '/^CFLAGS =/s/=/= -fPIC -DPIC /' config.mak~~ > config.mak
-endif
 	touch configure-arch-stamp
 
 # commands to compile the package

-- 
mplayer packaging