r46136 - in /desktop/unstable/gtk-doc/debian: changelog patches/gtkdocentities.diff patches/series

mitya57 at users.alioth.debian.org mitya57 at users.alioth.debian.org
Sat Sep 26 18:48:12 UTC 2015 

Author: mitya57
Date: Sat Sep 26 18:48:12 2015
New Revision: 46136

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46136
Log:
Backport upstream patch to generate an entities file on build containing
PACKAGE variables, needed for new gnome-panel (gtkdocentities.diff).

Added:
    desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff
Modified:
    desktop/unstable/gtk-doc/debian/changelog
    desktop/unstable/gtk-doc/debian/patches/series

Modified: desktop/unstable/gtk-doc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/changelog?rev=46136&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/changelog	[utf-8] Sat Sep 26 18:48:12 2015
@@ -1,3 +1,10 @@
+gtk-doc (1.24-2) UNRELEASED; urgency=medium
+
+  * Backport upstream patch to generate an entities file on build containing
+    PACKAGE variables, needed for new gnome-panel (gtkdocentities.diff).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 26 Sep 2015 21:46:09 +0300
+
 gtk-doc (1.24-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff?rev=46136&op=file
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff	(added)
+++ desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff	[utf-8] Sat Sep 26 18:48:12 2015
@@ -0,0 +1,125 @@
+Description: generate an entities file on build containing PACKAGE variables
+ Users frequently want to substitute PACKAGE_VERSION into the build
+ documentation, but end up having to do entity substitutions and automake
+ integration for it themselves, which is tricky to get right.
+ .
+ Generate an entity file automatically on build, containing all the
+ PACKAGE_* variables. Use it in the default generated main XML file, so
+ that new modules using gtk-doc don’t have to worry about this any more.
+Origin: upstream, https://git.gnome.org/browse/gtk-doc/commit/?id=98b88db275738b72
+Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=743182
+Last-Update: 2015-09-26
+
+--- a/gtk-doc.make
++++ b/gtk-doc.make
+@@ -165,7 +165,7 @@
+ GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+ GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
+ 
+-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) xml/gtkdocentities.ent
+ 	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+ 	for i in $(DOC_SOURCE_DIR) ; do \
+ 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+@@ -176,6 +176,17 @@
+ 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 ####
+ 
+ GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+--- a/gtk-doc.notmpl.make
++++ b/gtk-doc.notmpl.make
+@@ -142,7 +142,7 @@
+ GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+ GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
+ 
+-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
++sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(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" ; \
+@@ -153,6 +153,17 @@
+ 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 ####
+ 
+ GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+--- a/gtkdoc-mkdb.in
++++ b/gtkdoc-mkdb.in
+@@ -2686,6 +2686,8 @@
+                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+ [
+   <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
++  <!ENTITY % gtkdocentities SYSTEM "../xml/gtkdocentities.ent">
++  %gtkdocentities;
+ ]>
+ <book id="index">
+ EOF
+@@ -2700,11 +2702,11 @@
+ 
+ print OUTPUT <<EOF;
+   <bookinfo>
+-    <title>$MODULE Reference Manual</title>
++    <title>&package_name; Reference Manual</title>
+     <releaseinfo>
+-      for $MODULE [VERSION].
++      for &package_string;.
+       The latest version of this documentation can be found on-line at
+-      <ulink role="online-location" url="http://[SERVER]/$MODULE/index.html">http://[SERVER]/$MODULE/</ulink>.
++      <ulink role="online-location" url="http://[SERVER]/&package_name;/index.html">http://[SERVER]/&package_name;/</ulink>.
+     </releaseinfo>
+   </bookinfo>
+ 
+--- a/tests/gtk-doc.notmpl.make
++++ b/tests/gtk-doc.notmpl.make
+@@ -127,7 +127,7 @@
+ 
+ #### xml ####
+ 
+-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
++sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
+ 	@ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ 	echo "  DOC   `$(DATE_FMT_CMD)$$tsd`: Building XML"
+ 	@_source_dir='' ; \
+@@ -142,6 +142,17 @@
+ 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)

Modified: desktop/unstable/gtk-doc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/series?rev=46136&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/patches/series	[utf-8] Sat Sep 26 18:48:12 2015
@@ -0,0 +1 @@
+gtkdocentities.diff

More information about the pkg-gnome-commits mailing list