Index: general.ent
===================================================================
--- general.ent	(revision ab0ddfd6f7e7a3a0ee6d1ca060bce19a5bc7769e)
+++ general.ent	(revision eb5f847a72ccac27acfb1e74e5318233a001beab)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "09">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 8th, &year;">
+<!ENTITY releasedate  "June 9th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -945,5 +945,5 @@
 
 <!-- Chapter 36 -->
-<!ENTITY seamonkey-version            "2.9">
+<!ENTITY seamonkey-version            "2.10">
 <!ENTITY firefox-version              "13.0">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ab0ddfd6f7e7a3a0ee6d1ca060bce19a5bc7769e)
+++ introduction/welcome/changelog.xml	(revision eb5f847a72ccac27acfb1e74e5318233a001beab)
@@ -43,4 +43,13 @@
 -->
     <listitem>
+      <para>June 9th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abenton] - Updated Seamonkey to 2.10.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 8th, 2012</para>
       <itemizedlist>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision ab0ddfd6f7e7a3a0ee6d1ca060bce19a5bc7769e)
+++ xsoft/graphweb/firefox.xml	(revision eb5f847a72ccac27acfb1e74e5318233a001beab)
@@ -140,5 +140,5 @@
     </para>
 
-<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
+<screen><userinput>cat &gt; mozconfig &lt;&lt; EOF
 # If you have a multicore machine you can speed up the build by running
 # several jobs at once, but if you have a single core, delete this line:
@@ -159,5 +159,5 @@
 # If you have installed xulrunner uncomment these two lines:
 # ac_add_options --with-system-libxul
-# ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;
+# ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
 
 # Uncomment these if you have installed them:
@@ -221,6 +221,6 @@
   -C /usr/lib/firefox-&firefox-version; --strip-components=1 &amp;&amp;
 ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;
-mkdir -p /usr/lib/mozilla/plugins &amp;&amp;
-ln -sv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &amp;&amp;
+mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
+ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &amp;&amp;
 chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
 
@@ -238,6 +238,6 @@
 HERE_DOC
 chmod 755 /usr/bin/firefox &amp;&amp;
-mkdir -p /usr/lib/mozilla/plugins &amp;&amp;
-ln -sv ../mozilla/plugins /usr/lib/firefox-&firefox-version;</userinput></screen>
+mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
+ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version;</userinput></screen>
 
     <bridgehead renderas="sect3" id="npapi-firefox" xreflabel="Firefox">
@@ -252,6 +252,7 @@
     </para>
 
-<screen role="root"><userinput>mkdir /usr/include/npapi
-cp dom/plugins/base/*.h /usr/include/npapi</userinput></screen>
+<screen role="root"><userinput>rm -rf /usr/include/npapi &amp;&amp;
+mkdir -v /usr/include/npapi &amp;&amp;
+cp -v dom/plugins/base/*.h /usr/include/npapi</userinput></screen>
   </sect2>
 
@@ -334,5 +335,5 @@
     </para>
 
-<screen role="root"><userinput>mkdir -p /usr/share/applications &amp;&amp;
+<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
 cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
 [Desktop Entry]
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision ab0ddfd6f7e7a3a0ee6d1ca060bce19a5bc7769e)
+++ xsoft/graphweb/seamonkey.xml	(revision eb5f847a72ccac27acfb1e74e5318233a001beab)
@@ -9,7 +9,7 @@
   <!ENTITY seamonkey-download-ftp
   "ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.bz2">
-  <!ENTITY seamonkey-md5sum        "4af38acf517a8ab850e6aa7a6b085325">
-  <!ENTITY seamonkey-size          "98 MB">
-  <!ENTITY seamonkey-buildsize     "3.2 GB (48 MB installed)">
+  <!ENTITY seamonkey-md5sum        "c2c41a12107a67e5eedef06d50e26c56">
+  <!ENTITY seamonkey-size          "99 MB">
+  <!ENTITY seamonkey-buildsize     "1.1 GB (45 MB installed)">
   <!ENTITY seamonkey-time          "26.6 SBU">
 ]>
@@ -87,6 +87,6 @@
       <listitem>
         <para>
-          Required patch if you're using <application>GCC-4.7</application>:
-          <ulink url="&patch-root;/seamonkey-&seamonkey-version;_gcc-4.7-1.patch"/>
+          Required patch:
+          <ulink url="&patch-root;/seamonkey-&seamonkey-version;-package-manifest-1.diff"/>
         </para>
       </listitem>
@@ -147,5 +147,6 @@
     </para>
 
-<screen><?dbfo keep-together="auto"?><userinput>cat &gt; .mozconfig &lt;&lt; "EOF"
+<screen><?dbfo keep-together="auto"?><userinput>patch -p1 &lt; ../seamonkey-&seamonkey-version;-package-manifest-1.diff &amp;&amp;
+cat &gt; mozconfig &lt;&lt; "EOF"
 # If you have a multicore machine you can speed up the build by running
 # several jobs at once, but if you have a single core, delete this line:
@@ -197,6 +198,5 @@
     </para>
 
-<screen><userinput>patch -p1 &lt; ../seamonkey-&seamonkey-version;_gcc-4.7-1.patch &amp;&amp;
-make -f client.mk &amp;&amp;
+<screen><userinput>make -f client.mk &amp;&amp;
 make -C moz-build-dir/suite/installer</userinput></screen>
 
@@ -213,10 +213,11 @@
     </para>
 
-<screen role="root"><userinput>mkdir -p /usr/lib/seamonkey-&seamonkey-version; &amp;&amp;
+<screen role="root"><userinput>rm -rf /usr/lib/seamonkey-&seamonkey-version; &amp;&amp;
+mkdir -pv /usr/lib/seamonkey-&seamonkey-version; &amp;&amp;
 tar xf moz-build-dir/mozilla/dist/seamonkey-&seamonkey-version;.en-US.linux-$(uname -m).tar.bz2 \
   -C /usr/lib/seamonkey-&seamonkey-version; --strip-components=1 &amp;&amp;
-ln -s ../lib/seamonkey-&seamonkey-version;/seamonkey /usr/bin &amp;&amp;
+ln -sfv ../lib/seamonkey-&seamonkey-version;/seamonkey /usr/bin &amp;&amp;
 mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
-ln -svf ../mozilla/plugins /usr/lib/seamonkey-&seamonkey-version; &amp;&amp;
+ln -sfv ../mozilla/plugins /usr/lib/seamonkey-&seamonkey-version; &amp;&amp;
 cp -v moz-build-dir/mozilla/dist/man/man1/seamonkey.1 /usr/share/man/man1</userinput></screen>
 
@@ -232,6 +233,7 @@
     </para>
 
-<screen role="root"><userinput>mkdir /usr/include/npapi
-cp mozilla/dom/plugins/base/*.h /usr/include/npapi</userinput></screen>
+<screen role="root"><userinput>rm -rf /usr/include/npapi &amp;&amp;
+mkdir -v /usr/include/npapi &amp;&amp;
+cp -v mozilla/dom/plugins/base/*.h /usr/include/npapi</userinput></screen>
 
     <bridgehead renderas="sect3" id="devel-seamonkey" xreflabel="Seamonkey">
@@ -252,7 +254,8 @@
     <para>
       <command>patch -p1 &lt;
-      ../seamonkey-&seamonkey-version;_gcc-4.7-1.patch</command>: This patch
-      fixes various files to ensure that <application>Seamonkey</application>
-      compiles with <application>GCC 4.7</application>.
+      ../seamonkey-&seamonkey-version;-package-manifest-1.diff</command>: This
+      patch fixes the installer so it can cope with the situation where
+      Seamonkey was configured with --enable-system-sqlite, --with-system-nspr,
+      --with-system-nss and --disable-updater.
     </para>
 
@@ -342,5 +345,5 @@
     </para>
 
-<screen role="root"><userinput>mkdir -p /usr/share/applications &amp;&amp;
+<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
 cat &gt; /usr/share/applications/seamonkey.desktop &lt;&lt; "EOF" &amp;&amp;
 [Desktop Entry]
@@ -355,5 +358,5 @@
 Terminal=false
 EOF
-ln -sv -f /usr/lib/seamonkey-&seamonkey-version;/chrome/icons/default/seamonkey.png /usr/share/pixmaps</userinput></screen>
+ln -sfv /usr/lib/seamonkey-&seamonkey-version;/chrome/icons/default/seamonkey.png /usr/share/pixmaps</userinput></screen>
   </sect2>
 
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision ab0ddfd6f7e7a3a0ee6d1ca060bce19a5bc7769e)
+++ xsoft/other/thunderbird.xml	(revision eb5f847a72ccac27acfb1e74e5318233a001beab)
@@ -182,8 +182,8 @@
     </para>
 
-<screen role="root"><userinput>mkdir -p /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
+<screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
 tar xf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2 \
   -C /usr/lib/thunderbird-&thunderbird-version; --strip-components=1 &amp;&amp;
-ln -s ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>
+ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>
 
     <para>
@@ -284,5 +284,5 @@
     </para>
 
-<screen role="root"><userinput>mkdir -p /usr/share/applications &amp;&amp;
+<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
 cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
 [Desktop Entry]
@@ -297,5 +297,5 @@
 Terminal=false
 EOF
-ln -svf /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
+ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
   /usr/share/pixmaps/thunderbird.png</userinput></screen>
     </sect3>
