r46200 - /desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Tue Sep 29 09:14:52 2015
New Revision: 46200

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46200
Log:
Fix up gtkdocentities.diff once again

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

Modified: 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=46200&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff	[utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff	[utf-8] Tue Sep 29 09:14:52 2015
@@ -10,7 +10,7 @@
  Also cherry-pick the needed part of commit 3f34493430d0c9a3.
 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-28
+Last-Update: 2015-09-29
 
 --- a/gtk-doc.make
 +++ b/gtk-doc.make
@@ -80,16 +80,25 @@
              $doctype_header .= $_;
          }
          close(INPUT);
-@@ -2686,6 +2687,8 @@
+@@ -188,6 +189,8 @@
+ "               \"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd\"\n" .
+ "[\n" .
+ "  <!ENTITY % local.common.attrib \"xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'\">\n" .
++"  <!ENTITY % gtkdocentities SYSTEM \"../xml/gtkdocentities.ent\">\n" .
++"  %gtkdocentities;\n" .
+ "]>\n";
+     }
+ } else {
+@@ -2686,6 +2689,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">
++  <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
 +  %gtkdocentities;
  ]>
  <book id="index">
  EOF
-@@ -2700,11 +2703,11 @@
+@@ -2700,11 +2705,11 @@
  
  print OUTPUT <<EOF;
    <bookinfo>