Index: ChangeLog
===================================================================
--- ChangeLog (revision 11153)
+++ ChangeLog (working copy)
@@ -1,5 +1,14 @@
2007-04-19 Laszlo (Laca) Peter <laca at sun.com>
+ * base-specs/evince.spec: add -ascii option to dos2unix so that
+ utf8 strings are not messed up
+ * base-specs/gnome-terminal.spec: same again
+ * base-specs/totem.spec: same again
+ * ext-sources/default-copyright.txt: s/2006/2007/
+ * ext-sources/sun-gnome-version.xml: s/2006/2007/
+
+2007-04-19 Laszlo (Laca) Peter <laca at sun.com>
+
* SUNWgnome-libs.spec: add postrun scripts that add/delete a
rewrite rule for the scrollkeeper dtd to /etc/xml/catalog,
so that libxml2 can find it locally and not try to download
Index: base-specs/gnome-terminal.spec
===================================================================
--- base-specs/gnome-terminal.spec (revision 11152)
+++ base-specs/gnome-terminal.spec (working copy)
@@ -63,7 +63,7 @@
%patch4 -p1
# dos2unix to fix 400207.
-dos2unix po/be.po po/be.po
+dos2unix -ascii po/be.po po/be.po
%build
%ifos linux
@@ -125,6 +125,8 @@
%{_mandir}/man1/*
%changelog
+* Thu Apr 19 2007 - laca at sun.com
+- add -ascii option to dos2unix so that utf8 strings are not messed up
* Tue Mar 13 2007 - damien.carbery at sun.com
- Bump to 2.18.0.
* Mon Mar 05 2007 - damien.carbery at sun.com
Index: base-specs/totem.spec
===================================================================
--- base-specs/totem.spec (revision 11152)
+++ base-specs/totem.spec (working copy)
@@ -65,7 +65,7 @@
%patch5 -p1
# dos2unix to fix 398052.
-dos2unix po/be.po po/be.po
+dos2unix -ascii po/be.po po/be.po
%build
%ifos linux
@@ -152,260 +152,188 @@
%{_includedir}/totem/*
%changelog
+* Thu Apr 19 2007 - laca at sun.com
+- add -ascii option to dos2unix so that utf8 strings are not messed up
* Wed Apr 04 2007 - damien.carbery at sun.com
- Bump to 2.18.
Index: base-specs/evince.spec
===================================================================
--- base-specs/evince.spec (revision 11152)
+++ base-specs/evince.spec (working copy)
@@ -58,7 +58,7 @@
%patch2 -p1
# Remove DOS line end chars. Fixes #395105.
-dos2unix po/be.po po/be.po
+dos2unix -ascii po/be.po po/be.po
%build
%ifos linux
@@ -111,6 +111,8 @@
%{_sysconfdir}/gconf/schemas/*
%changelog
+* Thu Apr 19 2007 - laca at sun.com
+- add -ascii option to dos2unix so that utf8 strings are not messed up
* Thu Apr 12 2007 - damien.carbery at sun.com
- Bump to 0.8.1.
* Tue Mar 13 2007 - damien.carbery at sun.com
Index: ext-sources/sun-gnome-version.xml
===================================================================
--- ext-sources/sun-gnome-version.xml (revision 11152)
+++ ext-sources/sun-gnome-version.xml (working copy)
@@ -10,7 +10,7 @@
<description>
<_p>
-Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+Copyright 2007 Sun Microsystems, Inc. All rights reserved.
</_p>
<_p>
U.S. Government Rights - Commercial software. Government users are
@@ -37,7 +37,7 @@
interfaces from those found in GNOME 2.0 or 2.6.
</_p>
<p>
-Copyright 2006 Sun Microsystems, Inc. Tous droits r??serv??s.
+Copyright 2007 Sun Microsystems, Inc. Tous droits r??serv??s.
</p>
<p>
L'utilisation est soumise aux termes du contrat de licence. Cette distribution
Index: ext-sources/default-copyright.txt
===================================================================
--- ext-sources/default-copyright.txt (revision 11152)
+++ ext-sources/default-copyright.txt (working copy)
@@ -1,2 +1,2 @@
-Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+Copyright 2007 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.