[xine-cvs] CVS: gnome-xine COPYING,1.2,1.2.6.1 ChangeLog,1.74.2.35,1.74.2.36 configure.ac,1.45.2.15,1.45.2.16

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5567

Modified Files:
      Tag: gxine-0_4_2-branch
	COPYING ChangeLog configure.ac 
Log Message:
Backports from HEAD.

Index: COPYING
===================================================================
RCS file: /cvsroot/xine/gnome-xine/COPYING,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- COPYING	12 May 2002 14:00:02 -0000	1.2
+++ COPYING	24 Oct 2005 01:18:30 -0000	1.2.6.1
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 
 Also add information on how to contact you by electronic and paper mail.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/gnome-xine/ChangeLog,v
retrieving revision 1.74.2.35
retrieving revision 1.74.2.36
diff -u -r1.74.2.35 -r1.74.2.36
--- ChangeLog	14 Oct 2005 21:05:28 -0000	1.74.2.35
+++ ChangeLog	24 Oct 2005 01:18:30 -0000	1.74.2.36
@@ -1,3 +1,9 @@
+0.4.10: [dsalt]
+	* COPYING: update FSF address.
+	* Don't allow commas in plugin parameters.
+	* Fix a bug in plugin char-array parameter undo handling.
+	* Make warning about built-in JS lib much more noticeable.
+
 0.4.9:	[dsalt]
 	* Make XTest optional (screenblanker-defeating fake keypresses).
 	  It seems to be causing problems...

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.45.2.15
retrieving revision 1.45.2.16
diff -u -r1.45.2.15 -r1.45.2.16
--- configure.ac	14 Oct 2005 21:05:09 -0000	1.45.2.15
+++ configure.ac	24 Oct 2005 01:18:30 -0000	1.45.2.16
@@ -325,5 +325,13 @@
 AC_OUTPUT
 
 if test "$smjs" = no; then
-  AC_MSG_WARN([building with internal Spidermonkey is deprecated])
+  sleep 1
+  AC_MSG_WARN([
+
++----------------------------------------------------------------------------+
+| Building with internal Spidermonkey is deprecated and is BROKEN on 64-bit. |
+| gxine may not function correctly.                                          |
++----------------------------------------------------------------------------+
+])
+  sleep 1
 fi