Merge lp:~noskcaj/ubuntu/vivid/gtk-doc/merge into lp:ubuntu/vivid/gtk-doc

[Jackson Doak]

Merge from debian

[Iain Lane (laney)]

Uploaded, ta

[Iain Lane (laney)]

review: Approve

Unmerged revisions

33. By Jackson Doak on 2014-10-27

fix typo

32. By Jackson Doak on 2014-10-27

* Merge from debian. Remaining changes:
  - debian/control.in: Drop optional highlight dependency, which is in
    universe.
* Team upload.
* Build-depend on dblatex so that gtkdoc-mkpdf works. Closes: #570751.
* Suggest dblatex as well since it might be useful at runtime.

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-03 06:25:50 +0000
+++ debian/changelog	2014-10-27 21:05:11 +0000
@@ -1,3 +1,23 @@
+gtk-doc (1.21-2ubuntu1) vivid; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - debian/control.in: Drop optional highlight dependency, which is in
+      universe.
+
+ -- Jackson Doak <[e-mail]>  Tue, 28 Oct 2014 07:12:24 +1100
+
+gtk-doc (1.21-2) unstable; urgency=low
+
+  * Team upload.
+
+  [ Simon Josefsson ]
+  * Build-depend on dblatex so that gtkdoc-mkpdf works. Closes: #570751.
+
+  [ Andreas Henriksson ]
+  * Suggest dblatex as well since it might be useful at runtime.
+
+ -- Andreas Henriksson <[e-mail]>  Thu, 11 Sep 2014 00:49:29 +0200
+
 gtk-doc (1.21-1ubuntu1) utopic; urgency=medium
 
   * Merge from debian. Remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2014-08-03 06:25:50 +0000
+++ debian/control	2014-10-27 21:05:11 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Jeremy Bicha <[e-mail]>, Michael Biebl <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>, Martin Pitt <[e-mail]>, Michael Biebl <[e-mail]>, Sebastian Dröge <[e-mail]>
 Standards-Version: 3.9.5
 Build-Depends: cdbs,
                debhelper (>= 8),
@@ -23,7 +23,8 @@
                      pkg-config (>= 0.19.0),
                      python (>= 2.3),
                      yelp-tools,
-                     bc
+                     bc,
+                     dblatex
 Build-Conflicts-Indep: openjade,
                        openjade1.3
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gtk-doc
@@ -44,6 +45,7 @@
 Multi-Arch: foreign
 Conflicts: sgml2x (<< 1.0.0-2)
 Recommends: pkg-config (>= 0.19.0)
+Suggests: dblatex
 Description: GTK+ documentation tools
  These tools extract documentation embedded in GNOME source code, and
  produce pretty output via DocBook SGML.
 
=== modified file 'debian/control.in'
--- debian/control.in	2014-08-03 06:25:50 +0000
+++ debian/control.in	2014-10-27 21:05:11 +0000
@@ -19,7 +19,8 @@
                      pkg-config (>= 0.19.0),
                      python (>= 2.3),
                      yelp-tools,
-                     bc
+                     bc,
+                     dblatex
 Build-Conflicts-Indep: openjade,
                        openjade1.3
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gtk-doc
@@ -40,6 +41,7 @@
 Multi-Arch: foreign
 Conflicts: sgml2x (<< 1.0.0-2)
 Recommends: pkg-config (>= 0.19.0)
+Suggests: dblatex
 Description: GTK+ documentation tools
  These tools extract documentation embedded in GNOME source code, and
  produce pretty output via DocBook SGML.