Package: solfege
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu karmic ubuntu-patch
Forwarding patch
*** /tmp/tmpnnqV28
In Ubuntu, we've applied the attached patch to achieve the following:
[ Ezra Reeves ]
* Merge from debian testing, remaining changes:
- debian/patches/xmllint-nonet.dpatch:
+ Actually xmllint tries to retrieve a file from oasis-open.org in
order to validate XML files, it doesn't work without an Internet
access, fix FTBFS.
We thought you might be interested in doing the same.
-- System Information:
Debian Release: squeeze/sid
APT prefers karmic-updates
APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 'karmic')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.31-14-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=C (charmap=UTF-8) (ignored: LC_ALL set to
en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u solfege-3.14.5/debian/patches/00list solfege-3.14.5/debian/patches/00list
--- solfege-3.14.5/debian/patches/00list
+++ solfege-3.14.5/debian/patches/00list
@@ -4,0 +5 @@
+xmllint-nonet.dpatch
only in patch2:
unchanged:
--- solfege-3.14.5.orig/debian/patches/xmllint-nonet.dpatch
+++ solfege-3.14.5/debian/patches/xmllint-nonet.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xmllint-nonet.dpatch by Alessio Treglia <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoid xmllint tries retrieving a file from Internet to validate XML files.
+
+...@dpatch@
+diff -urNad solfege-3.14.5~/Makefile.in solfege-3.14.5/Makefile.in
+--- solfege-3.14.5~/Makefile.in 2009-07-07 15:32:05.000000000 -0500
++++ solfege-3.14.5/Makefile.in 2009-07-07 15:32:06.000000000 -0500
+@@ -197,7 +197,7 @@
+
+ .PHONY: test xmllint
+ xmllint:
+- xmllint --postvalid --dtdvalid http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd --xinclude --noout help/C/solfege.xml
++ xmllint --nonet --xinclude --noout help/C/solfege.xml
+
+ test: xmllint
+ $(MAKE) dist
