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

[mennucc1 at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8e5152511eab8f20425e91cd1a54cb94c1418810
Author: A Mennucc <mennucc1 at debian.org>
Date:   Sun Mar 22 10:10:02 2009 +0100

    currently debian/rules does not honor  DEB_BUILD_OPTIONS=nostrip
    (and it has not been working since MPlayer 1.0rc2 was packaged --
     but nobody ever noticed)

diff --git a/debian/rules b/debian/rules
index 288820e..802b095 100755
--- a/debian/rules
+++ b/debian/rules
@@ -160,11 +160,7 @@ configure-arch-stamp: $(QUILT_STAMPFN)
 	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE)
 
 	#tweak config.mak on request
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	mv config.mak  config.mak~~
-	sed 's/STRIPBINARIES.*/STRIPBINARIES = no/' config.mak~~ > config.mak
-	#dh_strip does(n't) the rest of the job
-endif
+	# 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

-- 
mplayer packaging