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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 72dc585461cffc7fb5337d53a15a6892fdd6eeed
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 5 18:14:30 2009 +0200

    debian/rules: use Makefile enhancements
    
    the debian package used to install gmplayer symlinks with custom ln
    calls. It is way more convenient to implement this in the upstream
    Makefile.
    
    This patch actually makes use of the previous patch

diff --git a/debian/rules b/debian/rules
index b5643bd..79aa587 100755
--- a/debian/rules
+++ b/debian/rules
@@ -187,8 +187,6 @@ clean-real:
 
 ##################### install
 
-manlangs := $(notdir $(wildcard DOCS/man/*) )
-
 install-arch:  build-arch
 	dh_testdir
 	dh_prep -a
@@ -197,14 +195,8 @@ install-arch:  build-arch
 	dh_install debian/scripts usr/share/mplayer/
 	dh_install debian/prefs var/lib/mplayer/
 
-# commands to install the package into debian/<packagename>
-	${MAKE} prefix=$(destdir)/usr BINDIR=$(destdir)/usr/bin CONFDIR=$(destdir)/etc/mplayer LIBDIR=$(destdir)/usr/lib DATADIR=$(destdir)/usr/share/mplayer  MANDIR=$(destdir)/usr/share/man  install
-
-	dh_link usr/bin/mplayer usr/bin/gmplayer
-	dh_link usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz
-
-# Install man pages.
-	set -e && for i in $(manlangs) ; do mkdir -p $(destdir)/usr/share/man/$$i/man1/ && cp DOCS/man/$$i/mplayer.1 $(destdir)/usr/share/man/$$i/man1/ && dh_link usr/share/man/$$i/man1/mplayer.1.gz usr/share/man/$$i/man1/gmplayer.1.gz ; done
+	$(MAKE) install-gui DESTDIR=$(destdir)
+	$(MAKE) install-mplayer-gui-man DESTDIR=$(destdir)
 
 	dh_installdebconf -p $(DEB_SOURCE)
 	dh_installdocs  -p $(DEB_SOURCE) Copyright

-- 
mplayer packaging