Merge branch 'hotfix/reset_stylesheet_dir'

Hotfix for version 2.0-rc6:
  * Reverted the move of the stylesheets to
    /usr/share/xml/suse/stylesheet because of serious compatibility issues.
    The stylesheets remain in /usr/share/xml/suse/docbook.

ChangeLog

@@ -1,4 +1,26 @@
 -------------------------------------------------------------------
+Thu Jun 11 12:50:28 UTC 2015 - [email protected]
+
+Hotfix for version 2.0-rc6:
+  * Reverted the move of the stylesheets to
+    /usr/share/xml/suse/stylesheet
+    because of serious compatibilioty issues.
+    The stylesheets remain in
+    /usr/share/xml/suse/docbook.
+
+-------------------------------------------------------------------
+Tue May 19 11:09:13 UTC 2015 - [email protected]
+
+New version 2.0-rc6:
+ * added SUSEdoc, a fully DocBook 5 compatible schema with a subset of
+   DocBook commands (like NovDoc for DocBook 4)
+ * package now supports installation of different schema/DTD versions
+   in parallel
+ * stylesheets and schemas have moved to
+   /usr/share/xml/suse/{schema,stylesheet}
+   NOTE: This requires to change STYLEROOT in the DC-files of existing
+   manuals!
+-------------------------------------------------------------------
 Mon Apr 27 13:52:45 UTC 2015 - [email protected]
 
 New release 2.0~rc5

Makefile

@@ -13,8 +13,9 @@ SHELL         := /bin/bash
 PACKAGE       := suse-xsl-stylesheets
 VERSION       := 2.0~rc6
 SUSE_XML_PATH := $(PREFIX)/xml/suse
+DB_XML_PATH   := $(PREFIX)/xml/docbook
 SUSE_SCHEMA_PATH := $(SUSE_XML_PATH)/schema
-SUSE_STYLES_PATH := $(SUSE_XML_PATH)/stylesheet
+SUSE_STYLES_PATH := $(DB_XML_PATH)/stylesheet
 
 #--------------------------------------------------------------
 # NOVDOC

packaging/suse-xsl-stylesheets.spec

@@ -42,8 +42,9 @@ Release:        0
 %define suse_schemas_groupname suse_schemas
 
 %define suse_xml_dir    %{_datadir}/xml/suse
+%define db_xml_dir      %{_datadir}/xml/docbook
 %define suse_schema_dir %{suse_xml_dir}/schema
-%define suse_styles_dir %{suse_xml_dir}/stylesheet
+%define suse_styles_dir %{db_xml_dir}/stylesheet
 
 
 Summary:        SUSE-branded Docbook stylesheets for XSLT 1.0
@@ -226,6 +227,7 @@ exit 0
 %dir %{_datadir}/suse-xsl-stylesheets/aspell
 
 %dir %{suse_xml_dir}
+%dir %{db_xml_dir}
 
 %dir %{suse_styles_dir}
 %dir %{suse_styles_dir}/suse