From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 7 Nov 2020 22:05:08 +0000 (-0600)
Subject: Apply upstream patch to restore schemas.xml to fix nXML mode
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~123
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d6f79b17e0201b11d0142cfb7622df117fbdc4de;p=emacs.git

Apply upstream patch to restore schemas.xml to fix nXML mode

Add 0013-Recover-the-contents-of-the-schemas.xml-file.patch to
incorporate the changes.

Thanks to Yasuhiro KIMURA for reporting the problem and the fix.

Closes: 973633
---

d6f79b17e0201b11d0142cfb7622df117fbdc4de
diff --cc debian/.git-dpm
index 1d7c4aa1cf6,00000000000..73be22adeaf
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- a64353ba297f114e47c5e22d4a522d95bd400b58
- a64353ba297f114e47c5e22d4a522d95bd400b58
++d1c7856ed466f639a9496c05a64d1b9f3af88c80
++d1c7856ed466f639a9496c05a64d1b9f3af88c80
 +d429af9a70839a40bba83ebeaa33ad8d7219fbcd
 +d429af9a70839a40bba83ebeaa33ad8d7219fbcd
 +emacs_27.1+1.orig.tar.xz
 +fa38330a1a57cf7a01ee8128f0faf2dd0117f703
 +25483548
diff --cc debian/patches/0013-Recover-the-contents-of-the-schemas.xml-file.patch
index 00000000000,00000000000..74cb6c70fa1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0013-Recover-the-contents-of-the-schemas.xml-file.patch
@@@ -1,0 -1,0 +1,85 @@@
++From d1c7856ed466f639a9496c05a64d1b9f3af88c80 Mon Sep 17 00:00:00 2001
++From: Yasuhiro KIMURA <yasu@utahime.org>
++Date: Sun, 1 Nov 2020 14:01:31 +0100
++Subject: Recover the contents of the schemas.xml file
++
++* etc/schema/schemas.xml: Recover the file, which was apparently
++(mostly) removed by mistake by commit 165f738382 (bug#42851).
++
++Copyright-paperwork-exempt: yes
++Bug: https://debbugs.gnu.org/42851
++Bug-Debian: https://bugs.debian.org/973633
++---
++ etc/schema/schemas.xml | 58 ++++++++++++++++++++++++++++++++++++++++++
++ 1 file changed, 58 insertions(+)
++
++diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
++index f1e0ed7856f..40175b056b1 100644
++--- a/etc/schema/schemas.xml
+++++ b/etc/schema/schemas.xml
++@@ -1,7 +1,65 @@
++ <?xml version="1.0"?>
+++<!-- Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc.
+++
+++This file is part of GNU Emacs.
+++
+++GNU Emacs is free software: you can redistribute it and/or modify
+++it under the terms of the GNU General Public License as published by
+++the Free Software Foundation, either version 3 of the License, or
+++(at your option) any later version.
+++
+++GNU Emacs is distributed in the hope that it will be useful,
+++but WITHOUT ANY WARRANTY; without even the implied warranty of
+++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+++GNU General Public License for more details.
+++
+++You should have received a copy of the GNU General Public License
+++along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
+++
++ <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
+++  <transformURI fromPattern="*.xml" toPattern="*.rnc"/>
+++
+++  <uri pattern="*.xsl" typeId="XSLT"/>
+++  <uri pattern="*.html" typeId="XHTML"/>
+++  <uri pattern="*.rng" typeId="RELAX NG"/>
+++  <uri pattern="*.rdf" typeId="RDF"/>
+++  <uri pattern="*.dbk" typeId="DocBook"/>
+++
+++  <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/>
+++  <namespace ns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" typeId="RDF"/>
+++  <namespace ns="http://www.w3.org/1999/xhtml" typeId="XHTML"/>
+++  <namespace ns="http://relaxng.org/ns/structure/1.0" typeId="RELAX NG"/>
+++  <namespace ns="http://thaiopensource.com/ns/locating-rules/1.0"
+++	     uri="locate.rnc"/>
+++
+++  <documentElement localName="stylesheet" typeId="XSLT"/>
+++  <documentElement prefix="xsl" localName="transform" typeId="XSLT"/>
+++
+++  <documentElement localName="html" typeId="XHTML"/>
+++
+++  <documentElement localName="grammar" typeId="RELAX NG"/>
+++
+++  <documentElement prefix="" localName="article" typeId="DocBook"/>
+++  <documentElement prefix="" localName="book" typeId="DocBook"/>
+++  <documentElement prefix="" localName="chapter" typeId="DocBook"/>
+++  <documentElement prefix="" localName="part" typeId="DocBook"/>
+++  <documentElement prefix="" localName="refentry" typeId="DocBook"/>
+++  <documentElement prefix="" localName="section" typeId="DocBook"/>
+++
+++  <documentElement localName="RDF" typeId="RDF"/>
+++  <documentElement prefix="rdf" typeId="RDF"/>
+++
+++  <documentElement localName="locatingRules" uri="locate.rnc"/>
+++
+++  <typeId id="XSLT" uri="xslt.rnc"/>
+++  <typeId id="RELAX NG" uri="relaxng.rnc"/>
+++  <typeId id="XHTML" uri="xhtml.rnc"/>
+++  <typeId id="DocBook" uri="docbook.rnc"/>
+++  <typeId id="RDF" uri="rdfxml.rnc"/>
+++
++   <documentElement prefix="office" typeId="OpenDocument"/>
++   <documentElement prefix="manifest" localName="manifest" typeId="OpenDocument Manifest"/>
++   <typeId id="OpenDocument" uri="od-schema-v1.2-os.rnc"/>
++   <typeId id="OpenDocument Manifest" uri="od-manifest-schema-v1.2-os.rnc"/>
+++
++ </locatingRules>
diff --cc debian/patches/series
index d9a70efa092,00000000000..5e0b84c4f45
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,12 -1,0 +1,13 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
 +0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
 +0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch
 +0011-emacs-module-tests-fix-VPATH-builds.patch
 +0012-Strip-parent-path-from-package-descriptions-for-repr.patch
++0013-Recover-the-contents-of-the-schemas.xml-file.patch