Control: tags 876709 + patch Control: tags 876709 + pending Dear maintainer,
I've prepared an NMU for libpreludedb (versioned as 3.1.0-0.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for libpreludedb-3.1.0 libpreludedb-3.1.0 changelog | 10 control | 2 patches/006-update-gtkdoc-files.patch | 478 ++++++++++++++++++++++++++++++++++ patches/series | 1 4 files changed, 490 insertions(+), 1 deletion(-) diff -Nru libpreludedb-3.1.0/debian/changelog libpreludedb-3.1.0/debian/changelog --- libpreludedb-3.1.0/debian/changelog 2017-08-15 13:00:00.000000000 +0200 +++ libpreludedb-3.1.0/debian/changelog 2017-09-24 09:00:00.000000000 +0200 @@ -1,3 +1,13 @@ +libpreludedb (3.1.0-0.2) experimental; urgency=medium + + * Non-maintainer upload. + * Update gtkdoc files to be compatible with gtkdoc-1.26 (Closes: #876709) + - Update gtk-doc.make and m4/gtk-doc.m4 + - Using https://github.com/GNOME/gtk-doc + * Add libglib2.0-dev to build-dep-indep because it is required for gtk-doc + + -- Thomas Andrejak <thomas.andre...@gmail.com> Sun, 24 Sep 2017 09:00:00 +0200 + libpreludedb (3.1.0-0.1) experimental; urgency=medium * Non-maintainer upload. diff -Nru libpreludedb-3.1.0/debian/control libpreludedb-3.1.0/debian/control --- libpreludedb-3.1.0/debian/control 2017-08-15 13:00:00.000000000 +0200 +++ libpreludedb-3.1.0/debian/control 2017-09-24 09:00:00.000000000 +0200 @@ -12,7 +12,7 @@ python3-all-dev <!nopython>, python-all-dev <!nopython>, swig <!nopython> -Build-Depends-Indep: gtk-doc-tools, +Build-Depends-Indep: gtk-doc-tools, libglib2.0-dev Standards-Version: 4.0.1 Homepage: https://www.prelude-siem.org/ Vcs-Browser: https://anonscm.debian.org/git/collab-maint/libpreludedb.git diff -Nru libpreludedb-3.1.0/debian/patches/006-update-gtkdoc-files.patch libpreludedb-3.1.0/debian/patches/006-update-gtkdoc-files.patch --- libpreludedb-3.1.0/debian/patches/006-update-gtkdoc-files.patch 1970-01-01 01:00:00.000000000 +0100 +++ libpreludedb-3.1.0/debian/patches/006-update-gtkdoc-files.patch 2017-09-24 09:00:00.000000000 +0200 @@ -0,0 +1,478 @@ +Description: Update gtkdoc files to be compatible with gtkdoc-1.26 +Author: Thomas Andrejak <thomas.andre...@gmail.com> +Last-Update: 2017-09-24 +Forwarded: https://www.prelude-siem.org/issues/908 + +--- libpreludedb-3.1.0/gtk-doc.make 2017-08-15 18:13:12.041381543 -0400 ++++ libpreludedb-3.1.0/gtk-doc.make 2017-09-24 19:29:04.127874276 -0400 +@@ -5,13 +5,13 @@ + #################################### + + if GTK_DOC_USE_LIBTOOL +-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + GTKDOC_RUN = $(LIBTOOL) --mode=execute + else +-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = sh -c ++GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++GTKDOC_RUN = + endif + + # We set GPATH here; this gives us semantics for GNU make +@@ -23,15 +23,20 @@ + + TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +-EXTRA_DIST = \ ++SETUP_FILES = \ + $(content_files) \ +- $(HTML_IMAGES) \ ++ $(expand_content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ++EXTRA_DIST = \ ++ $(HTML_IMAGES) \ ++ $(SETUP_FILES) ++ ++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 \ +@@ -45,101 +50,207 @@ + $(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 $@ + +-if ENABLE_GTK_DOC +-all-local: html-build.stamp ++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test ++ ++if GTK_DOC_BUILD_HTML ++HTML_BUILD_STAMP=html-build.stamp + else +-all-local: ++HTML_BUILD_STAMP= ++endif ++if GTK_DOC_BUILD_PDF ++PDF_BUILD_STAMP=pdf-build.stamp ++else ++PDF_BUILD_STAMP= ++endif ++ ++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 ++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + + $(REPORT_FILES): sgml-build.stamp + ++#### setup #### ++ ++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) $(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 #### + +-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +- @echo 'gtk-doc: Scanning header files' +- @-chmod -R u+w $(srcdir) +- cd $(srcdir) && \ +- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ++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_@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: 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" ; \ ++ 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; \ ++ 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 \ +- cd $(srcdir) ; \ +- 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 +- touch scan-build.stamp ++ $(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 #### ++#### xml #### + +-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +- @echo 'gtk-doc: Rebuilding template files' +- @-chmod -R u+w $(srcdir) +- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- touch tmpl-build.stamp ++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: 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" ; \ ++ 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 + +-tmpl.stamp: tmpl-build.stamp ++sgml.stamp: sgml-build.stamp + @true + +-tmpl/*.sgml: ++$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + +- +-#### xml #### +- +-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) +- @echo 'gtk-doc: Building XML' +- @-chmod -R u+w $(srcdir) +- cd $(srcdir) && \ +- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- touch sgml-build.stamp +- +-sgml.stamp: 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 #### + +-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +- @echo 'gtk-doc: Building HTML' +- @-chmod -R u+w $(srcdir) +- rm -rf $(srcdir)/html +- mkdir $(srcdir)/html ++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_@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) $(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 "x$(V)" = "x1"; then \ ++ mkhtml_options="$$mkhtml_options --verbose"; \ ++ fi; \ ++ fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +- if test "$(?)" = "0"; then \ +- mkhtml_options=--path="$(srcdir)"; \ +- fi +- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) +- @echo 'gtk-doc: Fixing cross-references' +- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- touch html-build.stamp ++ 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 \ ++ test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ ++ test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$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_@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) $(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 "x$(V)" = "x1"; then \ ++ mkpdf_options="$$mkpdf_options --verbose"; \ ++ fi; \ ++ fi; \ ++ if test "x$(HTML_IMAGES)" != "x"; then \ ++ for img in $(HTML_IMAGES); do \ ++ part=`dirname $$img`; \ ++ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ ++ if test $$? != 0; then \ ++ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ ++ fi; \ ++ done; \ ++ fi; \ ++ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) ++ $(AM_V_at)touch pdf-build.stamp + + ############## + + clean-local: +- rm -f *~ *.bak +- rm -rf .libs ++ @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: +- cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) \ +- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt ++ @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) $(DOC_MODULE).types; \ ++ fi + +-maintainer-clean-local: clean +- cd $(srcdir) && rm -rf xml html ++maintainer-clean-local: ++ @rm -rf xml html + + install-data-local: +- installfiles=`echo $(srcdir)/html/*`; \ +- if test "$$installfiles" = '$(srcdir)/html/*'; \ +- then echo '-- Nothing to install' ; \ ++ @installfiles=`echo $(builddir)/html/*`; \ ++ if test "$$installfiles" = '$(builddir)/html/*'; \ ++ then echo 1>&2 'Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +@@ -148,21 +259,18 @@ + fi; \ + $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ +- echo '-- Installing '$$i ; \ ++ echo ' $(INSTALL_DATA) '$$i ; \ + $(INSTALL_DATA) $$i $${installdir}; \ + done; \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ ++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + + uninstall-local: +- if test -n "$(DOC_MODULE_VERSION)"; then \ ++ @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -172,25 +280,23 @@ + # + # Require gtk-doc when making dist + # +-if ENABLE_GTK_DOC +-dist-check-gtkdoc: ++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 +- mkdir $(distdir)/xml +- mkdir $(distdir)/html +- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl +- -cp $(srcdir)/xml/*.xml $(distdir)/xml +- cp $(srcdir)/html/* $(distdir)/html +- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ +- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ +- cd $(distdir) && rm -f $(DISTCLEANFILES) +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local ++ @mkdir $(distdir)/html ++ @cp ./html/* $(distdir)/html ++ @-cp ./$(DOC_MODULE).pdf $(distdir)/ ++ @-cp ./$(DOC_MODULE).types $(distdir)/ ++ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ ++ @cd $(distdir) && rm -f $(DISTCLEANFILES) ++ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs +--- libpreludedb-3.1.0/m4/gtk-doc.m4 2017-08-15 18:13:12.057381177 -0400 ++++ libpreludedb-3.1.0/m4/gtk-doc.m4 2017-09-24 19:29:30.983276684 -0400 +@@ -1,13 +1,36 @@ + dnl -*- mode: autoconf -*- + +-# serial 1 ++# serial 2 + + dnl Usage: + dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) + AC_DEFUN([GTK_DOC_CHECK], + [ ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ ++ ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) ++ AC_MSG_CHECKING([for gtk-doc]) ++ PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) ++ AC_MSG_RESULT($have_gtk_doc) ++ ++ if test "$have_gtk_doc" = "no"; then ++ AC_MSG_WARN([ ++ You will not be able to create source packages with 'make dist' ++ because $gtk_doc_requires is not found.]) ++ fi ++ ++ dnl check for tools we added during development ++ dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that ++ dnl may not be writable by the user. Currently, automake requires that the ++ dnl test name must end in '.test'. ++ dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 ++ AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) ++ AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) ++ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) ++ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) ++ + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, +@@ -21,19 +44,45 @@ + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + +- if test x$enable_gtk_doc = xyes; then +- ifelse([$1],[], +- [PKG_CHECK_EXISTS([gtk-doc],, +- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], +- [PKG_CHECK_EXISTS([gtk-doc >= $1],, +- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) +- fi +- + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + +- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) ++ if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then ++ AC_MSG_ERROR([ ++ You must have $gtk_doc_requires installed to build documentation for ++ $PACKAGE_NAME. Please install gtk-doc or disable building the ++ documentation by adding '--disable-gtk-doc' to '[$]0'.]) ++ fi ++ ++ dnl don't check for glib if we build glib ++ if test "x$PACKAGE_NAME" != "xglib"; then ++ dnl don't fail if someone does not have glib ++ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) ++ fi ++ ++ dnl enable/disable output formats ++ AC_ARG_ENABLE([gtk-doc-html], ++ AS_HELP_STRING([--enable-gtk-doc-html], ++ [build documentation in html format [[default=yes]]]),, ++ [enable_gtk_doc_html=yes]) ++ AC_ARG_ENABLE([gtk-doc-pdf], ++ AS_HELP_STRING([--enable-gtk-doc-pdf], ++ [build documentation in pdf format [[default=no]]]),, ++ [enable_gtk_doc_pdf=no]) ++ ++ if test -z "$GTKDOC_MKPDF"; then ++ enable_gtk_doc_pdf=no ++ fi ++ ++ if test -z "$AM_DEFAULT_VERBOSITY"; then ++ AM_DEFAULT_VERBOSITY=1 ++ fi ++ AC_SUBST([AM_DEFAULT_VERBOSITY]) + ++ AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) ++ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) + ]) diff -Nru libpreludedb-3.1.0/debian/patches/series libpreludedb-3.1.0/debian/patches/series --- libpreludedb-3.1.0/debian/patches/series 2017-08-15 13:00:00.000000000 +0200 +++ libpreludedb-3.1.0/debian/patches/series 2017-09-24 09:00:00.000000000 +0200 @@ -3,3 +3,4 @@ 003-Add-pkg-config-file.patch 004-Add_support_for_python_3.5_and_3.6.patch 005-Clarify_License.patch +006-update-gtkdoc-files.patch
signature.asc
Description: PGP signature
