...
 
Commits (5)
Source: libu2f-host
Maintainer: Debian Authentication Maintainers <pkg-auth-maintainers@lists.alioth.debian.org>
Uploaders: Simon Josefsson <simon@josefsson.org>,
Klas Lindfors <klas@yubico.com>,
Dain Nilsson <dain@yubico.com>,
Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Maintainer: Debian Authentication Maintainers <team+auth@tracker.debian.org>
Uploaders:
Simon Josefsson <simon@josefsson.org>,
Klas Lindfors <klas@yubico.com>,
Dain Nilsson <dain@yubico.com>,
Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Section: utils
Priority: optional
Build-Depends: debhelper (>= 11),
......
......@@ -3,16 +3,16 @@ Upstream-Name: libu2f-host
Source: https://developers.yubico.com/libu2f-host/
Files: *
Copyright: Copyright (c) 2013-2015 Yubico AB
Copyright: Copyright (c) 2013-2018 Yubico AB
License: LGPL-2.1+
Files: configure.ac GNUmakefile maint.mk build-aux/* tests/*
Copyright: Copyright (c) 2013-2015 Yubico AB
Copyright: Copyright (c) 2013-2018 Yubico AB
License: GPL-3+
Files: debian/*
Copyright: Copyright (c) 2013-2015 Yubico AB
Copyright (c) 2016-2017 Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Copyright (c) 2016-2018 Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
License: GPL-3+
......
Subject: gtk-doc: gtkdoc-mktmpl is dead
---
gtk-doc/Makefile.am | 4 ----
gtk-doc/Makefile.in | 29 +++--------------------------
gtk-doc/gtk-doc.make | 25 +++----------------------
3 files changed, 6 insertions(+), 52 deletions(-)
diff --git a/gtk-doc/Makefile.am b/gtk-doc/Makefile.am
index 905fa63..667d179 100644
Origin: vendor
Bug: 876579
Forwarded: No
From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Reviewed-by: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Last-Update: 2017-10-30
Applied-Upstream: No
--- a/gtk-doc/Makefile.am
+++ b/gtk-doc/Makefile.am
@@ -35,10 +35,6 @@ SCAN_OPTIONS=
# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
MKDB_OPTIONS=--xml-mode --output-format=xml
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
# Extra options to supply to gtkdoc-mkhtml
MKHTML_OPTIONS=
diff --git a/gtk-doc/Makefile.in b/gtk-doc/Makefile.in
index 8a8b2f5..93b398f 100644
--- a/gtk-doc/Makefile.in
+++ b/gtk-doc/Makefile.in
@@ -447,10 +447,6 @@ SCAN_OPTIONS =
# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
MKDB_OPTIONS = --xml-mode --output-format=xml
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS =
-
# Extra options to supply to gtkdoc-mkhtml
MKHTML_OPTIONS =
@@ -518,9 +514,8 @@ SETUP_FILES = \
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES)
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
- html-build.stamp pdf-build.stamp \
- tmpl.stamp sgml.stamp html.stamp pdf.stamp
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
+ html-build.stamp pdf-build.stamp sgml.stamp html.stamp pdf.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
@@ -806,27 +801,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
-#### templates ####
-
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo ' DOC Rebuilding template files'
- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- if test -w $(abs_srcdir) ; then \
- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
- fi \
- fi
- @touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
- @true
-
-$(srcdir)/tmpl/*.sgml:
- @true
-
#### xml ####
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo ' DOC Building XML'
@-chmod -R u+w $(srcdir)
@_source_dir='' ; \
diff --git a/gtk-doc/gtk-doc.make b/gtk-doc/gtk-doc.make
index 1f75dfd..33260b6 100644
--- a/gtk-doc/gtk-doc.make
+++ b/gtk-doc/gtk-doc.make
@@ -33,9 +33,8 @@ EXTRA_DIST = \
$(HTML_IMAGES) \
$(SETUP_FILES)
-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
- html-build.stamp pdf-build.stamp \
- tmpl.stamp sgml.stamp html.stamp pdf.stamp
+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
+ html-build.stamp pdf-build.stamp sgml.stamp html.stamp pdf.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
@@ -120,27 +119,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
-#### templates ####
-
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo ' DOC Rebuilding template files'
- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- if test -w $(abs_srcdir) ; then \
- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
- fi \
- fi
- @touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
- @true
-
-$(srcdir)/tmpl/*.sgml:
- @true
-
#### xml ####
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo ' DOC Building XML'
@-chmod -R u+w $(srcdir)
@_source_dir='' ; \
0001-gtk-doc-gtkdoc-mktmpl-is-dead.patch
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@
......@@ -10,8 +10,9 @@ override_dh_auto_configure:
--disable-silent-rules \
--with-udevrulesdir=/lib/udev/rules.d \
--enable-gtk-doc \
--enable-gtk-doc-pdf \
--enable-gtk-doc-html
--enable-gtk-doc-pdf \
--enable-gtk-doc-html \
--with-pic
override_dh_auto_clean:
test -f Makefile && dh_auto_clean || true
......