ubuntu-packaging-guide-team team mailing list archive

[Dmitry Shachnev <mitya57@xxxxxxxxx>]

Dmitry Shachnev has proposed merging lp:~mitya57/ubuntu-packaging-guide/ubuntu-logo into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)

For more details, see:
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/ubuntu-logo/+merge/135903

We package ubuntu-packaging-guide to make it easily viewable offline, but it looks ugly when the Ubuntu logo is missing.

This branch makes the package install and use local logo-ubuntu.png.
-- 
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/ubuntu-logo/+merge/135903
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~mitya57/ubuntu-packaging-guide/ubuntu-logo into lp:ubuntu-packaging-guide.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-21 00:17:26 +0000
+++ debian/changelog	2012-11-23 13:58:22 +0000
@@ -27,6 +27,7 @@
   * Makefile: add a special case for building Japanese PDF files
     (LP: #1043232).
   * Build-depend on texlive-lang-cjk and latex-cjk-japanese.
+  * Install and use local logo-ubuntu.png.
   * Miscellaneous fixes.
 
  -- Daniel Holbach <daniel.holbach@xxxxxxxxxx>  Fri, 12 Oct 2012 16:52:11 +0200

=== modified file 'themes/ubuntu/layout.html'
--- themes/ubuntu/layout.html	2012-10-16 12:14:37 +0000
+++ themes/ubuntu/layout.html	2012-11-23 13:58:22 +0000
@@ -139,7 +139,7 @@
           </li>
         </ul>
       </nav>
-      <a class="logo-ubuntu" href="/"><img src="http://developer.ubuntu.com/wp-content/themes/wordpress-theme-ubuntudeveloper/img/logo-ubuntu.png"; width="119" height="27" alt="Ubuntu logo" /></a>
+      <a class="logo-ubuntu" href="/"><img src="{{ pathto('_static/images/logo-ubuntu.png', 1) }}" width="119" height="27" alt="Ubuntu logo" /></a>
       <h2><a href="/">Developer</a></h2>
     </div>
   </div>

=== added file 'themes/ubuntu/static/images/logo-ubuntu.png'
Binary files themes/ubuntu/static/images/logo-ubuntu.png	1970-01-01 00:00:00 +0000 and themes/ubuntu/static/images/logo-ubuntu.png	2012-11-23 13:58:22 +0000 differ