diff -Nru gtk-doc-1.25/debian/changelog gtk-doc-1.25/debian/changelog --- gtk-doc-1.25/debian/changelog 2016-07-30 15:16:40.000000000 +0000 +++ gtk-doc-1.25/debian/changelog 2016-10-21 01:52:07.000000000 +0000 @@ -1,3 +1,28 @@ +gtk-doc (1.25-6) unstable; urgency=medium + + * Upload to unstable. + + -- Michael Biebl Fri, 21 Oct 2016 03:52:07 +0200 + +gtk-doc (1.25-5) experimental; urgency=medium + + * Make pkg-config a Depends and not just a Recommends. Virtually every + package which uses gtk-doc does so via the GTK_DOC_CHECK macro and this + macro requires pkg-config. (Closes: #837942) + + -- Michael Biebl Sat, 17 Sep 2016 11:03:06 +0200 + +gtk-doc (1.25-4) experimental; urgency=medium + + * Drop Depends on gnome-common. This dependency was originally added for the + GNOME_GTKDOC_CHECK macro which has been deprecated and replaced by + GTK_DOC_CHECK a long time ago. + * Convert from cdbs to dh. + * Bump Standards-Version to 3.9.8. + * Bump debhelper compat level to 10. + + -- Michael Biebl Mon, 12 Sep 2016 16:10:12 +0200 + gtk-doc (1.25-3) unstable; urgency=medium * Drop docbook-dsssl and jade from build-depends, and openjade from diff -Nru gtk-doc-1.25/debian/compat gtk-doc-1.25/debian/compat --- gtk-doc-1.25/debian/compat 2015-06-02 23:58:22.000000000 +0000 +++ gtk-doc-1.25/debian/compat 2016-09-12 14:07:57.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru gtk-doc-1.25/debian/control gtk-doc-1.25/debian/control --- gtk-doc-1.25/debian/control 2016-07-30 15:15:51.000000000 +0000 +++ gtk-doc-1.25/debian/control 2016-10-21 01:52:07.000000000 +0000 @@ -6,12 +6,10 @@ Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Dmitry Shachnev , Emilio Pozuelo Monfort , Iain Lane , Martin Pitt , Michael Biebl -Standards-Version: 3.9.7 -Build-Depends: cdbs, - debhelper (>= 9), - gnome-pkg-tools (>= 0.10), - dh-autoreconf +Uploaders: Andreas Henriksson , Dmitry Shachnev , Emilio Pozuelo Monfort , Iain Lane , Michael Biebl +Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 10), + gnome-pkg-tools (>= 0.10) Build-Depends-Indep: xsltproc (>= 1.1.15), libxml2-utils, docbook-xml (>= 4.3), @@ -32,15 +30,14 @@ Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, + pkg-config (>= 0.19.0), python (>= 2.3), docbook-xml (>= 4.3), docbook-xsl (>= 1.64.1.0), docbook-to-man, xsltproc (>= 1.1.15), - highlight (>= 3.4), - gnome-common + highlight (>= 3.4) Multi-Arch: foreign -Recommends: pkg-config (>= 0.19.0) Suggests: dblatex Description: GTK+ documentation tools These tools extract documentation embedded in GNOME source code, and diff -Nru gtk-doc-1.25/debian/control.in gtk-doc-1.25/debian/control.in --- gtk-doc-1.25/debian/control.in 2016-07-30 15:15:51.000000000 +0000 +++ gtk-doc-1.25/debian/control.in 2016-09-17 08:13:21.000000000 +0000 @@ -3,11 +3,9 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Standards-Version: 3.9.7 -Build-Depends: cdbs, - debhelper (>= 9), - gnome-pkg-tools (>= 0.10), - dh-autoreconf +Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 10), + gnome-pkg-tools (>= 0.10) Build-Depends-Indep: xsltproc (>= 1.1.15), libxml2-utils, docbook-xml (>= 4.3), @@ -28,15 +26,14 @@ Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, + pkg-config (>= 0.19.0), python (>= 2.3), docbook-xml (>= 4.3), docbook-xsl (>= 1.64.1.0), docbook-to-man, xsltproc (>= 1.1.15), - highlight (>= 3.4), - gnome-common + highlight (>= 3.4) Multi-Arch: foreign -Recommends: pkg-config (>= 0.19.0) Suggests: dblatex Description: GTK+ documentation tools These tools extract documentation embedded in GNOME source code, and diff -Nru gtk-doc-1.25/debian/gtk-doc-tools.docs gtk-doc-1.25/debian/gtk-doc-tools.docs --- gtk-doc-1.25/debian/gtk-doc-tools.docs 2005-02-18 18:00:25.000000000 +0000 +++ gtk-doc-1.25/debian/gtk-doc-tools.docs 2016-09-12 14:01:24.000000000 +0000 @@ -1,6 +1,6 @@ -README AUTHORS NEWS +README doc/authors.txt doc/gnome.txt doc/sections-file.txt diff -Nru gtk-doc-1.25/debian/rules gtk-doc-1.25/debian/rules --- gtk-doc-1.25/debian/rules 2015-06-03 00:02:19.000000000 +0000 +++ gtk-doc-1.25/debian/rules 2016-09-12 14:08:05.000000000 +0000 @@ -1,15 +1,19 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -DEB_MAKE_CHECK_TARGET := check -DEB_CONFIGURE_EXTRA_FLAGS += --with-dsssl-dir=/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh +%: + dh $@ --with gnome -binary-post-install/gtk-doc-tools:: +override_dh_auto_configure: + dh_auto_configure -- \ + --libdir=\$${prefix}/lib \ + --with-dsssl-dir=/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh + +override_dh_install: + dh_install cp tools/gtk-doc.el debian/gtk-doc-tools/usr/share/emacs/site-lisp/gtk-doc-tools cp debian/gtk-doc.catalog debian/gtk-doc-tools/usr/share/sgml/gtk-doc/ + +override_dh_gnome: + dh_gnome --no-gnome-versions