r14768 - in /desktop/experimental/glibmm2.4/debian: changelog patches/10_devhelp_external_link_fix.patch rules

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Tue Feb 26 03:05:29 UTC 2008 

Author: manphiz-guest
Date: Tue Feb 26 03:05:29 2008
New Revision: 14768

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14768
Log:
* Use common-install-impl rule instead of common-install-prehook-arch,
  the latter might be triggered before `make install` was called.
  Should fix FTBFS on buildds.
* Update 10_devhelp_external_link_fix.patch to use upstream fix
  BGO#518673 by Jonathon Jongsma, with manually modified
  docs/reference/Makefile.in as automake is not triggered.

Modified:
    desktop/experimental/glibmm2.4/debian/changelog
    desktop/experimental/glibmm2.4/debian/patches/10_devhelp_external_link_fix.patch
    desktop/experimental/glibmm2.4/debian/rules

Modified: desktop/experimental/glibmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/changelog?rev=14768&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/changelog (original)
+++ desktop/experimental/glibmm2.4/debian/changelog Tue Feb 26 03:05:29 2008
@@ -1,3 +1,14 @@
+glibmm2.4 (2.15.6-2) experimental; urgency=low
+
+  * Use common-install-impl rule instead of common-install-prehook-arch,
+    the latter might be triggered before `make install` was called.
+    Should fix FTBFS on buildds.
+  * Update 10_devhelp_external_link_fix.patch to use upstream fix
+    BGO#518673 by Jonathon Jongsma, with manually modified
+    docs/reference/Makefile.in as automake is not triggered.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Tue, 26 Feb 2008 10:46:35 +0800
+
 glibmm2.4 (2.15.6-1) experimental; urgency=low
 
   * New upstream development release.

Modified: desktop/experimental/glibmm2.4/debian/patches/10_devhelp_external_link_fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/patches/10_devhelp_external_link_fix.patch?rev=14768&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/patches/10_devhelp_external_link_fix.patch (original)
+++ desktop/experimental/glibmm2.4/debian/patches/10_devhelp_external_link_fix.patch Tue Feb 26 03:05:29 2008
@@ -1,10 +1,71 @@
-diff -urN glibmm-2.15.6.orig/docs/reference/glibmm-2.4.devhelp glibmm-2.15.6/docs/reference/glibmm-2.4.devhelp
---- glibmm-2.15.6.orig/docs/reference/glibmm-2.4.devhelp	2008-02-20 01:30:14.000000000 +0800
-+++ glibmm-2.15.6/docs/reference/glibmm-2.4.devhelp	2008-02-26 01:58:11.000000000 +0800
-@@ -1,5 +1,5 @@
- <?xml version="1.0"?>
--<book xmlns:fo="http://www.w3.org/1999/XSL/Format" title="glibmm 2.4 Reference Manual" name="glibmm 2.4" link="../../../doc/glibmm-2.4/docs/reference/html//index.html">
-+<book xmlns:fo="http://www.w3.org/1999/XSL/Format" title="glibmm 2.4 Reference Manual" name="glibmm 2.4" link="../../../doc/glibmm-2.4/docs/reference/html/index.html">
+Index: docs/reference/Makefile.am
+===================================================================
+--- docs/reference/Makefile.am	(revision 619)
++++ docs/reference/Makefile.am	(working copy)
+@@ -30,7 +30,7 @@
+ $(devhelp_file): $(XML_INDEX) $(devhelp_stylesheet)
+ 	xsltproc --stringparam book_title "glibmm 2.4 Reference Manual" \
+ 		--stringparam book_name "glibmm 2.4" \
+-		--stringparam reference_prefix "../../../doc/glibmm-2.4/docs/reference/html/" \
++		--stringparam reference_prefix "../../../doc/glibmm-2.4/docs/reference/html" \
+ 		-o $@ $(devhelp_stylesheet) $(XML_INDEX)
+ 
+ $(HTML_INDEX) $(XML_INDEX): $(doxygen_configfile_source) $(beautify_docs_source) $(top_srcdir)/glib/glibmm/*.h
+Index: docs/reference/doxygen_to_devhelp.xsl
+===================================================================
+--- docs/reference/doxygen_to_devhelp.xsl	(revision 619)
++++ docs/reference/doxygen_to_devhelp.xsl	(working copy)
+@@ -16,12 +16,12 @@
+         name="{$book_name}"
+         link="{$reference_prefix}/index.html">
    <chapters>
-     <sub name="Classes" link="../../../doc/glibmm-2.4/docs/reference/html/classes.html">
-       <sub name="GTimeVal" link="../../../doc/glibmm-2.4/docs/reference/html/classGTimeVal.html"/>
+-    <sub name="Classes" link="{$reference_prefix}classes.html">
++      <sub name="Classes" link="{$reference_prefix}/classes.html">
+       <xsl:apply-templates select="doxygenindex/compound[@kind='class']">
+         <xsl:sort select="."/>
+       </xsl:apply-templates>
+     </sub>
+-    <sub name="Namespaces" link="{$reference_prefix}namespaces.html">
++    <sub name="Namespaces" link="{$reference_prefix}/namespaces.html">
+       <xsl:apply-templates select="doxygenindex/compound[@kind='namespace']">
+         <xsl:sort select="."/>
+       </xsl:apply-templates>
+@@ -38,7 +38,7 @@
+ <xsl:template match="compound">
+   <xsl:param name="name"><xsl:value-of select="name"/></xsl:param>
+   <xsl:param name="link"><xsl:value-of select="@refid"/>.html</xsl:param>
+-  <sub name="{$name}" link="{$reference_prefix}{$link}">
++  <sub name="{$name}" link="{$reference_prefix}/{$link}">
+   <xsl:apply-templates select="member" mode="as-sub">
+     <xsl:sort select="."/>
+   </xsl:apply-templates>
+@@ -55,7 +55,7 @@
+   <xsl:variable name="link">
+     <xsl:call-template name="get-member-link" />
+   </xsl:variable>
+-  <function name="{$fqn}" link="{$reference_prefix}{$link}"/>
++  <function name="{$fqn}" link="{$reference_prefix}/{$link}"/>
+ </xsl:template>
+ 
+ <xsl:template match="member" mode="as-sub">
+@@ -65,7 +65,7 @@
+   <xsl:variable name="link">
+     <xsl:call-template name="get-member-link" />
+   </xsl:variable>
+-  <sub name="{$fqn}" link="{$reference_prefix}{$link}"/>
++  <sub name="{$fqn}" link="{$reference_prefix}/{$link}"/>
+ </xsl:template>
+ 
+ 
+diff -urN glibmm-2.15.6.orig/docs/reference/Makefile.in glibmm-2.15.6/docs/reference/Makefile.in
+--- docs/reference/Makefile.in	2008-02-25 04:37:43.000000000 +0800
++++ docs/reference/Makefile.in	2008-02-26 10:25:46.000000000 +0800
+@@ -448,7 +448,7 @@
+ $(devhelp_file): $(XML_INDEX) $(devhelp_stylesheet)
+ 	xsltproc --stringparam book_title "glibmm 2.4 Reference Manual" \
+ 		--stringparam book_name "glibmm 2.4" \
+-		--stringparam reference_prefix "../../../doc/glibmm-2.4/docs/reference/html/" \
++		--stringparam reference_prefix "../../../doc/glibmm-2.4/docs/reference/html" \
+ 		-o $@ $(devhelp_stylesheet) $(XML_INDEX)
+ 
+ $(HTML_INDEX) $(XML_INDEX): $(doxygen_configfile_source) $(beautify_docs_source) $(top_srcdir)/glib/glibmm/*.h

Modified: desktop/experimental/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/rules?rev=14768&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/rules (original)
+++ desktop/experimental/glibmm2.4/debian/rules Tue Feb 26 03:05:29 2008
@@ -22,5 +22,5 @@
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
 DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o
 
-common-install-prehook-arch::
+common-install-impl::
 	chrpath -d $(DEB_DH_INSTALL_SOURCEDIR)/usr/lib/*.so*

More information about the pkg-gnome-commits mailing list