[Gnash-commit] gnash ChangeLog libbase/Makefile.am libbase/gna... [gnash_0_8_3_branch]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         gnash_0_8_3_branch
Changes by:     Sandro Santilli <strk>  08/05/12 07:59:10

Modified files:
        .              : ChangeLog 
        libbase        : Makefile.am 
Added files:
        libbase        : gnashpluginrc.in gnashrc.in 
Removed files:
        libbase        : sysgnashpluginrc.in sysgnashrc.in 

Log message:
        Use 'gnashrc' and 'gnashpluginrc', w/out 'sys' prefix.
        Patch #6509 by Robert Millan.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.4&r2=1.6573.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.112&r2=1.112.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/gnashpluginrc.in?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&rev=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/gnashrc.in?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&rev=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sysgnashpluginrc.in?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sysgnashrc.in?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.4
retrieving revision 1.6573.2.5
diff -u -b -r1.6573.2.4 -r1.6573.2.5
--- ChangeLog   11 May 2008 18:39:02 -0000      1.6573.2.4
+++ ChangeLog   12 May 2008 07:59:04 -0000      1.6573.2.5
@@ -1,3 +1,10 @@
+2008-05-12 Robert Millan <address@hidden>
+
+       * libbase/: Makefile.am, gnashpluginrc.in, gnashrc.in,
+         sysgnashpluginrc.in, sysgnashrc.in:
+         Use 'gnashrc' and 'gnashpluginrc', w/out 'sys' prefix.
+         Patch #6509.
+
 2008-05-10 Bastiaan Jacques <address@hidden>
 
        * server/asobj/NetStreamFfmpeg.cpp: Mutex-protect m_imageframe,

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.112
retrieving revision 1.112.2.1
diff -u -b -r1.112 -r1.112.2.1
--- libbase/Makefile.am 29 Apr 2008 16:50:50 -0000      1.112
+++ libbase/Makefile.am 12 May 2008 07:59:06 -0000      1.112.2.1
@@ -15,7 +15,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = sysgnashrc.in sysgnashpluginrc.in
+EXTRA_DIST = gnashrc.in gnashpluginrc.in
 
 # this is where Gnash plugins get installed
 pluginsdir = $(prefix)/lib/gnash/plugins
@@ -26,7 +26,7 @@
 LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
 endif
 
-sysconf_DATA = sysgnashrc sysgnashpluginrc
+sysconf_DATA = gnashrc gnashpluginrc
 
 edit = sed \
        -e 's|@address@hidden|$(DEFAULT_FLASH_PLATFORM_ID)|g' \
@@ -35,10 +35,10 @@
        -e 's|@address@hidden|$(DEFAULT_FLASH_REV_NUMBER)|g' \
        -e 's|@address@hidden|$(DEFAULT_STREAMS_TIMEOUT)|g' 
 
-sysgnashrc: sysgnashrc.in
+gnashrc: gnashrc.in
        $(edit) '$(srcdir)/address@hidden' >$@
 
-sysgnashpluginrc: sysgnashpluginrc.in
+gnashpluginrc: gnashpluginrc.in
        $(edit) '$(srcdir)/address@hidden' >$@
 
 # If we are using an installable libltdl, then it needs to be built
@@ -179,7 +179,7 @@
 noinst_LTLIBRARIES = libltdlc.la
 libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
 endif
-CLEANFILES = libltdl.la libltdlc.la sysgnashrc sysgnashpluginrc
+CLEANFILES = libltdl.la libltdlc.la gnashrc gnashpluginrc
 
 libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
 libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1

Index: libbase/gnashpluginrc.in
===================================================================
RCS file: libbase/gnashpluginrc.in
diff -N libbase/gnashpluginrc.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ libbase/gnashpluginrc.in    12 May 2008 07:59:07 -0000      1.1.2.2
@@ -0,0 +1,21 @@
+###########################################################
+#
+# Sat Apr 26 11:47:04 CEST 2008
+#
+# This file will be used as a config file by
+# the gnash NPAPI plugin (still not by the KPARTS one)
+#
+# At time of writing, the plugin will first parse the
+# systemwide 'gnashrc' file, then the user '.gnashrc'
+# file, then the systemwide 'gnashpluginrc' file and
+# finally user '.gnashpluginrc'.
+#
+###########################################################
+
+# Start the gui in STOP mode
+#
+# This is a commonly wanted feature for plugin  runs.
+#
+# Default: off
+#
+set startStopped on

Index: libbase/gnashrc.in
===================================================================
RCS file: libbase/gnashrc.in
diff -N libbase/gnashrc.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ libbase/gnashrc.in  12 May 2008 07:59:08 -0000      1.1.2.2
@@ -0,0 +1,193 @@
+###########################################################
+#
+# Sat Apr 26 11:47:04 CEST 2008
+#
+# This file will be used as a config file by
+# all gnash processes.
+#
+# At time of writing, the plugin will first parse the
+# systemwide 'gnashrc' file, then the user '.gnashrc'
+# file, then the systemwide 'gnashpluginrc' file and
+# finally user '.gnashpluginrc'.
+#
+###########################################################
+
+
+# Display a splash screen when starting.
+#
+# Default: on
+#
+#set splashScreen off
+
+# Only access remote content from our local domain 
+#
+# Default: off
+#
+#set localdomain on
+
+# Only access content from our local host
+#
+# Default: off
+#
+#set localhost on
+
+# If whitelist is non-empty, only SWF from the given domains
+# are allowed to be loaded.
+#
+# Default: empty
+#
+#set whitelist www.doonesbury.com www.cnn.com
+#append whiteList www.9news.com
+
+# If whitelist is empty, these are the only domains from 
+# which loading SWFs will be forbidden.
+#
+# Default: empty
+#
+#set blacklist www.doubleclick.com www.ebay.com
+#append blacklist www.evil.com
+
+# The delay between frame advance,
+# 0 to use what's specified in the SWF.
+#
+# Default: 0
+#
+#set delay 50
+
+# Gnash verbosity level:
+#  0: no output
+#  1: user traces, internal errors, unimplemented messages
+#  2: debug messages
+#
+# Default: 0
+#
+#set verbosity 1
+
+# Print a lot of info about ActionScript processing
+#
+# Default: off
+# 
+#set actionDump on
+
+# Print a lot of info about SWF parsing
+#
+# Default: off
+# 
+#set parserDump on
+
+# File to send logs to (if writelog is on)
+#
+# Default: gnash-dbg.log (in current working dir)
+#
+#set debuglog /tmp/gnash-dbg.log
+
+# Write a debug log to disk
+#
+# Default: off
+#
+#set writelog on
+
+# Version string to pass to ActionScript
+#
+# Default: @DEFAULT_FLASH_PLATFORM_ID@ 
@DEFAULT_FLASH_MAJOR_VERSION@,@DEFAULT_FLASH_MINOR_VERSION@,@DEFAULT_FLASH_REV_NUMBER@,0
+#
+#set flashVersionString GSH 9,0,99,0
+
+# Enable the ActionScript debugger (if compile-time support was enabled)
+#
+# Default: off
+#
+#set debugger on
+
+# Activate sound
+#
+# Default: on
+#
+#set sound off
+
+# Activate sound when called as a plugin
+#
+# NOTE: this is a deprecated directive, should
+#       use the gnashpluginrc file for plugin-specific
+#       settings
+#
+# Default: on
+#
+#set pluginSoUND off
+
+# Enable Gnash extensions (custom ActionScript classes in the player API)
+#
+# You shouldn't enable this unless you really know what you're doing
+#
+# Default: off
+#
+#set enableExtensions on
+
+# Start the gui in STOP mode
+#
+# This is a commonly wanted feature for plugin
+# runs, better override in gnashpluginrc
+#
+# Default: off
+#
+#set startStopped on
+
+# Allow unverified SSL connections
+#
+# Default: false
+#
+#set insecureSSL on
+
+# Timeout in seconds for stream download
+#
+# The download will timeout after the given seconds
+# of inactivity. Every activity resets the timer
+#
+# Default: @DEFAULT_STREAMS_TIMEOUT@
+#
+set streamsTimeout 1.5
+
+# A space-separated list of directories you want movies
+# to have access to.
+#
+# Note that the directory from which your swf was loaded
+# (if loaded from local filesystem) will be always appended
+# to the list.
+#
+# Default: empty
+# 
+#set localSandboxPath /tmp/flashsandbox
+#append localSandboxPath /tmp/flashsandbox2
+
+# Use the following command format to open urls if 
+# no host-request FD was given.
+#
+# The '%u' label will be substituted with the url
+# to open.
+# 
+# NOTE that the NPAPI plugin provides an host request FD
+# to send url opening requests to.
+#
+# Default: firefox -remote 'openurl(%u)'
+#
+#set urlOpenerFormat lynx %u
+
+# Directory to store SharedObject files 
+#
+# If the directory doens't exist SharedObject won't work.
+# 
+# Default: /tmp/
+#
+set SOLSafeDir /dev/null
+
+# Never write SharedObject (kind of cookies), only read them
+#
+# Default: false
+#
+#set SOLReadOnly true
+
+# Enable LocalConnection ActionScript class
+#
+# Default: false
+#
+set LocalConnection off

Index: libbase/sysgnashpluginrc.in
===================================================================
RCS file: libbase/sysgnashpluginrc.in
diff -N libbase/sysgnashpluginrc.in
--- libbase/sysgnashpluginrc.in 26 Apr 2008 10:10:36 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-###########################################################
-#
-# Sat Apr 26 11:47:04 CEST 2008
-#
-# This file will be used as a config file by
-# the gnash NPAPI plugin (still not by the KPARTS one)
-#
-# At time of writing, the plugin will first parse the
-# systemwide 'gnashrc' file, then the user '.gnashrc'
-# file, then the systemwide 'gnashpluginrc' file and
-# finally user '.gnashpluginrc'.
-#
-###########################################################
-
-# Start the gui in STOP mode
-#
-# This is a commonly wanted feature for plugin  runs.
-#
-# Default: off
-#
-set startStopped on

Index: libbase/sysgnashrc.in
===================================================================
RCS file: libbase/sysgnashrc.in
diff -N libbase/sysgnashrc.in
--- libbase/sysgnashrc.in       26 Apr 2008 10:10:36 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,193 +0,0 @@
-###########################################################
-#
-# Sat Apr 26 11:47:04 CEST 2008
-#
-# This file will be used as a config file by
-# all gnash processes.
-#
-# At time of writing, the plugin will first parse the
-# systemwide 'gnashrc' file, then the user '.gnashrc'
-# file, then the systemwide 'gnashpluginrc' file and
-# finally user '.gnashpluginrc'.
-#
-###########################################################
-
-
-# Display a splash screen when starting.
-#
-# Default: on
-#
-#set splashScreen off
-
-# Only access remote content from our local domain 
-#
-# Default: off
-#
-#set localdomain on
-
-# Only access content from our local host
-#
-# Default: off
-#
-#set localhost on
-
-# If whitelist is non-empty, only SWF from the given domains
-# are allowed to be loaded.
-#
-# Default: empty
-#
-#set whitelist www.doonesbury.com www.cnn.com
-#append whiteList www.9news.com
-
-# If whitelist is empty, these are the only domains from 
-# which loading SWFs will be forbidden.
-#
-# Default: empty
-#
-#set blacklist www.doubleclick.com www.ebay.com
-#append blacklist www.evil.com
-
-# The delay between frame advance,
-# 0 to use what's specified in the SWF.
-#
-# Default: 0
-#
-#set delay 50
-
-# Gnash verbosity level:
-#  0: no output
-#  1: user traces, internal errors, unimplemented messages
-#  2: debug messages
-#
-# Default: 0
-#
-#set verbosity 1
-
-# Print a lot of info about ActionScript processing
-#
-# Default: off
-# 
-#set actionDump on
-
-# Print a lot of info about SWF parsing
-#
-# Default: off
-# 
-#set parserDump on
-
-# File to send logs to (if writelog is on)
-#
-# Default: gnash-dbg.log (in current working dir)
-#
-#set debuglog /tmp/gnash-dbg.log
-
-# Write a debug log to disk
-#
-# Default: off
-#
-#set writelog on
-
-# Version string to pass to ActionScript
-#
-# Default: @DEFAULT_FLASH_PLATFORM_ID@ 
@DEFAULT_FLASH_MAJOR_VERSION@,@DEFAULT_FLASH_MINOR_VERSION@,@DEFAULT_FLASH_REV_NUMBER@,0
-#
-#set flashVersionString GSH 9,0,99,0
-
-# Enable the ActionScript debugger (if compile-time support was enabled)
-#
-# Default: off
-#
-#set debugger on
-
-# Activate sound
-#
-# Default: on
-#
-#set sound off
-
-# Activate sound when called as a plugin
-#
-# NOTE: this is a deprecated directive, should
-#       use the gnashpluginrc file for plugin-specific
-#       settings
-#
-# Default: on
-#
-#set pluginSoUND off
-
-# Enable Gnash extensions (custom ActionScript classes in the player API)
-#
-# You shouldn't enable this unless you really know what you're doing
-#
-# Default: off
-#
-#set enableExtensions on
-
-# Start the gui in STOP mode
-#
-# This is a commonly wanted feature for plugin
-# runs, better override in gnashpluginrc
-#
-# Default: off
-#
-#set startStopped on
-
-# Allow unverified SSL connections
-#
-# Default: false
-#
-#set insecureSSL on
-
-# Timeout in seconds for stream download
-#
-# The download will timeout after the given seconds
-# of inactivity. Every activity resets the timer
-#
-# Default: @DEFAULT_STREAMS_TIMEOUT@
-#
-set streamsTimeout 1.5
-
-# A space-separated list of directories you want movies
-# to have access to.
-#
-# Note that the directory from which your swf was loaded
-# (if loaded from local filesystem) will be always appended
-# to the list.
-#
-# Default: empty
-# 
-#set localSandboxPath /tmp/flashsandbox
-#append localSandboxPath /tmp/flashsandbox2
-
-# Use the following command format to open urls if 
-# no host-request FD was given.
-#
-# The '%u' label will be substituted with the url
-# to open.
-# 
-# NOTE that the NPAPI plugin provides an host request FD
-# to send url opening requests to.
-#
-# Default: firefox -remote 'openurl(%u)'
-#
-#set urlOpenerFormat lynx %u
-
-# Directory to store SharedObject files 
-#
-# If the directory doens't exist SharedObject won't work.
-# 
-# Default: /tmp/
-#
-set SOLSafeDir /dev/null
-
-# Never write SharedObject (kind of cookies), only read them
-#
-# Default: false
-#
-#set SOLReadOnly true
-
-# Enable LocalConnection ActionScript class
-#
-# Default: false
-#
-set LocalConnection off