Do not fetch DTD from WWW, use local one instead

5 files changed, 118 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index ccbc80f..1461deb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scons-doc (1.2.0.d20090905-3) UNRELEASED; urgency=low
+
+  * debian/patches/no_remote_dtd.patch:
+    - Do not fetch DTD from WWW, use local one instead (Closes: #549824).
+
+ -- Luca Falavigna <dktrkranz@debian.org>  Mon, 05 Oct 2009 23:10:52 +0200
+
 scons-doc (1.2.0.d20090905-2) unstable; urgency=low
 
   * Do not install scons-reference, it is completely empty and useless.
diff --git a/debian/control b/debian/control
index 36a7299..d12e9b8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: doc
 Priority: optional
 Maintainer: Luca Falavigna <dktrkranz@debian.org>
 Uploaders: Mark Brown <broonie@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), scons (>= 1.2.0.d20090905)
+Build-Depends: debhelper (>= 7.0.50~), scons (>= 1.2.0.d20090905), quilt (>= 0.46-7)
 Build-Depends-Indep: docbook-utils, jade
 Standards-Version: 3.8.3
 Homepage: http://www.scons.org/
diff --git a/debian/patches/no_remote_dtd.patch b/debian/patches/no_remote_dtd.patch
new file mode 100644
index 0000000..375c824
--- /dev/null
+++ b/debian/patches/no_remote_dtd.patch
@@ -0,0 +1,108 @@
+Description: Do not fetch DTD from WWW, use local one instead
+Origin: Debian
+Forwarded: not-needed
+
+Index: scons-doc-1.2.0.d20090905/doc/design/main.xml
+===================================================================
+--- scons-doc-1.2.0.d20090905.orig/doc/design/main.xml	2009-10-05 23:07:46.693802757 +0200
++++ scons-doc-1.2.0.d20090905/doc/design/main.xml	2009-10-05 23:07:39.145799959 +0200
+@@ -26,7 +26,7 @@
+ -->
+ 
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++"/usr/share/sgml/docbook/dtd/4.3/docbookx.dtd"
+ [
+ 
+     <!--
+Index: scons-doc-1.2.0.d20090905/doc/developer/main.xml
+===================================================================
+--- scons-doc-1.2.0.d20090905.orig/doc/developer/main.xml	2009-10-05 23:07:44.521801823 +0200
++++ scons-doc-1.2.0.d20090905/doc/developer/main.xml	2009-10-05 23:07:39.021803980 +0200
+@@ -26,7 +26,7 @@
+ -->
+ 
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++"/usr/share/sgml/docbook/dtd/4.3/docbookx.dtd"
+ [
+ 
+     <!ENTITY % version SYSTEM "../version.xml">
+Index: scons-doc-1.2.0.d20090905/doc/python10/main.xml
+===================================================================
+--- scons-doc-1.2.0.d20090905.orig/doc/python10/main.xml	2009-10-05 23:07:46.353803260 +0200
++++ scons-doc-1.2.0.d20090905/doc/python10/main.xml	2009-10-05 23:07:39.133790373 +0200
+@@ -26,7 +26,7 @@
+ -->
+ 
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++"/usr/share/sgml/docbook/dtd/4.3/docbookx.dtd"
+ [
+ 
+     <!ENTITY % scons SYSTEM "scons.mod">
+Index: scons-doc-1.2.0.d20090905/doc/reference/main.xml
+===================================================================
+--- scons-doc-1.2.0.d20090905.orig/doc/reference/main.xml	2009-10-05 23:07:44.773799008 +0200
++++ scons-doc-1.2.0.d20090905/doc/reference/main.xml	2009-10-05 23:07:39.041802698 +0200
+@@ -26,7 +26,7 @@
+ -->
+ 
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++"/usr/share/sgml/docbook/dtd/4.3/docbookx.dtd"
+ [
+ 
+     <!ENTITY % version SYSTEM "../version.xml">
+Index: scons-doc-1.2.0.d20090905/doc/user/builders.in
+===================================================================
+--- scons-doc-1.2.0.d20090905.orig/doc/user/builders.in	2009-10-05 23:07:45.961802525 +0200
++++ scons-doc-1.2.0.d20090905/doc/user/builders.in	2009-10-05 23:07:39.113790928 +0200
+@@ -25,7 +25,7 @@
+ 
+ <!--
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
++"/usr/share/sgml/docbook/dtd/4.3/docbookx.dtd">
+ 
+ <refentry id="Command">
+ 
+Index: scons-doc-1.2.0.d20090905/doc/user/builders.xml
+===================================================================
+--- scons-doc-1.2.0.d20090905.orig/doc/user/builders.xml	2009-10-05 23:07:45.133801032 +0200
++++ scons-doc-1.2.0.d20090905/doc/user/builders.xml	2009-10-05 23:07:39.061802016 +0200
+@@ -25,7 +25,7 @@
+ 
+ <!--
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
++"/usr/share/sgml/docbook/dtd/4.3/docbookx.dtd">
+ 
+ <refentry id="Command">
+ 
+Index: scons-doc-1.2.0.d20090905/doc/user/main.in
+===================================================================
+--- scons-doc-1.2.0.d20090905.orig/doc/user/main.in	2009-10-05 23:07:45.741802658 +0200
++++ scons-doc-1.2.0.d20090905/doc/user/main.in	2009-10-05 23:07:39.105797410 +0200
+@@ -25,7 +25,7 @@
+ -->
+ 
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++"/usr/share/sgml/docbook/dtd/4.3/docbookx.dtd"
+ [
+ 
+     <!ENTITY % version SYSTEM "../version.xml">
+Index: scons-doc-1.2.0.d20090905/doc/user/main.xml
+===================================================================
+--- scons-doc-1.2.0.d20090905.orig/doc/user/main.xml	2009-10-05 23:07:45.381803010 +0200
++++ scons-doc-1.2.0.d20090905/doc/user/main.xml	2009-10-05 23:07:39.085788724 +0200
+@@ -25,7 +25,7 @@
+ -->
+ 
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++"/usr/share/sgml/docbook/dtd/4.3/docbookx.dtd"
+ [
+ 
+     <!ENTITY % version SYSTEM "../version.xml">
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8717987
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no_remote_dtd.patch
diff --git a/debian/rules b/debian/rules
index 04b379b..4e6f44a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/')
 
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_auto_clean:
 	scons -c