[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1419-g69001f6 |
|
Date: |
Thu, 19 Jan 2012 03:20:47 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 69001f6887c17c82b2ab7236d9bce5739131bb44 (commit)
via 4f7e3048ec18e2d58ba4f42e536af0d773bd6dc4 (commit)
via e2d43eea6c65926fe8f13281f23b93028bd471df (commit)
via ee88b1ea82842f6a49da1f72ed3205a5b4469051 (commit)
via 20bab5d4893ac20c0d831492abfccdfcd50b2a04 (commit)
via e40c50c05e67eb32303e9c7b4d646179d61a570c (commit)
via 9d5caee2decb1f8c365b110dd791f98db4d9ce89 (commit)
via 6fb293a4abbbb3e9372144bf8bdf434ceb13a203 (commit)
via 19549135ccacbff85677a581af702e46020782cf (commit)
via f846205251a81dcb73fc95eb6cb56f8bec3f1987 (commit)
via 62dba7ac009b2ef61b559a7ed2f687dd07b57433 (commit)
via fe4f7669fbb0b4153dbd42c73ec481668a695a6a (commit)
via 3c8932153446e1f987d1474373be0e485f41e6e9 (commit)
via 8cfef9635245a9f9ee6b70112830e3e052c70abf (commit)
via 3ace6e55f281b15a964d2c7d25ccabb1bbd0f698 (commit)
via 777414724ee51783ba0f55c4fe7dc6181b1723f5 (commit)
via 7502f98aad607ed72d8aeb40160385575f2ccf36 (commit)
via 43a3b28e8256c7c0d2ee919ff7c9f8572e80445b (commit)
via ef1b1628ce2837ed8d316d578a7da7803e1711b8 (commit)
via b9e89981caa5f7f71925332d18e799c8481ba928 (commit)
via a5cfb1af39cc46f42f960bb37498a88d8d9b61c6 (commit)
via 8eb3f2720ae8f6400e110be6183b9520f9feac9b (commit)
via 99e6dc77b8fc466dd955f5f9b2dea8cd05cddfae (commit)
via a4deff4e4c77c4219421fad0b3d0b23ec1eb4bc8 (commit)
from ce522eb697570a4f05d45db649ec52c58d1f97cb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=69001f6887c17c82b2ab7236d9bce5739131bb44
commit 69001f6887c17c82b2ab7236d9bce5739131bb44
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 19:45:40 2012 -0700
add man page alises file to the dist
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 49a6cbb..45e5679 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -106,7 +106,14 @@ EXTRA_DIST = \
preformatted/gnash_user.info.in \
preformatted/rtmpget.1.in \
preformatted/findmicrophones.1.in \
- preformatted/findwebcams.1.in
+ preformatted/findwebcams.1.in \
+ fb-gnash.1 \
+ sdl-gnash.1 \
+ dump-gnash.1 \
+ gtk-gnash.1 \
+ qt4-gnash.1 \
+ gnash-gtk-launcher.1 \
+ gnash-qt-launcher.1
# preformatted/dumpshm.1.in
#noinst_SCRIPT = gen-doc.sh
@@ -164,7 +171,7 @@ gnashref.html gnashref.pdf gnash_ref.info: gnashref.xml
$(REFMAN) $(COMMON)
# and working correctly.
html: $(HTMLS)
pdf: $(PDFS)
-man: $(MANPAGES)
+man: $(MANPAGES) $(EXTRAMANPAGES)
info: $(INFOS)
if DOCBOOK
texi: $(TEXIS)
@@ -258,7 +265,13 @@ else
fi
endif
-gnash.1 gtk-gnash.1 fb-gnash.1 qt4-gnash.1 dump-gnash.1:
+# As these man page alias files are very small, we just copy them
+# into the build rather than symbolically link them like we used to.
+$(EXTRAMANPAGES): gnash.1
+ @if ! test -e $@; then \
+ cp $(srcdir)/$@ .; \
+ fi
+
gprocessor.1: $(srcdir)/gprocessor.man-xml
#dumpshm.1: $(srcdir)/dumpshm.man-xml
soldumper.1: $(srcdir)/soldumper.man-xml
@@ -379,33 +392,11 @@ uninstall-html-hook:
# gtk-gnash.1, qt4-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)
+install-man1: $(MANPAGES) $(EXTRAMANPAGES)
-test -d "$(DESTDIR)$(man1dir)/" || $(mkinstalldirs)
"$(DESTDIR)$(man1dir)/"
- -for file in $(MANPAGES); do \
+ -for file in $(MANPAGES) $(EXTRAMANPAGES); do \
$(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file; \
done
- -for file in $(EXTRAMANPAGES); do \
- $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(man1dir)/$$file; \
- done
-
-force:
-
-$(EXTRAMANPAGES): force
- echo $?
- echo $@
- echo $*
- echo $<
-
-# The gtk-gnash.1, qt-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1
-# dump-gnash.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:
- address@hidden file in $(EXTRAMANPAGES); do \
- echo "NOTE: Linking alias of $$file to default manpage"; \
- $(LN_S) -f $(srcdir)/$$file $$file; \
- done
install-data-hook: $(MANPAGES) install-man1 install-info-hook
install-html-hook
uninstall-hook: uninstall-info-hook uninstall-html-hook
@@ -463,6 +454,7 @@ CLEANFILES = \
gnashref.mxml \
omf_timestamp \
images \
+ dump-gnash.1 \
gtk-gnash.1 \
qt4-gnash.1 \
fb-gnash.1 \
http://git.savannah.gnu.org/cgit//commit/?id=4f7e3048ec18e2d58ba4f42e536af0d773bd6dc4
commit 4f7e3048ec18e2d58ba4f42e536af0d773bd6dc4
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 19:44:59 2012 -0700
update copyright date, remove commented out block.
diff --git a/packaging/rpm.am b/packaging/rpm.am
index 2a79c83..a7f5602 100644
--- a/packaging/rpm.am
+++ b/packaging/rpm.am
@@ -1,5 +1,6 @@
#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011. 2012
+# Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,13 +16,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# # Build an RPM package targeted to the OLPC http://www.laptop.org.
-# olpc: dist-gzip $(srcdir)/packaging/redhat/gnash.spec
-# cp -f $(srcdir)/packaging/redhat/gnash.spec /usr/src/redhat/SPECS/
-# cp -f gnash-$(VERSION).tar.gz /usr/src/redhat/SOURCES/
-# rpmbuild -rcfile=$(srcdir)/packaging/redhat/rpmrc:/usr/lib/rpm/rpmrc \
-# -ba --target=geode-olpc /usr/src/redhat/SPECS/gnash.spec
-
RPMBUILD_DIR = $(abs_top_builddir)/rpmbuild
RPMMACROS = $(abs_top_builddir)/.rpmmacros
RPMSPEC = $(abs_top_builddir)/gnash.spec
@@ -97,4 +91,4 @@ setup-rpm:
mkdir -p $(RPMBUILD_DIR)/SOURCES; \
cp $${snapshot_dir}.tar.gz $(RPMBUILD_DIR)/SOURCES
-.PHONY : rpm redhat spec rpm-configure rpm-install rpm-build setup-rpm
+.PHONY : rpm distdir redhat spec rpm-configure rpm-install rpm-build setup-rpm
http://git.savannah.gnu.org/cgit//commit/?id=e2d43eea6c65926fe8f13281f23b93028bd471df
commit e2d43eea6c65926fe8f13281f23b93028bd471df
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 19:42:50 2012 -0700
enable docbook, install info pages
diff --git a/packaging/redhat/gnash.spec b/packaging/redhat/gnash.spec
index 5697379..44d95ce 100644
--- a/packaging/redhat/gnash.spec
+++ b/packaging/redhat/gnash.spec
@@ -276,6 +276,7 @@ sh ./configure \
--disable-dependency-tracking \
--disable-testsuite \
--disable-rpath \
+ --enable-docbook \
--with-plugins-install=system \
--with-plugindir=%{_libdir}/mozilla/plugins \
--enable-extensions=fileio,lirc,dejagnu,mysql
@@ -381,7 +382,8 @@ touch --no-create %{_datadir}/icons/hicolor
%{_prefix}/share/doc/gnash/images/*.png
%{_prefix}/etc/gnashrc
%{_prefix}/etc/gnashpluginrc
-# %{_infodir}/*.info*
+%{_infodir}/gnash_ref.info.gz
+%{_infodir}/gnash_user.info.gz
#%doc doc/C/gnash*.html
#%doc doc/C/images/*.png
#%doc doc/C/images/*.txt
http://git.savannah.gnu.org/cgit//commit/?id=ee88b1ea82842f6a49da1f72ed3205a5b4469051
commit ee88b1ea82842f6a49da1f72ed3205a5b4469051
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 19:41:54 2012 -0700
enable docbook, don't gzip man pages
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 55a9889..c10cac0 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -98,6 +98,7 @@ CONFIGURE_FLAGS = \
--disable-testsuite \
--disable-rpath \
--enable-cygnal \
+ --enable-docbook \
--enable-gui=gtk,qt4,fb,dump \
--enable-renderer=agg,cairo \
--enable-extensions=fileio,lirc,mysql \
@@ -225,8 +226,9 @@ install: build
cp packaging/*.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
install -d $(CURDIR)/debian/tmp/usr/share/applications/
cp debian/*.desktop $(CURDIR)/debian/tmp/usr/share/applications/
- gzip -f9 $(CURDIR)/debian/tmp/usr/share/man/man1/gtk-gnash.1
- gzip -f9 $(CURDIR)/debian/tmp/usr/share/man/man1/qt4-gnash.1
+ # for i in $(CURDIR)/debian/tmp/usr/share/man/man1/*.1; do \
+ # gzip -f9 $$i; \
+ # done
# CREATE PACKAGES
http://git.savannah.gnu.org/cgit//commit/?id=20bab5d4893ac20c0d831492abfccdfcd50b2a04
commit 20bab5d4893ac20c0d831492abfccdfcd50b2a04
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 19:40:10 2012 -0700
fix typo in filename
diff --git a/packaging/debian/gnash-dump.install
b/packaging/debian/gnash-dump.install
index 94a572b..b0bce9c 100644
--- a/packaging/debian/gnash-dump.install
+++ b/packaging/debian/gnash-dump.install
@@ -1,3 +1,3 @@
usr/bin/dump-gnash
-usr/bin/gnash-thumbailer
+usr/bin/gnash-thumbnailer
etc/gnashthumbnailrc
http://git.savannah.gnu.org/cgit//commit/?id=e40c50c05e67eb32303e9c7b4d646179d61a570c
commit e40c50c05e67eb32303e9c7b4d646179d61a570c
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 17:08:41 2012 -0700
install-man1 doesn't need to depend on EXTRAMANPAGES
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index ff6f059..49a6cbb 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -258,7 +258,7 @@ else
fi
endif
-gnash.1 gtk-gnash.1 fb-gnash.1 qt4-gnash.1 dump-gnash.1:
$(srcdir)/gnash.man-xml
+gnash.1 gtk-gnash.1 fb-gnash.1 qt4-gnash.1 dump-gnash.1:
gprocessor.1: $(srcdir)/gprocessor.man-xml
#dumpshm.1: $(srcdir)/dumpshm.man-xml
soldumper.1: $(srcdir)/soldumper.man-xml
@@ -385,21 +385,27 @@ install-man1: $(MANPAGES)
$(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file; \
done
-for file in $(EXTRAMANPAGES); do \
- $(INSTALL_DATA) $(top_srcdir)/doc/C/$$file
$(DESTDIR)$(man1dir)/$$file; \
+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(man1dir)/$$file; \
done
-# # The gtk-gnash.1, qt-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1
-# # dump-gnash.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:
-# -for file in $(EXTRAMANPAGES); do \
-# if test ! -e $$file; then \
-# echo "NOTE: Linking alias of $$file to default manpage"; \
-# $(LN_S) -f preformatted/gnash.1.in $$file; \
-# fi; \
-# done
+force:
+
+$(EXTRAMANPAGES): force
+ echo $?
+ echo $@
+ echo $*
+ echo $<
+
+# The gtk-gnash.1, qt-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1
+# dump-gnash.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:
+ address@hidden file in $(EXTRAMANPAGES); do \
+ echo "NOTE: Linking alias of $$file to default manpage"; \
+ $(LN_S) -f $(srcdir)/$$file $$file; \
+ done
install-data-hook: $(MANPAGES) install-man1 install-info-hook
install-html-hook
uninstall-hook: uninstall-info-hook uninstall-html-hook
@@ -483,5 +489,5 @@ update-preformats:
endif
# Always execute these targets as they have no real dependencies.
-.PHONY: images install-info-hook uninstall-info-hook install-html-hook
uninstall-html-hook uninstall-data-hook install-data-hook images install-man1
update-preformats
+.PHONY: images install-info-hook uninstall-info-hook install-html-hook
uninstall-html-hook uninstall-data-hook install-data-hook images install-man1
update-preformats $(EXTRAMANPAGES)
http://git.savannah.gnu.org/cgit//commit/?id=9d5caee2decb1f8c365b110dd791f98db4d9ce89
commit 9d5caee2decb1f8c365b110dd791f98db4d9ce89
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 14:37:24 2012 -0700
install-man1 doesn't need to depend on EXTRAMANPAGES
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index c7bf887..ff6f059 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -379,7 +379,7 @@ uninstall-html-hook:
# gtk-gnash.1, qt4-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) $(EXTRAMANPAGES)
+install-man1: $(MANPAGES)
-test -d "$(DESTDIR)$(man1dir)/" || $(mkinstalldirs)
"$(DESTDIR)$(man1dir)/"
-for file in $(MANPAGES); do \
$(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file; \
http://git.savannah.gnu.org/cgit//commit/?id=6fb293a4abbbb3e9372144bf8bdf434ceb13a203
commit 6fb293a4abbbb3e9372144bf8bdf434ceb13a203
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 14:11:05 2012 -0700
remove unused preformatted tjay are now aliases the correct way
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 932bb39..c7bf887 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -106,9 +106,7 @@ EXTRA_DIST = \
preformatted/gnash_user.info.in \
preformatted/rtmpget.1.in \
preformatted/findmicrophones.1.in \
- preformatted/findwebcams.1.in \
- preformatted/gnash-gtk-launcher.1.in \
- preformatted/gnash-qt-launcher.1.in
+ preformatted/findwebcams.1.in
# preformatted/dumpshm.1.in
#noinst_SCRIPT = gen-doc.sh
http://git.savannah.gnu.org/cgit//commit/?id=19549135ccacbff85677a581af702e46020782cf
commit 19549135ccacbff85677a581af702e46020782cf
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 14:07:21 2012 -0700
cleanup the handling of man pages
diff --git a/doc/C/preformatted/gnash-gtk-launcher.1.in b/doc/C/dump-gnash.1
similarity index 100%
copy from doc/C/preformatted/gnash-gtk-launcher.1.in
copy to doc/C/dump-gnash.1
diff --git a/doc/C/preformatted/gnash-gtk-launcher.1.in b/doc/C/fb-gnash.1
similarity index 100%
copy from doc/C/preformatted/gnash-gtk-launcher.1.in
copy to doc/C/fb-gnash.1
diff --git a/doc/C/preformatted/gnash-gtk-launcher.1.in
b/doc/C/gnash-gtk-launcher.1
similarity index 100%
copy from doc/C/preformatted/gnash-gtk-launcher.1.in
copy to doc/C/gnash-gtk-launcher.1
diff --git a/doc/C/preformatted/gnash-gtk-launcher.1.in
b/doc/C/gnash-qt-launcher.1
similarity index 100%
copy from doc/C/preformatted/gnash-gtk-launcher.1.in
copy to doc/C/gnash-qt-launcher.1
diff --git a/doc/C/preformatted/gnash-gtk-launcher.1.in b/doc/C/gtk-gnash.1
similarity index 100%
copy from doc/C/preformatted/gnash-gtk-launcher.1.in
copy to doc/C/gtk-gnash.1
diff --git a/doc/C/preformatted/gnash-gtk-launcher.1.in b/doc/C/qt4-gnash.1
similarity index 100%
copy from doc/C/preformatted/gnash-gtk-launcher.1.in
copy to doc/C/qt4-gnash.1
diff --git a/doc/C/preformatted/gnash-gtk-launcher.1.in b/doc/C/sdl-gnash.1
similarity index 100%
rename from doc/C/preformatted/gnash-gtk-launcher.1.in
rename to doc/C/sdl-gnash.1
http://git.savannah.gnu.org/cgit//commit/?id=f846205251a81dcb73fc95eb6cb56f8bec3f1987
commit f846205251a81dcb73fc95eb6cb56f8bec3f1987
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 14:06:27 2012 -0700
don't ignore man pages
diff --git a/.gitignore b/.gitignore
index e6ceb0b..8c62240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ cygnal/gnash.*
cygnal/libnet/gnash.*
cygnal/testsuite/cygnal.all/cygnalrc
deb-copy-stamp
-doc/C/*.1
doc/C/*.html
doc/C/*.info
doc/Doxyfile
http://git.savannah.gnu.org/cgit//commit/?id=62dba7ac009b2ef61b559a7ed2f687dd07b57433
commit 62dba7ac009b2ef61b559a7ed2f687dd07b57433
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 14:05:11 2012 -0700
install manpage aliases as files, not links
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 011dce1..932bb39 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -127,6 +127,7 @@ MANPAGES = \
findwebcams.1
# dumpshm.1
+# These are just aliases for the defauklt gnash man page.
EXTRAMANPAGES =
if BUILD_GTK_GUI
@@ -155,7 +156,7 @@ HTMLS = $(XML_MAIN:.xml=.html)
PDFS = $(XML_MAIN:.xml=.pdf)
TEXIS = gnash_user.texi gnashuser.texi gnash_ref.texi gnashref.texi
-all-local: info html man link-extra-man
+all-local: info html man
gnashuser.html gnashuser.pdf gnash_user.info: gnashuser.xml $(USERMAN)
$(COMMON)
gnashref.html gnashref.pdf gnash_ref.info: gnashref.xml $(REFMAN) $(COMMON)
@@ -247,7 +248,7 @@ if ENABLE_MAN
$(DB2X_MAN) $?; \
else \
$(DB2X_XSLTPROC) -s man $? -o $*.mxml; \
- $(DB2X_MANXML) --solinks $*.mxml; \
+ $(DB2X_MANXML) $*.mxml; \
$(RM) $*.mxml; \
fi
else
@@ -375,41 +376,38 @@ uninstall-html-hook:
-$(RM) $(DESTDIR)$(htmldir)/gnashref.html
-$(RM) $(DESTDIR)$(htmldir)/images/*png
-uninstall-man1-hook:
- -$(RM) $(DESTDIR)$(htmldir)/gnashuser.html
-
# install-data-hook: install-data-hook-omf
# uninstall-local: uninstall-local-doc uninstall-local-omf
# gtk-gnash.1, qt4-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)
+install-man1: $(MANPAGES) $(EXTRAMANPAGES)
-test -d "$(DESTDIR)$(man1dir)/" || $(mkinstalldirs)
"$(DESTDIR)$(man1dir)/"
- -for file in $(MANPAGES) $(EXTRAMANPAGES); do \
+ -for file in $(MANPAGES); do \
$(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file; \
done
-
-uninstall-man1:
- -for file in $(MANPAGES) $(EXTRAMANPAGES); do \
- $(RM) $(DESTDIR)$(man1dir)/$$file; \
- done
-
-# The gtk-gnash.1, qt-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1
-# dump-gnash.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:
-for file in $(EXTRAMANPAGES); do \
- if test ! -e $$file; then \
- echo "NOTE: Linking alias of $$file to default manpage"; \
- $(LN_S) -f preformatted/gnash.1.in $$file; \
- fi; \
+ $(INSTALL_DATA) $(top_srcdir)/doc/C/$$file
$(DESTDIR)$(man1dir)/$$file; \
done
+# # The gtk-gnash.1, qt-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1
+# # dump-gnash.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:
+# -for file in $(EXTRAMANPAGES); do \
+# if test ! -e $$file; then \
+# echo "NOTE: Linking alias of $$file to default manpage"; \
+# $(LN_S) -f preformatted/gnash.1.in $$file; \
+# fi; \
+# done
+
install-data-hook: $(MANPAGES) install-man1 install-info-hook
install-html-hook
uninstall-hook: uninstall-info-hook uninstall-html-hook
- -$(RM) -f $(DESTDIR)$(man1dir)/*.1
+ -for file in $(MANPAGES) $(EXTRAMANPAGES); do \
+ $(RM) $(DESTDIR)$(man1dir)/$$file; \
+ done
#
# GNOME Help support, which currently isn't supported
http://git.savannah.gnu.org/cgit//commit/?id=fe4f7669fbb0b4153dbd42c73ec481668a695a6a
commit fe4f7669fbb0b4153dbd42c73ec481668a695a6a
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 14:04:29 2012 -0700
remove extraneous man page aliasesdoc/C/preformatted/gnash-gtk-launcher.1.in
diff --git a/doc/C/preformatted/gnash-qt-launcher.1.in
b/doc/C/preformatted/gnash-qt-launcher.1.in
deleted file mode 100644
index e28eaeb..0000000
--- a/doc/C/preformatted/gnash-qt-launcher.1.in
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/gnash.1
http://git.savannah.gnu.org/cgit//commit/?id=3c8932153446e1f987d1474373be0e485f41e6e9
commit 3c8932153446e1f987d1474373be0e485f41e6e9
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 11:47:22 2012 -0700
update for new packages
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 4eaf577..011dce1 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -107,11 +107,6 @@ EXTRA_DIST = \
preformatted/rtmpget.1.in \
preformatted/findmicrophones.1.in \
preformatted/findwebcams.1.in \
- preformatted/gtk-gnash.1.in \
- preformatted/qt4-gnash.1.in \
- preformatted/sdl-gnash.1.in \
- preformatted/dump-gnash.1.in \
- preformatted/fb-gnash.1.in \
preformatted/gnash-gtk-launcher.1.in \
preformatted/gnash-qt-launcher.1.in
# preformatted/dumpshm.1.in
@@ -408,7 +403,7 @@ link-extra-man:
-for file in $(EXTRAMANPAGES); do \
if test ! -e $$file; then \
echo "NOTE: Linking alias of $$file to default manpage"; \
- $(LN_S) -f gnash.1 $$file; \
+ $(LN_S) -f preformatted/gnash.1.in $$file; \
fi; \
done
diff --git a/doc/C/gnash.man-xml b/doc/C/gnash.man-xml
index 4060b6b..26ca519 100644
--- a/doc/C/gnash.man-xml
+++ b/doc/C/gnash.man-xml
@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";
[
<!ENTITY legal SYSTEM "legal.xml">
- <!ENTITY appversion "0.8.9">
+ <!ENTITY appversion "0.8.10">
<!ENTITY manrevision "0.4">
<!ENTITY date "Feb 2011">
<!ENTITY app "<application>Gnash</application>">
diff --git a/packaging/deb.am b/packaging/deb.am
index fdc0a2d..f043d46 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -1,5 +1,6 @@
#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index 17ce6bd..aa4794f 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -25,7 +25,7 @@ BRANCH_REVNO = "`if test -f revno.h; then grep "REVNO"
revno.h | cut -d '"' -f
BRANCH_NICK = "`if test -f revno.h; then grep "NICK" revno.h | cut -d '"' -f
2; fi`"
# this is used for Debian style naming conventions
-NEXT_RELEASE = 0.8.10
+NEXT_RELEASE = 0.8.11
#SNAPSHOT_VERSION := 0.8.10
SNAPSHOT_VERSION = $(NEXT_RELEASE)~git.$(BRANCH_NICK)$(BRANCH_REVNO)
http://git.savannah.gnu.org/cgit//commit/?id=8cfef9635245a9f9ee6b70112830e3e052c70abf
commit 8cfef9635245a9f9ee6b70112830e3e052c70abf
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 11:46:34 2012 -0700
install the dump-gnash man page
diff --git a/packaging/debian/gnash-dump.manpages
b/packaging/debian/gnash-dump.manpages
new file mode 100644
index 0000000..555c03c
--- /dev/null
+++ b/packaging/debian/gnash-dump.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/dump-gnash.1
http://git.savannah.gnu.org/cgit//commit/?id=3ace6e55f281b15a964d2c7d25ccabb1bbd0f698
commit 3ace6e55f281b15a964d2c7d25ccabb1bbd0f698
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 11:45:55 2012 -0700
drop duplicate copies
diff --git a/doc/C/preformatted/fb-gnash.1.in b/doc/C/preformatted/fb-gnash.1.in
deleted file mode 100644
index e28eaeb..0000000
--- a/doc/C/preformatted/fb-gnash.1.in
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/gnash.1
diff --git a/doc/C/preformatted/gtk-gnash.1.in
b/doc/C/preformatted/gtk-gnash.1.in
deleted file mode 100644
index e28eaeb..0000000
--- a/doc/C/preformatted/gtk-gnash.1.in
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/gnash.1
diff --git a/doc/C/preformatted/qt4-gnash.1.in
b/doc/C/preformatted/qt4-gnash.1.in
deleted file mode 100644
index e28eaeb..0000000
--- a/doc/C/preformatted/qt4-gnash.1.in
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/gnash.1
http://git.savannah.gnu.org/cgit//commit/?id=777414724ee51783ba0f55c4fe7dc6181b1723f5
commit 777414724ee51783ba0f55c4fe7dc6181b1723f5
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 11:45:01 2012 -0700
add fb-gnash and dump-gnash packages
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index f057a51..d4adff9 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,5 +1,11 @@
gnash (master) distro; urgency=low
+ * local package, added packages for fb-gnash and dump-gnash.
+
+ -- Rob Savoye (Rollinsville, CO) <address@hidden> Wed, 18 Feb 2012 04:20:00
+0100
+
+gnash (0.8.9~git.21412) distro; urgency=low
+
* local package, updated for the 0.8.9 release.
-- Rob Savoye (Rollinsville, CO) <address@hidden> Wed, 02 March 2011
04:20:00 +0100
diff --git a/packaging/debian/control b/packaging/debian/control
index 35ce700..b050050 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -188,6 +188,26 @@ Description: Debug symbols for Gnash
socket, and parse the incoming XML message. This lets a movie be a remote
control for other devices or applications.
+Package: gnash-framebuffer
+Architecture: any
+Section: utils
+Priority: extra
+Depends: gnash-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: Standalone Gnash for a Linux Framebuffer.
+ This package let one play SWF files in a Framebuffer using the standalone
+ version of Gnash.
+
+Package: gnash-dump
+Architecture: any
+Section: utils
+Priority: extra
+Depends: gnash-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: Standalone Gnash that dumps frames to disk.
+ This package let one record screenshots of SWF files to disk using
+ the standalone version of Gnash.
+
Package: gnash-fileio-extension
Architecture: any
Section: utils
diff --git a/packaging/debian/gnash-cygnal.install
b/packaging/debian/gnash-cygnal.install
index d1b1412..952be8c 100644
--- a/packaging/debian/gnash-cygnal.install
+++ b/packaging/debian/gnash-cygnal.install
@@ -1,4 +1,3 @@
etc/cygnalrc
usr/bin/cygnal
usr/lib/cygnal/plugins/*.so
-usr/share/man/man1/cygnal.1
diff --git a/packaging/debian/gnash-dump.install
b/packaging/debian/gnash-dump.install
new file mode 100644
index 0000000..94a572b
--- /dev/null
+++ b/packaging/debian/gnash-dump.install
@@ -0,0 +1,3 @@
+usr/bin/dump-gnash
+usr/bin/gnash-thumbailer
+etc/gnashthumbnailrc
diff --git a/packaging/debian/gnash-framebuffer.install
b/packaging/debian/gnash-framebuffer.install
new file mode 100644
index 0000000..b797f03
--- /dev/null
+++ b/packaging/debian/gnash-framebuffer.install
@@ -0,0 +1 @@
+usr/bin/fb-gnash
diff --git a/packaging/debian/gnash-framebuffer.manpages
b/packaging/debian/gnash-framebuffer.manpages
new file mode 100644
index 0000000..0cd2531
--- /dev/null
+++ b/packaging/debian/gnash-framebuffer.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/fb-gnash.1
diff --git a/packaging/debian/gnash-klash.install
b/packaging/debian/gnash-klash.install
index 3c85df4..b797f03 100644
--- a/packaging/debian/gnash-klash.install
+++ b/packaging/debian/gnash-klash.install
@@ -1,4 +1 @@
-usr/share/kde4/apps/klash/*
-usr/lib/kde4/*
-usr/bin/qt4-gnash
-usr/share/kde4/services/klash_part.desktop
+usr/bin/fb-gnash
http://git.savannah.gnu.org/cgit//commit/?id=7502f98aad607ed72d8aeb40160385575f2ccf36
commit 7502f98aad607ed72d8aeb40160385575f2ccf36
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 11:44:42 2012 -0700
drop unused rules for optional package buulds, everything is selectable at
runtime now.
diff --git a/packaging/debian/rules b/packaging/debian/rules
index f716e5a..55a9889 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -32,10 +32,14 @@ CFLAGS = -Wall -g -Werror-implicit-function-declaration
# testing package building.
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
+ CXXFLAGS += -O0
else
CFLAGS += -O2
+ CXXFLAGS += -O2
endif
+MAKEFLAGS = "CXXFLAGS=$CXXFLAGS"
+
# Enable debugging in the package instead of using the debug package
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -76,54 +80,13 @@ BUILD_FLAGS = --enable-jemalloc
# produces a path that doens't work.
BUILD_DIRECTORY = _build
-# Optionally build an OpenGL enabled package, AGG is the default
-ifneq (,$(findstring ogl,$(DEB_BUILD_OPTIONS)))
- BUILD_FLAGS += --enable-renderer=ogl
- BUILD_DIRECTORY = _build.ogl
- BUILD_DEBUG = -opengl
- BUILD_VERSION = $(MAIN_VERSION).ogl.$(BUILD_VERSION)
-endif
-
-# Optionally build an ffmpeg enabled package, Gstreamer is the default
-ifneq (,$(findstring ffmpeg,$(DEB_BUILD_OPTIONS)))
- BUILD_FLAGS += --enable-media=ffmpeg
- BUILD_VERSION = $(MAIN_VERSION).ffmpeg.$(BUILD_VERSION)
-ifneq (,$(findstring ogl,$(DEB_BUILD_OPTIONS)))
- BUILD_DIRECTORY = _build.ogl.ffmpeg
- BUILD_VERSION = $(MAIN_VERSION).ogl.ffmpeg.$(BUILD_VERSION)
- BUILD_DEBUG = -opengl-ffmpeg
-else
- BUILD_DIRECTORY = _build.ffmpeg
- BUILD_DEBUG = -ffmpeg
-endif
-else
- BUILD_FLAGS += --enable-media=gst,ffmpeg
-endif
-
-# Optionally build the older kde3 package, Qt4 is the default
-ifneq (,$(findstring kde3,$(DEB_BUILD_OPTIONS)))
- BUILD_FLAGS += --enable-gui=gtk,kde3
- BUILD_VERSION = $(MAIN_VERSION).kde3.$(BUILD_VERSION)
-ifneq (,$(findstring ogl,$(DEB_BUILD_OPTIONS)))
- BUILD_DIRECTORY = _build.ogl.kde3
- BUILD_VERSION = $(MAIN_VERSION).ogl.kde3.$(BUILD_VERSION)
- BUILD_DEBUG = -opengl-kde3
-else
- BUILD_DIRECTORY = _build.kde3
- BUILD_DEBUG = -kde3
-endif
-else
- BUILD_FLAGS += --enable-gui=gtk,qt4
-endif
-
# Configure Gnash. We use a different set of options, as when building
# packages, we want to enable everything that Gnash can do, like
# python support, the SDK cygnal, etc... These are not enabled by
# default to make it less complicated for end users building Gnash
# from source.
# for now, only build the qt4 support, as kde3 is being depreciated.
-CONFIGURE_FLAGS = CFLAGS="$(CFLAGS)" \
- CXXFLAGS="$(CXXFLAGS)" \
+CONFIGURE_FLAGS = \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
@@ -135,6 +98,7 @@ CONFIGURE_FLAGS = CFLAGS="$(CFLAGS)" \
--disable-testsuite \
--disable-rpath \
--enable-cygnal \
+ --enable-gui=gtk,qt4,fb,dump \
--enable-renderer=agg,cairo \
--enable-extensions=fileio,lirc,mysql \
$(BUILD_FLAGS)
@@ -215,10 +179,10 @@ clean:
fi
rm -fr $(BUILD_DIRECTORY)
- @printf "\n == CLEANING PATCHES ==\n\n"
- echo " we have no patches, we're the developers!"
+# @printf "\n == CLEANING PATCHES ==\n\n"
+ @echo " we have no patches, we're the developers!"
# $(MAKE) -f /usr/share/quilt/quilt.make unpatch
- @printf "\n ---- End of CLEANING PATCHES ---- \n\n"
+# @printf "\n ---- End of CLEANING PATCHES ---- \n\n"
dh_clean
http://git.savannah.gnu.org/cgit//commit/?id=43a3b28e8256c7c0d2ee919ff7c9f8572e80445b
commit 43a3b28e8256c7c0d2ee919ff7c9f8572e80445b
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 11:43:44 2012 -0700
add dump-gnash manpage
diff --git a/packaging/redhat/gnash.spec b/packaging/redhat/gnash.spec
index 116ece1..5697379 100644
--- a/packaging/redhat/gnash.spec
+++ b/packaging/redhat/gnash.spec
@@ -436,7 +436,7 @@ touch --no-create %{_datadir}/icons/hicolor
%{_bindir}/dump-gnash
%{_bindir}/gnash-thumbnailer
%{_prefix}/etc/gnashthumbnailrc
-#%{_mandir}/man1/dump-gnash.1.gz
+%{_mandir}/man1/dump-gnash.1.gz
%files fileio-extension
%defattr(-,root,root,-)
http://git.savannah.gnu.org/cgit//commit/?id=ef1b1628ce2837ed8d316d578a7da7803e1711b8
commit ef1b1628ce2837ed8d316d578a7da7803e1711b8
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 11:30:20 2012 -0700
add dump-gnash as an aliases to this manpage
diff --git a/doc/C/gnash.man-xml b/doc/C/gnash.man-xml
index dda1e84..4060b6b 100644
--- a/doc/C/gnash.man-xml
+++ b/doc/C/gnash.man-xml
@@ -22,6 +22,7 @@
<refname>gnash</refname>
<refname>gtk-gnash</refname>
<refname>qt4-gnash</refname>
+<refname>dump-gnash</refname>
<refname>fb-gnash</refname>
<refname>sdl-gnash</refname>
<refname>gnash-gtk-launcher</refname>
http://git.savannah.gnu.org/cgit//commit/?id=b9e89981caa5f7f71925332d18e799c8481ba928
commit b9e89981caa5f7f71925332d18e799c8481ba928
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 11:29:12 2012 -0700
build fb-gnash and dump-gnash packages too.
diff --git a/packaging/redhat/gnash.spec b/packaging/redhat/gnash.spec
index d6d7cb4..116ece1 100644
--- a/packaging/redhat/gnash.spec
+++ b/packaging/redhat/gnash.spec
@@ -1,6 +1,6 @@
Name: gnash
# This next field gets edited by "make gnash.spec" when building an rpm
-Version: 0.8.10dev
+Version: 0.8.11dev
Release: 0
Epoch: 1
# This next field gets edited by "make gnash.spec" when building an rpm
@@ -18,7 +18,7 @@ BuildRoot:
%{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}
%if %{_target_cpu} != "armv7l"
BuildRequires: redhat-lsb
%endif
-BuildRequires: mysql-devel
+BuildRequires: mysql-devel docbook2X
# bitmap libraries for loading images
BuildRequires: libpng-devel libjpeg-devel giflib-devel
# these are needed for the python gtk widget
@@ -111,6 +111,23 @@ Requires: gnash-common
%description devel
Gnash header files can be used to write external Gnash extensions.
+%package framebuffer
+Summary: Standalone SWF file player for the framebuffer.
+Group: Applications/Multimedia
+Requires: gnash-common
+
+%description framebuffer
+Framebuffer Gnash is a standalone SWF file player for the Linux framebuffer.
+
+%package dump
+Summary: Standalone SWF file player that dumps screenshots.
+Group: Applications/Multimedia
+Requires: gnash-common
+
+%description dump
+Gnash Dump is a standalone SWF file player that dumps screenshots of each
+frame to disk.
+
%package widget
Summary: Gnash widgets for Gtk and Python
Group: Applications/Multimedia
@@ -199,23 +216,17 @@ RPM_TARGET=%{_target}
%ifarch arm
SOUND="--enable-media=none --disable-nsapi --disable-kparts"
%else
- SOUND="--enable-media=gst" # could also be sdl
+ SOUND="--enable-media=gst"
%endif
%else
# Native RPM build
- CROSS_OPTS="" # "--enable-ghelp --enable-docbook"
# these are actually the default values, but this way they get added
# to the build so they appear in "gnash --version".
- GUI="--enable-gui=gtk,qt4" # could be kde3, qt4, aqua, sdl
- SOUND="--enable-media=gst" # could be ffmpeg
- OTHER="--enable-cygnal"
- RENDERER="--enable-renderer=all" # could be opengl or cairo
+ RENDERER="--enable-renderer=agg,cairo" # opengl or openvg too
# These are not the defaults
- OPTIONAL="--enable-python"
-%endif
-
-%if %{distribution} != "ydl6"
- SOUND="--enable-media=gst"
+ SOUND="--enable-media=gst" # we can't distribute ffmpeg support
+ OPTIONAL="--enable-python --enable-cygnal"
+ GUI="--enable-gui=gtk,qt4,fb,dump" # aqua, sdl
%endif
%if %{_target_cpu} == "armv7l"
@@ -254,10 +265,9 @@ make MAKEFLAGS=$MAKEFLAGS dumpconfig all
# export CONFIG_SHELL="sh -x"
# sh -x ./configure
sh ./configure \
- $CROSS_OPTS \
- $SOUND $GUI \
+ $SOUND \
+ $GUI \
$RENDERER \
- $OTHER \
$OPTIONAL \
--prefix=/usr \
--libdir=%{_libdir} \
@@ -266,9 +276,6 @@ sh ./configure \
--disable-dependency-tracking \
--disable-testsuite \
--disable-rpath \
- --enable-renderer=agg,cairo \
- --enable-cygnal \
- --enable-python \
--with-plugins-install=system \
--with-plugindir=%{_libdir}/mozilla/plugins \
--enable-extensions=fileio,lirc,dejagnu,mysql
@@ -335,7 +342,6 @@ touch --no-create %{_datadir}/icons/hicolor
%defattr(-,root,root,-)
%{_bindir}/gnash-gtk-launcher
%{_bindir}/gtk-gnash
-%{_bindir}/gnash-gtk-launcher
%{_mandir}/man1/gtk-gnash.1.gz
%{_mandir}/man1/gnash-gtk-launcher.1.gz
%{_datadir}/icons/hicolor/32x32/apps/gnash.xpm
@@ -366,6 +372,7 @@ touch --no-create %{_datadir}/icons/hicolor
%{_mandir}/man1/gnash-gtk-launcher.1.gz
%{_datadir}/locale/*/LC_MESSAGES/gnash.mo
%{_prefix}/share/applications/gnash.desktop
+%{_prefix}/share/applications/gnash.schemas
%{_prefix}/share/icons/hicolor/32x32/apps/gnash.xpm
%{_prefix}/share/gnash/gnash-splash.swf
%if !%{cross_compile}
@@ -409,10 +416,8 @@ touch --no-create %{_datadir}/icons/hicolor
%defattr(-,root,root,-)
%{_bindir}/gnash-qt-launcher
%{_bindir}/qt4-gnash
-%{_mandir}/man1/gnash-qt-launcher.1.gz
%{_mandir}/man1/qt4-gnash.1.gz
%{_mandir}/man1/gnash-qt-launcher.1.gz
-%{_datadir}/applications/klash.desktop
%{_prefix}/lib*/kde4/libklashpart.*
%{_prefix}/share/kde4/apps/klash/klashpartui.rc
%{_prefix}/share/kde4/apps/klash/pluginsinfo
@@ -421,6 +426,18 @@ touch --no-create %{_datadir}/icons/hicolor
%{_prefix}/share/icons/hicolor/32x32/apps/klash.xpm
%endif
+%files framebuffer
+%defattr(-,root,root,-)
+%{_bindir}/fb-gnash
+%{_mandir}/man1/fb-gnash.1.gz
+
+%files dump
+%defattr(-,root,root,-)
+%{_bindir}/dump-gnash
+%{_bindir}/gnash-thumbnailer
+%{_prefix}/etc/gnashthumbnailrc
+#%{_mandir}/man1/dump-gnash.1.gz
+
%files fileio-extension
%defattr(-,root,root,-)
%{_libdir}/gnash/plugins/fileio.so
http://git.savannah.gnu.org/cgit//commit/?id=a5cfb1af39cc46f42f960bb37498a88d8d9b61c6
commit a5cfb1af39cc46f42f960bb37498a88d8d9b61c6
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 11:28:38 2012 -0700
build a dump-gnash manpage too, since we now package it.
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index e30b933..4eaf577 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -110,6 +110,7 @@ EXTRA_DIST = \
preformatted/gtk-gnash.1.in \
preformatted/qt4-gnash.1.in \
preformatted/sdl-gnash.1.in \
+ preformatted/dump-gnash.1.in \
preformatted/fb-gnash.1.in \
preformatted/gnash-gtk-launcher.1.in \
preformatted/gnash-qt-launcher.1.in
@@ -149,6 +150,10 @@ if BUILD_FB_GUI
EXTRAMANPAGES += fb-gnash.1
endif
+if BUILD_DUMP_GUI
+EXTRAMANPAGES += dump-gnash.1
+endif
+
MANSRC = $(MANPAGES:.1=.man-xml)
INFOS = gnash_user.info gnash_ref.info
HTMLS = $(XML_MAIN:.xml=.html)
@@ -259,7 +264,7 @@ else
fi
endif
-gnash.1: $(srcdir)/gnash.man-xml
+gnash.1 gtk-gnash.1 fb-gnash.1 qt4-gnash.1 dump-gnash.1:
$(srcdir)/gnash.man-xml
gprocessor.1: $(srcdir)/gprocessor.man-xml
#dumpshm.1: $(srcdir)/dumpshm.man-xml
soldumper.1: $(srcdir)/soldumper.man-xml
@@ -394,15 +399,16 @@ uninstall-man1:
$(RM) $(DESTDIR)$(man1dir)/$$file; \
done
-# gtk-gnash.1, qt-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
+# The gtk-gnash.1, qt-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1
+# dump-gnash.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.
+# they aren't in the tarball.
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; \
+ echo "NOTE: Linking alias of $$file to default manpage"; \
+ $(LN_S) -f gnash.1 $$file; \
fi; \
done
http://git.savannah.gnu.org/cgit//commit/?id=8eb3f2720ae8f6400e110be6183b9520f9feac9b
commit 8eb3f2720ae8f6400e110be6183b9520f9feac9b
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 09:53:24 2012 -0700
regenerated the preformatted versions
diff --git a/doc/C/preformatted/cygnal.1.in b/doc/C/preformatted/cygnal.1.in
index 2617683..00fe559 100644
--- a/doc/C/preformatted/cygnal.1.in
+++ b/doc/C/preformatted/cygnal.1.in
@@ -5,7 +5,7 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH cygnal 1 "30 January 2011" "" ""
+.TH cygnal 1 "17 January 2012" "" ""
.SH NAME
cygnal \- Cygnal
.SH Synopsis
@@ -19,16 +19,16 @@ video conferencing. Cygnal supports several protocols used
by SWF
file players, including RTMP, RTMPTS, and RTMPT, while encouraging the
use of patent-free codecs.
.TP
-(-h) --help
+-h, --help
Print usage info.
.TP
--version
Print version information.
.TP
-(-v) --verbose
+-v, --verbose
Verbose output.
.TP
-(-p) --port-offset
+-p, --port-offset
Port offset. This number gets added to the default
ports for RTMPS and RTMPS. This is only used by
developers.
diff --git a/doc/C/preformatted/findmicrophones.1.in
b/doc/C/preformatted/findmicrophones.1.in
index 1d74a8f..668b60c 100644
--- a/doc/C/preformatted/findmicrophones.1.in
+++ b/doc/C/preformatted/findmicrophones.1.in
@@ -5,7 +5,7 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH findmicrophones 1 "30 January 2011" "" ""
+.TH findmicrophones 1 "17 January 2012" "" ""
.SH NAME
findmicrophones \- Gnash Utility For finding microphones on computer.
.SH Synopsis
diff --git a/doc/C/preformatted/findwebcams.1.in
b/doc/C/preformatted/findwebcams.1.in
index 9a2f58b..5250dfc 100644
--- a/doc/C/preformatted/findwebcams.1.in
+++ b/doc/C/preformatted/findwebcams.1.in
@@ -5,7 +5,7 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH findwebcams 1 "30 January 2011" "" ""
+.TH findwebcams 1 "17 January 2012" "" ""
.SH NAME
findwebcams \- Gnash Utility For finding webcams on computer.
.SH Synopsis
diff --git a/doc/C/preformatted/flvdumper.1.in
b/doc/C/preformatted/flvdumper.1.in
index 4a02c85..5dc3975 100644
--- a/doc/C/preformatted/flvdumper.1.in
+++ b/doc/C/preformatted/flvdumper.1.in
@@ -5,7 +5,7 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH flvdumper 1 "30 January 2011" "" ""
+.TH flvdumper 1 "17 January 2012" "" ""
.SH NAME
flvdumper \- Gnash FLash Video File Dumper
.SH Synopsis
diff --git a/doc/C/preformatted/gnash.1.in b/doc/C/preformatted/gnash.1.in
index 7ce693d..a3da491 100644
--- a/doc/C/preformatted/gnash.1.in
+++ b/doc/C/preformatted/gnash.1.in
@@ -5,9 +5,9 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH gnash 1 "30 January 2011" "" ""
+.TH gnash 1 "17 January 2012" "" ""
.SH NAME
-gnash, gtk-gnash, qt4-gnash \- GNU Flash (SWF) Player
+gnash, gtk-gnash, qt4-gnash, fb-gnash, sdl-gnash, gnash-gtk-launcher,
gnash-qt-launcher \- GNU Flash (SWF) Player
.SH Synopsis
.nf
diff --git a/doc/C/preformatted/gprocessor.1.in
b/doc/C/preformatted/gprocessor.1.in
index 720d906..46aab49 100644
--- a/doc/C/preformatted/gprocessor.1.in
+++ b/doc/C/preformatted/gprocessor.1.in
@@ -5,7 +5,7 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH gprocessor 1 "30 January 2011" "" ""
+.TH gprocessor 1 "17 January 2012" "" ""
.SH NAME
gprocessor \- Gnash SWF Processor
.SH Synopsis
diff --git a/doc/C/preformatted/rtmpget.1.in b/doc/C/preformatted/rtmpget.1.in
index 1c8883f..748fc30 100644
--- a/doc/C/preformatted/rtmpget.1.in
+++ b/doc/C/preformatted/rtmpget.1.in
@@ -5,7 +5,7 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH rtmpget 1 "30 January 2011" "" ""
+.TH rtmpget 1 "17 January 2012" "" ""
.SH NAME
rtmpget \- Gnash Utility For Fetching RTMP-data
.SH Synopsis
diff --git a/doc/C/preformatted/soldumper.1.in
b/doc/C/preformatted/soldumper.1.in
index 3865711..3884dc8 100644
--- a/doc/C/preformatted/soldumper.1.in
+++ b/doc/C/preformatted/soldumper.1.in
@@ -5,7 +5,7 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH soldumper 1 "30 January 2011" "" ""
+.TH soldumper 1 "17 January 2012" "" ""
.SH NAME
soldumper \- Gnash Local Shared Object (LSO) File Dumper
.SH Synopsis
http://git.savannah.gnu.org/cgit//commit/?id=99e6dc77b8fc466dd955f5f9b2dea8cd05cddfae
commit 99e6dc77b8fc466dd955f5f9b2dea8cd05cddfae
Author: Rob Savoye <address@hidden>
Date: Wed Jan 18 09:52:09 2012 -0700
fix typo with gettext macro
diff --git a/libdevice/events/TouchDevice.cpp b/libdevice/events/TouchDevice.cpp
index 79aef1c..61383d7 100644
--- a/libdevice/events/TouchDevice.cpp
+++ b/libdevice/events/TouchDevice.cpp
@@ -315,7 +315,7 @@ TouchDevice::scanForDevices()
continue;
}
close(fd);
- log_debug(_("Found a %s device for touchscreen input using %s",
+ log_debug("Found a %s device for touchscreen input using %s",
debug[touch[i].type], touch[i].filespec);
boost::shared_ptr<InputDevice> dev
= boost::shared_ptr<InputDevice>(new TouchDevice());
http://git.savannah.gnu.org/cgit//commit/?id=a4deff4e4c77c4219421fad0b3d0b23ec1eb4bc8
commit a4deff4e4c77c4219421fad0b3d0b23ec1eb4bc8
Author: Rob Savoye <address@hidden>
Date: Tue Jan 17 10:14:24 2012 -0700
remove extraneous = from help strings option names
diff --git a/configure.ac b/configure.ac
index 52b24e5..f29eed7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,7 +301,7 @@ memory=no
cache=yes
stat_proplookup=no
AC_ARG_WITH(statistics,
- AC_HELP_STRING([--with-statistics=], [Specify which statistics features to
enable]),
+ AC_HELP_STRING([--with-statistics], [Specify which statistics features to
enable]),
if test -n ${withval}; then
if test "x${withval}" != "xno"; then
extlist="${withval}"
@@ -403,7 +403,7 @@ solreadonly=no
localconnection=yes
AC_ARG_WITH(security,
- AC_HELP_STRING([--with-security=], [Specify which security features to
enable]),
+ AC_HELP_STRING([--with-security], [Specify which security features to
enable]),
if test -n ${withval}; then
if test "x${withval}" != "xno"; then
extlist="${withval}"
@@ -566,7 +566,7 @@ build_sdl=no
build_aqua=no dnl Native MacOSX
build_dump=no
AC_ARG_ENABLE(gui,
- AC_HELP_STRING([--enable-gui=], [Enable support for the specified GUI
toolkits (default=gtk,qt4)]),
+ AC_HELP_STRING([--enable-gui], [Enable support for the specified GUI
toolkits (default=gtk,qt4)]),
[if test -n ${enableval}; then
enableval=`echo ${enableval} | tr '\054' ' ' `
fi
@@ -1879,7 +1879,7 @@ else
input_events=
fi
AC_ARG_ENABLE(input,
- AC_HELP_STRING([--enable-input=], [Enable support for the specified input
devices for the framebuffer GUI
(default=ps2mouse|ps2keyboard|events|touchscreen)]),
+ AC_HELP_STRING([--enable-input], [Enable support for the specified input
devices for the framebuffer GUI
(default=ps2mouse|ps2keyboard|events|touchscreen)]),
[if test -n ${enableval}; then
enableval=`echo ${enableval} | tr '\054' ' ' `
fi
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 -
configure.ac | 8 +-
doc/C/Makefile.am | 59 ++++++++----------
doc/C/{preformatted/fb-gnash.1.in => dump-gnash.1} | 0
.../gnash-gtk-launcher.1.in => fb-gnash.1} | 0
...gnash-qt-launcher.1.in => gnash-gtk-launcher.1} | 0
.../gtk-gnash.1.in => gnash-qt-launcher.1} | 0
doc/C/gnash.man-xml | 3 +-
doc/C/{preformatted/qt4-gnash.1.in => gtk-gnash.1} | 0
doc/C/preformatted/cygnal.1.in | 8 +-
doc/C/preformatted/findmicrophones.1.in | 2 +-
doc/C/preformatted/findwebcams.1.in | 2 +-
doc/C/preformatted/flvdumper.1.in | 2 +-
doc/C/preformatted/gnash.1.in | 4 +-
doc/C/preformatted/gprocessor.1.in | 2 +-
doc/C/preformatted/rtmpget.1.in | 2 +-
doc/C/preformatted/soldumper.1.in | 2 +-
doc/C/{preformatted/fb-gnash.1.in => qt4-gnash.1} | 0
doc/C/{preformatted/fb-gnash.1.in => sdl-gnash.1} | 0
libdevice/events/TouchDevice.cpp | 2 +-
packaging/deb.am | 3 +-
packaging/debian/changelog | 6 ++
packaging/debian/control | 20 ++++++
packaging/debian/gnash-cygnal.install | 1 -
packaging/debian/gnash-dump.install | 3 +
packaging/debian/gnash-dump.manpages | 1 +
packaging/debian/gnash-framebuffer.install | 1 +
packaging/debian/gnash-framebuffer.manpages | 1 +
packaging/debian/gnash-klash.install | 5 +-
packaging/debian/rules | 60 ++++--------------
packaging/redhat/gnash.spec | 65 +++++++++++++-------
packaging/rpm.am | 12 +---
packaging/snapshot.am | 2 +-
33 files changed, 140 insertions(+), 137 deletions(-)
copy doc/C/{preformatted/fb-gnash.1.in => dump-gnash.1} (100%)
rename doc/C/{preformatted/gnash-gtk-launcher.1.in => fb-gnash.1} (100%)
rename doc/C/{preformatted/gnash-qt-launcher.1.in => gnash-gtk-launcher.1}
(100%)
rename doc/C/{preformatted/gtk-gnash.1.in => gnash-qt-launcher.1} (100%)
rename doc/C/{preformatted/qt4-gnash.1.in => gtk-gnash.1} (100%)
copy doc/C/{preformatted/fb-gnash.1.in => qt4-gnash.1} (100%)
rename doc/C/{preformatted/fb-gnash.1.in => sdl-gnash.1} (100%)
create mode 100644 packaging/debian/gnash-dump.install
create mode 100644 packaging/debian/gnash-dump.manpages
create mode 100644 packaging/debian/gnash-framebuffer.install
create mode 100644 packaging/debian/gnash-framebuffer.manpages
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1419-g69001f6,
Rob Savoye <=