Merge lp:~bialix/bzr-website/win32 into lp:bzr-website

[Alexander Belchenko]

Trivial change to make force build.py using LF line endings on Windows.

[lp:~bialix/bzr-website/win32]

169. By Alexander Belchenko on 2010-08-27

re-generating en/index.html with build.py.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/27/2010 3:57 AM, Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr-website/win32 into lp:bzr-website with lp:~bialix/bzr-website/readme as a prerequisite.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
>
> Trivial change to make force build.py using LF line endings on Windows.

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkx39aoACgkQJdeBCYSNAAN9CwCfTAzkkTsRZxZgrG8rsqLy2OTn
ZmEAoMz56cTryFta7cX3KwRJgTK+BpnQ
=pKR4
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'build.py'
--- build.py	2010-07-20 16:39:58 +0000
+++ build.py	2010-08-27 09:00:57 +0000
@@ -78,7 +78,7 @@
     # found under a templates directory are compiled.
     from jinja2 import Environment, FileSystemLoader
     def save(content, filename):
-        f = open(filename, 'w')
+        f = open(filename, 'wb')
         try:
             f.write(content.encode('utf-8'))
         finally:

=== modified file 'en/index.html'
--- en/index.html	2010-07-12 14:42:40 +0000
+++ en/index.html	2010-08-27 09:00:57 +0000
@@ -167,13 +167,13 @@
     
     <h2><a href="https://launchpad.net/bazaar/+announcements">Community News</a> <a title="Atom 1.0 feed" href="http://feeds.launchpad.net/bazaar/announcements.atom"><img src="../bzricons/rss.png" /></a></h2>
     
-    <p class="readmore">12-Jul-2010: <a href="https://launchpad.net/bzr/+announcement/6313"><span>bzr 2.2b4 released</span></a></p>
-    
-    <p class="readmore">01-Jul-2010: <a href="https://launchpad.net/qbzr/+announcement/6235"><span>QBzr 0.19 Beta 2 Released</span></a></p>
-    
-    <p class="readmore">08-Jun-2010: <a href="https://launchpad.net/bzr-grep/+announcement/6028"><span>bzr-grep 0.4.0 released</span></a></p>
-    
-    <p class="readmore">30-May-2010: <a href="https://launchpad.net/bzr-explorer/+announcement/5951"><span>Bazaar Explorer 1.0.2</span></a></p>
+    <p class="readmore">20-Aug-2010: <a href="https://launchpad.net/bzr-tfs/+announcement/6561"><span>bzr-tfs 0.2 released</span></a></p>
+    
+    <p class="readmore">13-Aug-2010: <a href="https://launchpad.net/trac-bzr/+announcement/6518"><span>trac-bzr 0.4.1 released</span></a></p>
+    
+    <p class="readmore">10-Aug-2010: <a href="https://launchpad.net/trac-bzr/+announcement/6485"><span>trac-bzr 0.4.0 released</span></a></p>
+    
+    <p class="readmore">05-Aug-2010: <a href="https://launchpad.net/qbzr/+announcement/6454"><span>QBzr 0.19 final released</span></a></p>
     
     
     <h2><a href="https://launchpad.net/bzr/+announcements">Core News</a> <a title="Atom 1.0 feed" href="http://feeds.launchpad.net/bzr/announcements.atom"><img src="../bzricons/rss.png" /></a></h2>
@@ -203,15 +203,15 @@
         height="32" alt="Linux Foundation" /></a><a href="http://www.ubuntu.com/ " title="Ubuntu"><img src="../bzricons/ubuntu_black-orange_hex_su.png"
         height="32" alt="Ubuntu" /></a><a href="http://www.mysql.com/ " title="MySQL"><img src="../bzricons/mysql.png"
         height="32" alt="MySQL" /></a><a href="http://www.bugzilla.org/ " title="Bugzilla"><img src="../bzricons/bugzilla.png"
-        height="32" alt="Bugzilla" /></a><a href="http://www.list.org/ " title="GNU Mailman"><img src="../bzricons/mailman-logo-2010-64x64.png"
+        height="32" alt="Bugzilla" /></a><a href="http://www.list.org/ " title="GNU Mailman"><img src="../bzricons/mailman-logo2010-64x64.png"
         height="32" alt="GNU Mailman" /></a><a href="http://www.debian.org " title="Debian"><img src="../bzricons/debian-logo-50x61.png"
-        height="32" alt="Debian" /></a><a href="http://www.askmonty.org/ " title="MariaDB"><img src="https://launchpadlibrarian.net/23620538/maria-capt-64.png"
-        height="32" alt="MariaDB" /></a><a href="http://www.drizzle.org/ " title="Drizzle"><img src="https://launchpadlibrarian.net/20582657/drizzle64.png"
-        height="32" alt="Drizzle" /></a><a href="http://www.inkscape.org/ " title="Inkscape"><img src="https://launchpadlibrarian.net/10371289/inkscape.logo.png"
-        height="32" alt="Inkscape" /></a><a href="https://launchpad.net/gwibber " title="Gwibber"><img src="https://launchpadlibrarian.net/21176883/gwibber.64x64.png"
-        height="32" alt="Gwibber" /></a><a href="http://www.squid-cache.org/ " title="Squid Cache"><img src="https://launchpadlibrarian.net/16035213/SquidPackage-logo.png"
+        height="32" alt="Debian" /></a><a href="http://www.askmonty.org/ " title="MariaDB"><img src="../bzricons/maria-capt-64.png"
+        height="32" alt="MariaDB" /></a><a href="http://www.drizzle.org/ " title="Drizzle"><img src="../bzricons/drizzle64.png"
+        height="32" alt="Drizzle" /></a><a href="http://www.inkscape.org/ " title="Inkscape"><img src="../bzricons/inkscape.logo.png"
+        height="32" alt="Inkscape" /></a><a href="https://launchpad.net/gwibber " title="Gwibber"><img src="../bzricons/gwibber.64x64.png"
+        height="32" alt="Gwibber" /></a><a href="http://www.squid-cache.org/ " title="Squid Cache"><img src="../bzricons/SquidPackage-logo.png"
         height="32" alt="Squid Cache" /></a><a href="http://launchpad.net/ " title="Launchpad"><img src="../bzricons/launchpad-logo.png"
-        height="32" alt="Launchpad" /></a><a href="http://do.davebsd.com/ " title="GNOME Do"><img src="https://launchpadlibrarian.net/20269352/do.png"
+        height="32" alt="Launchpad" /></a><a href="http://do.davebsd.com/ " title="GNOME Do"><img src="../bzricons/do.png"
         height="32" alt="GNOME Do" /></a>
     </p>
   </div>