[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 5fa57dd5969b724de325cd0a2068cf4f17e44023
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 5 18:13:35 2009 +0200

    enhance upstream Makefile to install gmplayer manpages
    
    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 should be ready to be applied upstream.

diff --git a/debian/patches/30_add_gmplayer_man_rules.diff b/debian/patches/30_add_gmplayer_man_rules.diff
new file mode 100644
index 0000000..08de055
--- /dev/null
+++ b/debian/patches/30_add_gmplayer_man_rules.diff
@@ -0,0 +1,38 @@
+enhance upstream Makefile to install gmplayer manpages
+
+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 should be ready to be applied upstream.
+
+diff --git a/Makefile b/Makefile
+index 263f3cd..f285283 100644
+--- a/Makefile
++++ b/Makefile
+@@ -899,6 +899,7 @@ install-gui: install-mplayer
+ 
+ install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
+ install-mplayer-man:  $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
++install-mplayer-gui-man: $(foreach lang,$(MAN_LANGS),install-mplayer-gui-man-$(lang))
+ 
+ install-mencoder-man-en: install-mplayer-man-en
+ 	cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
+@@ -918,8 +919,17 @@ install-mplayer-man-$(lang):
+ 	$(INSTALL) -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/
+ endef
+ 
++define MPLAYER_GUI_MAN_RULE
++install-mplayer-gui-man-$(lang): install-mplayer-man-$(lang)
++	cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1
++endef
++
++install-mplayer-gui-man-en: install-mplayer-man-en
++	cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
++
+ $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE)))
+ $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE)))
++$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_GUI_MAN_RULE)))
+ 
+ uninstall:
+ 	rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
diff --git a/debian/patches/series b/debian/patches/series
index 31ac392..df8c2a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 11configure-mktemp.patch
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
+30_add_gmplayer_man_rules.diff

-- 
mplayer packaging