Merge lp:~mitya57/ubuntu-packaging-guide/more-highlights into lp:ubuntu-packaging-guide

[Dmitry Shachnev]

[ As usual, the branch name doesn't match its content :\ ]

List of changes:

  203 Dmitry Shachnev 2012-11-04
      Update debian/changelog.

  202 Dmitry Shachnev 2012-11-04
      Makefile: fix sed breaking "Grab the source" URL

  201 Dmitry Shachnev 2012-11-04 [merge]
      Merge from trunk

  200 Dmitry Shachnev 2012-10-28
      debian-dir-overview: highlight the control file
      (pygments has a lexer for debian control, yay!)

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-10-17 08:09:33 +0000
+++ Makefile	2012-11-06 14:58:20 +0000
@@ -55,6 +55,9 @@
 	sed -i 's/src="..\/_static/src=".\/_static/g' $(BUILDDIR)/html/*html
 	sed -i 's/..\/_images/.\/_images/g' $(BUILDDIR)/html/*html
 	sed -i 's/ubuntu-packaging-guide\///g' $(BUILDDIR)/html/*html
+	# The "grab the source code" URL shouldn't be mangled
+	sed -i 's/ubuntu-packaging-guide-team\/trunk/ubuntu-packaging-guide-team\/ubuntu-packaging-guide\/trunk/g' \
+	$(BUILDDIR)/html/*.html
 	sed -i 's/ubuntu-packaging-guide\///g' $(BUILDDIR)/html/searchindex.js
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html"
@@ -67,6 +70,9 @@
 	sed -i 's/src="..\/_static/src=".\/_static/g' $(BUILDDIR)/html/$*/*html
 	sed -i 's/..\/_images/.\/_images/g' $(BUILDDIR)/html/$*/*html
 	sed -i 's/ubuntu-packaging-guide\///g' $(BUILDDIR)/html/$*/*html
+	# The "grab the source code" URL shouldn't be mangled
+	sed -i 's/ubuntu-packaging-guide-team\/trunk/ubuntu-packaging-guide-team\/ubuntu-packaging-guide\/trunk/g' \
+	$(BUILDDIR)/html/$*/*.html
 	sed -i 's/ubuntu-packaging-guide\///g' $(BUILDDIR)/html/$*/searchindex.js
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$*."
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-10-30 10:33:48 +0000
+++ debian/changelog	2012-11-06 14:58:20 +0000
@@ -18,10 +18,11 @@
   * Link JS files with the libjs-sphinxdoc package.
   * Do not install websupport.js.
   * Simplified the syntax in python-packaging.rst.
-  * Miscellaneous fixes.
   * pygments.css: remove background-color line, it makes pygmentized code
     blocks look inconsistent with other ones.
-  * make some links easier to translate.
+  * Make some links easier to translate.
+  * Makefile: fix sed breaking "Grab the source" URL.
+  * Miscellaneous fixes.
 
  -- Daniel Holbach <[e-mail]>  Fri, 12 Oct 2012 16:52:11 +0200
 
 
=== modified file 'themes/ubuntu/static/base.css'
--- themes/ubuntu/static/base.css	2012-10-17 14:12:22 +0000
+++ themes/ubuntu/static/base.css	2012-11-06 14:58:20 +0000
@@ -37,7 +37,8 @@
 div.highlight-makefile,
 div.highlight-sh,
 div.highlight-diff,
-div.highlight-python {
+div.highlight-python,
+div.highlight-control {
 	padding: 10px;
 	font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
 	background-color: #fdf6f2;
 
=== modified file 'ubuntu-packaging-guide/debian-dir-overview.rst'
--- ubuntu-packaging-guide/debian-dir-overview.rst	2012-10-17 14:57:59 +0000
+++ ubuntu-packaging-guide/debian-dir-overview.rst	2012-11-06 14:58:20 +0000
@@ -73,7 +73,9 @@
 ``apt-get``, ``synaptic``, and ``adept``) uses, build-time dependencies, 
 maintainer information, and much more.
 
-For the Ubuntu ``hello`` package, the ``control`` file looks something like::
+For the Ubuntu ``hello`` package, the ``control`` file looks something like this:
+
+.. code-block:: control
 
  Source: hello
  Section: devel
@@ -95,7 +97,7 @@
   an example of how to do a Debian package. It is the Debian version of
   the GNU Project's `hello world' program (which is itself an example
   for the GNU Project).
- 
+
 The first paragraph describes the source package including the list of packages 
 required to build the package from source in the ``Build-Depends`` field. It 
 also