[gnash/gnash-git] Rework patch

Hicham HAOUARI hicham at fedoraproject.org
Wed Mar 9 23:56:36 UTC 2011 

commit 04074593b16907c17c74e2385b21c3bb7cae164f
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Wed Mar 9 23:54:20 2011 +0000

    Rework patch

 ...missing-aliases-to-gnash.1-man-page.patch.patch |  167 ++++++++++++++++++++
 1 files changed, 167 insertions(+), 0 deletions(-)
---
diff --git a/0002-Add-missing-aliases-to-gnash.1-man-page.patch.patch b/0002-Add-missing-aliases-to-gnash.1-man-page.patch.patch
new file mode 100644
index 0000000..78adfab
--- /dev/null
+++ b/0002-Add-missing-aliases-to-gnash.1-man-page.patch.patch
@@ -0,0 +1,167 @@
+From 3894388b27756d2f28cbe54c7928df5263787159 Mon Sep 17 00:00:00 2001
+From: Hicham HAOUARI <hicham.haouari at gmail.com>
+Date: Wed, 9 Mar 2011 23:51:46 +0000
+Subject: [PATCH] Add missing aliases to gnash.1 manpage
+
+---
+ doc/C/Makefile.am                          |   60 +++++++++++++++++++---------
+ doc/C/gnash.man-xml                        |    4 ++
+ doc/C/preformatted/fb-gnash.1.in           |    1 +
+ doc/C/preformatted/gnash-gtk-launcher.1.in |    1 +
+ doc/C/preformatted/gnash-qt-launcher.1.in  |    1 +
+ doc/C/preformatted/sdl-gnash.1.in          |    1 +
+ 6 files changed, 49 insertions(+), 19 deletions(-)
+ create mode 100644 doc/C/preformatted/fb-gnash.1.in
+ create mode 100644 doc/C/preformatted/gnash-gtk-launcher.1.in
+ create mode 100644 doc/C/preformatted/gnash-qt-launcher.1.in
+ create mode 100644 doc/C/preformatted/sdl-gnash.1.in
+
+diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
+index 4447ee7..8b363eb 100644
+--- a/doc/C/Makefile.am
++++ b/doc/C/Makefile.am
+@@ -102,7 +102,11 @@ EXTRA_DIST = \
+ 	preformatted/findmicrophones.1.in \
+ 	preformatted/findwebcams.1.in \
+ 	preformatted/gtk-gnash.1.in \
+-	preformatted/kde4-gnash.1.in
++	preformatted/kde4-gnash.1.in \
++	preformatted/sdl-gnash.1.in \
++	preformatted/fb-gnash.1.in \
++	preformatted/gnash-gtk-launcher.1.in \
++	preformatted/gnash-qt-launcher.1.in
+ #	preformatted/dumpshm.1.in
+ 
+ #noinst_SCRIPT = gen-doc.sh
+@@ -121,6 +125,24 @@ MANPAGES = \
+ 	findwebcams.1
+ #	dumpshm.1
+ 
++EXTRAMANPAGES =
++
++if BUILD_GTK_GUI
++EXTRAMANPAGES += gtk-gnash.1 gnash-gtk-launcher.1
++endif
++
++if BUILD_KDE4_GUI
++EXTRAMANPAGES += kde4-gnash.1 gnash-qt-launcher.1
++endif
++
++if BUILD_SDL_GUI
++EXTRAMANPAGES += sdl-gnash.1
++endif
++
++if BUILD_FB_GUI
++EXTRAMANPAGES += fb-gnash.1
++endif
++
+ MANSRC = $(MANPAGES:.1=.man-xml)
+ INFOS  = gnash_user.info gnash_ref.info
+ HTMLS  = $(XML_MAIN:.xml=.html)
+@@ -353,34 +375,30 @@ uninstall-man1-hook:
+ # install-data-hook: install-data-hook-omf
+ # uninstall-local: uninstall-local-doc uninstall-local-omf
+ 
+-# gtk-gnash.1 and kde4-gnash.1 are special, as they are created by
+-# the --solinks option to the docbook2 tools for creating man pages.
++# gtk-gnash.1, kde4-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1 and gnash-qt-launcher.1 are special,
++# as they  are created by the --solinks option to the docbook2 tools for creating man pages.
+ install-man1: $(MANPAGES)
+ 	-test -d "$(DESTDIR)$(man1dir)/" || $(mkinstalldirs) "$(DESTDIR)$(man1dir)/"
+-	-$(INSTALL_DATA) gtk-gnash.1 $(DESTDIR)$(man1dir)/gtk-gnash.1
+-	-$(INSTALL_DATA) kde4-gnash.1 $(DESTDIR)$(man1dir)/kde4-gnash.1
+-	-for file in $(MANPAGES); do \
++	-for file in $(MANPAGES) $(EXTRAMANPAGES); do \
+ 	   $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file; \
+ 	done
+ 
+ uninstall-man1:
+-	-for file in $(MANPAGES); do \
++	-for file in $(MANPAGES) $(EXTRAMANPAGES); do \
+ 	   $(RM) $(DESTDIR)$(man1dir)/$$file; \
+ 	done
+ 
+-# the gtk-gnash.1 and kde4-gnash.1 manpages are generated as aliases
+-# for the gnash.1 man page, so we can't use the suffix rules to build
++# gtk-gnash.1, kde4-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1 and gnash-qt-launcher.1
++# manpages are generated as aliases for the gnash.1 man page, so we can't use the suffix rules to build
+ # them, but we need to install the ".so gnash.1" manpages also, or
+ # they aren;t in the tarball.
+-link-extra-man: 
+-	- at if test ! -e gtk-gnash.1; then \
+-	    echo "WARNING: Linking to preformatted version of gtk-gnash.1, it could be out of date."; \
+-	    $(LN_S) -f $(srcdir)/preformatted/gtk-gnash.1.in gtk-gnash.1; \
+-	  fi
+-	- at if test ! -e kde4-gnash.1; then \
+-	    echo "WARNING: Linking to preformatted version of kde4-gnash.1, it could be out of date."; \
+-	    $(LN_S) -f $(srcdir)/preformatted/kde4-gnash.1.in kde4-gnash.1; \
+-	  fi
++link-extra-man:
++	-for file in $(EXTRAMANPAGES); do \
++	  if test ! -e $$file; then \
++	    echo "WARNING: Linking to preformatted version of $$file, it could be out of date."; \
++	    $(LN_S) -f $(srcdir)/preformatted/$$file.in $$file; \
++	  fi \
++	done
+ 
+ install-data-hook: $(MANPAGES) install-man1 install-info-hook install-html-hook 
+ uninstall-hook: uninstall-info-hook uninstall-html-hook
+@@ -437,7 +455,11 @@ CLEANFILES = \
+ 	omf_timestamp \
+ 	images \
+ 	gtk-gnash.1 \
+-	kde4-gnash.1
++	kde4-gnash.1 \
++	fb-gnash.1 \
++	sdl-gnash.1 \
++	gnash-gtk-launcher.1 \
++	gnash-qt-launcher.1
+ 
+ # This updates the copies of the manuals that are stored preformatted
+ # so not everyone needs to get Docbook working well enough to produce
+diff --git a/doc/C/gnash.man-xml b/doc/C/gnash.man-xml
+index 194112a..76ee3af 100644
+--- a/doc/C/gnash.man-xml
++++ b/doc/C/gnash.man-xml
+@@ -22,6 +22,10 @@
+ <refname>gnash</refname>
+ <refname>gtk-gnash</refname>
+ <refname>kde4-gnash</refname>
++<refname>fb-gnash</refname>
++<refname>sdl-gnash</refname>
++<refname>gnash-gtk-launcher</refname>
++<refname>gnash-qt-launcher</refname>
+ <refpurpose>GNU Flash (SWF) Player</refpurpose>
+ </refnamediv>
+ 
+diff --git a/doc/C/preformatted/fb-gnash.1.in b/doc/C/preformatted/fb-gnash.1.in
+new file mode 100644
+index 0000000..e28eaeb
+--- /dev/null
++++ b/doc/C/preformatted/fb-gnash.1.in
+@@ -0,0 +1 @@
++.so man1/gnash.1
+diff --git a/doc/C/preformatted/gnash-gtk-launcher.1.in b/doc/C/preformatted/gnash-gtk-launcher.1.in
+new file mode 100644
+index 0000000..e28eaeb
+--- /dev/null
++++ b/doc/C/preformatted/gnash-gtk-launcher.1.in
+@@ -0,0 +1 @@
++.so man1/gnash.1
+diff --git a/doc/C/preformatted/gnash-qt-launcher.1.in b/doc/C/preformatted/gnash-qt-launcher.1.in
+new file mode 100644
+index 0000000..e28eaeb
+--- /dev/null
++++ b/doc/C/preformatted/gnash-qt-launcher.1.in
+@@ -0,0 +1 @@
++.so man1/gnash.1
+diff --git a/doc/C/preformatted/sdl-gnash.1.in b/doc/C/preformatted/sdl-gnash.1.in
+new file mode 100644
+index 0000000..e28eaeb
+--- /dev/null
++++ b/doc/C/preformatted/sdl-gnash.1.in
+@@ -0,0 +1 @@
++.so man1/gnash.1
+-- 
+1.7.4.1
+

More information about the scm-commits mailing list