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

Proposed by Dmitry Shachnev
Status: Merged
Merged at revision: 206
Proposed branch: lp:~mitya57/ubuntu-packaging-guide/more-highlights
Merge into: lp:ubuntu-packaging-guide
Diff against target: 79 lines (+15/-5)
4 files modified
Makefile (+6/-0)
debian/changelog (+3/-2)
themes/ubuntu/static/base.css (+2/-1)
ubuntu-packaging-guide/debian-dir-overview.rst (+4/-2)
To merge this branch: bzr merge lp:~mitya57/ubuntu-packaging-guide/more-highlights
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Review via email: mp+133074@code.launchpad.net

Description of the change

[ 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!)

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2012-10-17 08:09:33 +0000
3+++ Makefile 2012-11-06 14:58:20 +0000
4@@ -55,6 +55,9 @@
5 sed -i 's/src="..\/_static/src=".\/_static/g' $(BUILDDIR)/html/*html
6 sed -i 's/..\/_images/.\/_images/g' $(BUILDDIR)/html/*html
7 sed -i 's/ubuntu-packaging-guide\///g' $(BUILDDIR)/html/*html
8+ # The "grab the source code" URL shouldn't be mangled
9+ sed -i 's/ubuntu-packaging-guide-team\/trunk/ubuntu-packaging-guide-team\/ubuntu-packaging-guide\/trunk/g' \
10+ $(BUILDDIR)/html/*.html
11 sed -i 's/ubuntu-packaging-guide\///g' $(BUILDDIR)/html/searchindex.js
12 @echo
13 @echo "Build finished. The HTML pages are in $(BUILDDIR)/html"
14@@ -67,6 +70,9 @@
15 sed -i 's/src="..\/_static/src=".\/_static/g' $(BUILDDIR)/html/$*/*html
16 sed -i 's/..\/_images/.\/_images/g' $(BUILDDIR)/html/$*/*html
17 sed -i 's/ubuntu-packaging-guide\///g' $(BUILDDIR)/html/$*/*html
18+ # The "grab the source code" URL shouldn't be mangled
19+ sed -i 's/ubuntu-packaging-guide-team\/trunk/ubuntu-packaging-guide-team\/ubuntu-packaging-guide\/trunk/g' \
20+ $(BUILDDIR)/html/$*/*.html
21 sed -i 's/ubuntu-packaging-guide\///g' $(BUILDDIR)/html/$*/searchindex.js
22 @echo
23 @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$*."
24
25=== modified file 'debian/changelog'
26--- debian/changelog 2012-10-30 10:33:48 +0000
27+++ debian/changelog 2012-11-06 14:58:20 +0000
28@@ -18,10 +18,11 @@
29 * Link JS files with the libjs-sphinxdoc package.
30 * Do not install websupport.js.
31 * Simplified the syntax in python-packaging.rst.
32- * Miscellaneous fixes.
33 * pygments.css: remove background-color line, it makes pygmentized code
34 blocks look inconsistent with other ones.
35- * make some links easier to translate.
36+ * Make some links easier to translate.
37+ * Makefile: fix sed breaking "Grab the source" URL.
38+ * Miscellaneous fixes.
39
40 -- Daniel Holbach <daniel.holbach@ubuntu.com> Fri, 12 Oct 2012 16:52:11 +0200
41
42
43=== modified file 'themes/ubuntu/static/base.css'
44--- themes/ubuntu/static/base.css 2012-10-17 14:12:22 +0000
45+++ themes/ubuntu/static/base.css 2012-11-06 14:58:20 +0000
46@@ -37,7 +37,8 @@
47 div.highlight-makefile,
48 div.highlight-sh,
49 div.highlight-diff,
50-div.highlight-python {
51+div.highlight-python,
52+div.highlight-control {
53 padding: 10px;
54 font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
55 background-color: #fdf6f2;
56
57=== modified file 'ubuntu-packaging-guide/debian-dir-overview.rst'
58--- ubuntu-packaging-guide/debian-dir-overview.rst 2012-10-17 14:57:59 +0000
59+++ ubuntu-packaging-guide/debian-dir-overview.rst 2012-11-06 14:58:20 +0000
60@@ -73,7 +73,9 @@
61 ``apt-get``, ``synaptic``, and ``adept``) uses, build-time dependencies,
62 maintainer information, and much more.
63
64-For the Ubuntu ``hello`` package, the ``control`` file looks something like::
65+For the Ubuntu ``hello`` package, the ``control`` file looks something like this:
66+
67+.. code-block:: control
68
69 Source: hello
70 Section: devel
71@@ -95,7 +97,7 @@
72 an example of how to do a Debian package. It is the Debian version of
73 the GNU Project's `hello world' program (which is itself an example
74 for the GNU Project).
75-
76+
77 The first paragraph describes the source package including the list of packages
78 required to build the package from source in the ``Build-Depends`` field. It
79 also

Subscribers

People subscribed via source and target branches