From 5f2d715d9f5ddb7a71e5e1ffbf0b8cf1ad9f418a Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=A1bor=20K=C3=B6vesd=C3=A1n?= <gabor@kovesdan.org>
Date: Thu, 23 Aug 2012 16:53:19 +0000
Subject: [PATCH] - Remove catalogs; there is no DTD any more - Update version
 number in the VERSION file - Update locatingrules.xml

---
 slides/VERSION           |  2 +-
 slides/catalog           | 57 ----------------------------------------
 slides/catalog.xml       | 38 ---------------------------
 slides/locatingrules.xml |  6 +++--
 4 files changed, 5 insertions(+), 98 deletions(-)
 delete mode 100644 slides/catalog
 delete mode 100644 slides/catalog.xml

diff --git a/slides/VERSION b/slides/VERSION
index eae18ea2d..a14dd3042 100644
--- a/slides/VERSION
+++ b/slides/VERSION
@@ -12,7 +12,7 @@
 <fm:project>
   <fm:Project>DocBook</fm:Project>
   <fm:Branch>Slides</fm:Branch>
-  <fm:Version>3.4.0</fm:Version>
+  <fm:Version>5.0</fm:Version>
 <!--
   <fm:License>MIT/X Consortium License</fm:License>
 -->
diff --git a/slides/catalog b/slides/catalog
deleted file mode 100644
index ebead7e4c..000000000
--- a/slides/catalog
+++ /dev/null
@@ -1,57 +0,0 @@
---  SGML Catalog file for DocBook Slides --
-OVERRIDE YES
-
-PUBLIC "-//Norman Walsh//DTD Slides V3.4//EN" "schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.4/schema/slides.dtd" "schema/dtd/slides.dtd"/>
-SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/slides.dtd" "schema/dtd/slides.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides Full V3.4//EN" "schema/dtd/slides-full.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.4/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
-SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
-
--- the following are for older versions of the Slides DTD; the DTD is --
--- backward compatible, so we just remap the older URIs to the local URI --
--- of the current version; otherwise, users would need to manually change --
--- the URIs in all their existing Slides document instances --
-
-PUBLIC "-//Norman Walsh//DTD Slides V3.3.1//EN" "schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.3.1/schema/slides.dtd" "schema/dtd/slides.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides Full V3.3.1//EN" "schema/dtd/slides-full.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.3.1/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides V3.3.0//EN" "schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.3.0/schema/slides.dtd" "schema/dtd/slides.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides Full V3.3.0//EN" "schema/dtd/slides-full.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.3.0/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides V3.1.0//EN" "schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.1.0/schema/slides.dtd" "schema/dtd/slides.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides Full V3.1.0//EN" "schema/dtd/slides-full.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.1.0/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides V3.0//EN" "schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.0/schema/slides.dtd" "schema/dtd/slides.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides Full V3.0//EN" "schema/dtd/slides-full.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.0/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides V3.0b1//EN" "schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.0b1/schema/slides.dtd" "schema/dtd/slides.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides Full V3.0b1//EN" "schema/dtd/slides-full.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.0b1/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides V2.1/EN" "schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/2.1/schema/slides.dtd" "schema/dtd/slides.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides Full V2.1//EN" "schema/dtd/slides-full.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/2.1/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides V2.1b1//EN" "schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/2.1b1/schema/slides.dtd" "schema/dtd/slides.dtd"/>
-
-PUBLIC "-//Norman Walsh//DTD Slides Full V2.1b1//EN" "schema/dtd/slides-full.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/2.1b1/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
diff --git a/slides/catalog.xml b/slides/catalog.xml
deleted file mode 100644
index ac795dfa5..000000000
--- a/slides/catalog.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
-<!--  XML Catalog file for DocBook Slides -->
-
-<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/current/schema/"
-            rewritePrefix="schema/"/>
-
-<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.4/schema/"
-            rewritePrefix="schema/"/>
-
-<rewriteURI uriStartString="http://docbook.sourceforge.net/release/slides/current/xsl/"
-            rewritePrefix="xsl/"/>
-
-<rewriteURI uriStartString="http://docbook.sourceforge.net/release/slides/3.4.0/xsl/"
-            rewritePrefix="xsl/"/>
-
-<!-- the following are for older versions of Slides DTD; the DTD is -->
-<!-- backward compatible, so we just remap the older URIs to the local URI -->
-<!-- of the current version; otherwise, users would need to manually change -->
-<!-- the URIs in all their existing Slides document instances -->
-
-<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.3.1/schema/"
-            rewritePrefix="schema/"/>
-<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.3.0/schema/"
-            rewritePrefix="schema/"/>
-<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.1.0/schema/"
-            rewritePrefix="schema/"/>
-<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.0/"
-            rewritePrefix="schema/"/>
-<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.0b1/"
-            rewritePrefix="schema/"/>
-<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/2.1/"
-            rewritePrefix="schema/"/>
-<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/2.1b1/"
-            rewritePrefix="schema/"/>
-
-</catalog>
diff --git a/slides/locatingrules.xml b/slides/locatingrules.xml
index a12b3da60..4de5a58ce 100644
--- a/slides/locatingrules.xml
+++ b/slides/locatingrules.xml
@@ -8,8 +8,10 @@
 <!-- the root element of the document -->
 
 <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <documentElement prefix="" localName="slides" uri="schema/relaxng/slides.rnc"/>
-<!--   <documentElement prefix="" localName="slides" uri="schema/relaxng/slides-full.rnc"/> -->
+  <namespace ns="http://docbook.org/ns/docbook-slides" uri="schema/relaxng/slides.rnc"/>
+  <documentElement localName="slides" uri="schema/relaxng/slides.rnc"/>
+
+  <namespace ns="http://docbook.org/ns/docbook" uri="schema/relaxng/docbook.rnc"/>
 </locatingRules>
 
 <!-- To use this file with Emacs/nXML mode, either: -->
-- 
2.40.0