Control: tags 876592 + patch
Control: tags 876592 + pending
Dear maintainer,
I've prepared an NMU for gconf (versioned as 3.2.6-4.1) and uploaded
it to DELAYED/5. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru gconf-3.2.6/debian/changelog gconf-3.2.6/debian/changelog
--- gconf-3.2.6/debian/changelog 2016-10-11 18:42:18.000000000 +0300
+++ gconf-3.2.6/debian/changelog 2018-01-28 06:17:32.000000000 +0200
@@ -1,3 +1,11 @@
+gconf (3.2.6-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update gtk-doc.make from gtk-doc-tools 1.27-1,
+ fixing a FTBFS with gtk-doc-tools >= 1.26. (Closes: #876592)
+
+ -- Adrian Bunk <b...@debian.org> Sun, 28 Jan 2018 06:17:32 +0200
+
gconf (3.2.6-4) unstable; urgency=medium
[ Raphael Geissert ]
diff -Nru gconf-3.2.6/debian/control gconf-3.2.6/debian/control
--- gconf-3.2.6/debian/control 2016-10-11 18:42:18.000000000 +0300
+++ gconf-3.2.6/debian/control 2018-01-28 06:17:32.000000000 +0200
@@ -6,7 +6,7 @@
Section: libs
Priority: optional
Maintainer: Josselin Mouette <j...@debian.org>
-Uploaders: Andreas Henriksson <andr...@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>, Jordi Mallach <jo...@debian.org>, Laurent Bigonville <bi...@debian.org>, Michael Biebl <bi...@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>, Jordi Mallach <jo...@debian.org>, Laurent Bigonville <bi...@debian.org>, Michael Biebl <bi...@debian.org>
Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.93),
dh-autoreconf,
diff -Nru gconf-3.2.6/debian/patches/26_gtk-doc.patch gconf-3.2.6/debian/patches/26_gtk-doc.patch
--- gconf-3.2.6/debian/patches/26_gtk-doc.patch 1970-01-01 02:00:00.000000000 +0200
+++ gconf-3.2.6/debian/patches/26_gtk-doc.patch 2018-01-28 06:17:20.000000000 +0200
@@ -0,0 +1,334 @@
+Description: Update gtk-doc.make from gtk-doc-tools 1.27-1
+ This fixes a FTBFS with gtk-doc-tools >= 1.26.
+Author: Adrian Bunk <b...@debian.org>
+Bug-Debian: https://bugs.debian.org/876592
+
+--- gconf-3.2.6.orig/gtk-doc.make
++++ gconf-3.2.6/gtk-doc.make
+@@ -1,4 +1,22 @@
+ # -*- mode: makefile -*-
++#
++# gtk-doc.make - make rules for gtk-doc
++# Copyright (C) 2003 James Henstridge
++# 2004-2007 Damon Chaplin
++# 2007-2017 Stefan Sauer
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ ####################################
+ # Everything below here is generic #
+@@ -25,6 +43,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+ SETUP_FILES = \
+ $(content_files) \
++ $(expand_content_files) \
+ $(DOC_MAIN_SGML_FILE) \
+ $(DOC_MODULE)-sections.txt \
+ $(DOC_MODULE)-overrides.txt
+@@ -33,9 +52,9 @@ EXTRA_DIST = \
+ $(HTML_IMAGES) \
+ $(SETUP_FILES)
+
+-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
++DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
+ html-build.stamp pdf-build.stamp \
+- tmpl.stamp sgml.stamp html.stamp pdf.stamp
++ sgml.stamp html.stamp pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -49,9 +68,13 @@ REPORT_FILES = \
+ $(DOC_MODULE)-undeclared.txt \
+ $(DOC_MODULE)-unused.txt
+
+-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++gtkdoc-check.test: Makefile
++ $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
++ echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
++ chmod +x $@
++
++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
+
+-if ENABLE_GTK_DOC
+ if GTK_DOC_BUILD_HTML
+ HTML_BUILD_STAMP=html-build.stamp
+ else
+@@ -63,9 +86,11 @@ else
+ PDF_BUILD_STAMP=
+ endif
+
+-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+-else
+-all-local:
++all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
++.PHONY: all-gtk-doc
++
++if ENABLE_GTK_DOC
++all-local: all-gtk-doc
+ endif
+
+ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+@@ -74,92 +99,70 @@ $(REPORT_FILES): sgml-build.stamp
+
+ #### setup ####
+
+-GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+-GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
++GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_@AM_V@)
++GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_@AM_DEFAULT_V@)
+ GTK_DOC_V_SETUP_0=@echo " DOC Preparing build";
+
+ setup-build.stamp:
+ -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+- files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+- if test "x$$files" != "x" ; then \
+- for file in $$files ; do \
+- test -f $(abs_srcdir)/$$file && \
+- cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+- done; \
+- fi; \
+- test -d $(abs_srcdir)/tmpl && \
+- { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+- chmod -R u+w $(abs_builddir)/tmpl; } \
++ files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
++ if test "x$$files" != "x" ; then \
++ for file in $$files ; do \
++ destdir=`dirname $(abs_builddir)/$$file`; \
++ test -d "$$destdir" || mkdir -p "$$destdir"; \
++ test -f $(abs_srcdir)/$$file && \
++ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
++ done; \
++ fi; \
+ fi
+ $(AM_V_at)touch setup-build.stamp
+
+ #### scan ####
+
+-GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+-GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
++GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_@AM_V@)
++GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_@AM_DEFAULT_V@)
+ GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files";
+
+-GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+-GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
++GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_@AM_V@)
++GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@)
+ GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects";
+
+-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
++scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+ $(GTK_DOC_V_SCAN)_source_dir='' ; \
+ for i in $(DOC_SOURCE_DIR) ; do \
+- _source_dir="$${_source_dir} --source-dir=$$i" ; \
++ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ done ; \
+ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+- scanobj_options=""; \
+- gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+- if test "$(?)" = "0"; then \
+- if test "x$(V)" = "x1"; then \
+- scanobj_options="--verbose"; \
+- fi; \
++ scanobj_options=""; \
++ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
++ if test "$$?" = "0"; then \
++ if test "x$(V)" = "x1"; then \
++ scanobj_options="--verbose"; \
+ fi; \
+- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+- gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
++ fi; \
++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
++ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+ else \
+- for i in $(SCANOBJ_FILES) ; do \
+- test -f $$i || touch $$i ; \
+- done \
++ for i in $(SCANOBJ_FILES) ; do \
++ test -f $$i || touch $$i ; \
++ done \
+ fi
+ $(AM_V_at)touch scan-build.stamp
+
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
+
+-#### templates ####
+-
+-GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V))
+-GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+-GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files";
+-
+-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+- $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+- $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+- if test -w $(abs_srcdir) ; then \
+- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+- fi \
+- fi
+- $(AM_V_at)touch tmpl-build.stamp
+-
+-tmpl.stamp: tmpl-build.stamp
+- @true
+-
+-$(srcdir)/tmpl/*.sgml:
+- @true
+-
+ #### xml ####
+
+-GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+-GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
++GTK_DOC_V_XML=$(GTK_DOC_V_XML_@AM_V@)
++GTK_DOC_V_XML_=$(GTK_DOC_V_XML_@AM_DEFAULT_V@)
+ GTK_DOC_V_XML_0=@echo " DOC Building XML";
+
+-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+- $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \
++sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
++ $(GTK_DOC_V_XML)_source_dir='' ; \
+ for i in $(DOC_SOURCE_DIR) ; do \
+- _source_dir="$${_source_dir} --source-dir=$$i" ; \
++ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ done ; \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+ $(AM_V_at)touch sgml-build.stamp
+@@ -167,53 +170,64 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODUL
+ sgml.stamp: sgml-build.stamp
+ @true
+
++$(DOC_MAIN_SGML_FILE): sgml-build.stamp
++ @true
++
++xml/gtkdocentities.ent: Makefile
++ $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
++ echo "<!ENTITY package \"$(PACKAGE)\">"; \
++ echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
++ echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
++ echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
++ echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
++ echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
++ echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
++ ) > $@
++
+ #### html ####
+
+-GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+-GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
++GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_@AM_V@)
++GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_@AM_DEFAULT_V@)
+ GTK_DOC_V_HTML_0=@echo " DOC Building HTML";
+
+-GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+-GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
++GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_@AM_V@)
++GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_@AM_DEFAULT_V@)
+ GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references";
+
+-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+ $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+ mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+- if test "$(?)" = "0"; then \
++ if test "$$?" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ mkhtml_options="$$mkhtml_options --verbose"; \
+ fi; \
+ fi; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+- if test "$(?)" = "0"; then \
++ if test "$$?" = "0"; then \
+ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
+ fi; \
+ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ -@test "x$(HTML_IMAGES)" = "x" || \
+ for file in $(HTML_IMAGES) ; do \
+- if test -f $(abs_srcdir)/$$file ; then \
+- cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+- fi; \
+- if test -f $(abs_builddir)/$$file ; then \
+- cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+- fi; \
++ test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
++ test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
++ test -f $$file && cp $$file $(abs_builddir)/html; \
+ done;
+ $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ $(AM_V_at)touch html-build.stamp
+
+ #### pdf ####
+
+-GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+-GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
++GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_@AM_V@)
++GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_@AM_DEFAULT_V@)
+ GTK_DOC_V_PDF_0=@echo " DOC Building PDF";
+
+-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+ $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+ mkpdf_options=""; \
+ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+- if test "$(?)" = "0"; then \
++ if test "$$?" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ mkpdf_options="$$mkpdf_options --verbose"; \
+ fi; \
+@@ -235,13 +249,18 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_S
+ clean-local:
+ @rm -f *~ *.bak
+ @rm -rf .libs
++ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
++ rm -f $(DOC_MODULE).types; \
++ fi
++ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
++ rm -f $(DOC_MODULE)-sections.txt; \
++ fi
+
+ distclean-local:
+ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+- rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+- rm -rf tmpl; \
++ rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
+ fi
+
+ maintainer-clean-local:
+@@ -280,18 +299,18 @@ uninstall-local:
+ #
+ # Require gtk-doc when making dist
+ #
+-if ENABLE_GTK_DOC
++if HAVE_GTK_DOC
+ dist-check-gtkdoc: docs
+ else
+ dist-check-gtkdoc:
+- @echo "*** gtk-doc must be installed and enabled in order to make dist"
++ @echo "*** gtk-doc is needed to run 'make dist'. ***"
++ @echo "*** gtk-doc was not found when 'configure' ran. ***"
++ @echo "*** please install gtk-doc and rerun 'configure'. ***"
+ @false
+ endif
+
+-dist-hook: dist-check-gtkdoc dist-hook-local
+- @mkdir $(distdir)/tmpl
++dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
+ @mkdir $(distdir)/html
+- @-cp ./tmpl/*.sgml $(distdir)/tmpl
+ @cp ./html/* $(distdir)/html
+ @-cp ./$(DOC_MODULE).pdf $(distdir)/
+ @-cp ./$(DOC_MODULE).types $(distdir)/
diff -Nru gconf-3.2.6/debian/patches/series gconf-3.2.6/debian/patches/series
--- gconf-3.2.6/debian/patches/series 2016-10-11 17:56:10.000000000 +0300
+++ gconf-3.2.6/debian/patches/series 2018-01-28 06:16:07.000000000 +0200
@@ -2,3 +2,4 @@
02_fix_wrong_return_value.patch
05_readd_gconf_engine_key_is_writable.patch
25_gconf-path-max-hurd.patch
+26_gtk-doc.patch
