diff --git a/gnome/platform/gsettings-desktop-schemas.xml b/gnome/platform/gsettings-desktop-schemas.xml
index 48a219b687..3156a99abe 100644
--- a/gnome/platform/gsettings-desktop-schemas.xml
+++ b/gnome/platform/gsettings-desktop-schemas.xml
@@ -98,7 +98,9 @@
the following commands:
-./configure --prefix=/usr &&
+sed -i -r 's:"(/system):"/org/gnome\1:' schemas/*.in &&
+
+./configure --prefix=/usr &&
make
@@ -116,6 +118,14 @@ make
+
+ Command Explanations
+
+ sed ... schemas/*.in: This command fixes some
+ deprecated entries in the schema templates.
+
+
+
Contents
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 67364a1e7f..4c96e36c32 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,24 @@
January 13th, 2016
+
+ [bdubbs] - Update appropriate kde packages to version 15.12.1.
+ Includes kdelibs, ked-runtime, kde-baseapps, kmix, libkcddb,
+ and okular. Fixes
+ #7354.
+
+
+ [bdubbs] - Remove reference to configure option
+ demosdir in qt5.
+
+
+ [bdubbs] - Fix some deprecated entries in
+ gsettings-desktop-schemas.
+
+
+ [bdubbs] - Update to kdelibs-4.14.16. Fixes
+ #7355.
+
[fernando] - Add gsettings-desktop-schemas-3.18.1 as required
dependency for Yelp-3.18.1.
diff --git a/kde/add/ark.xml b/kde/add/ark.xml
index df04ac2c43..f1b6aaf1cb 100644
--- a/kde/add/ark.xml
+++ b/kde/add/ark.xml
@@ -4,7 +4,7 @@
%general-entities;
-
+
@@ -12,7 +12,7 @@
]>
-
+
@@ -20,7 +20,7 @@
$Date$
- Ark-&kde-apps-version;
+ Ark-&ark-version;
ark
diff --git a/kde/add/kdepim-runtime.xml b/kde/add/kdepim-runtime.xml
index e8c95dff7c..6a440f048d 100644
--- a/kde/add/kdepim-runtime.xml
+++ b/kde/add/kdepim-runtime.xml
@@ -4,7 +4,7 @@
%general-entities;
-
+
diff --git a/kde/add/kdepim.xml b/kde/add/kdepim.xml
index c090731383..e3ba903778 100644
--- a/kde/add/kdepim.xml
+++ b/kde/add/kdepim.xml
@@ -4,7 +4,7 @@
%general-entities;
-
+
diff --git a/kde/add/kmix.xml b/kde/add/kmix.xml
index 2a4fc7da9c..0703fce267 100644
--- a/kde/add/kmix.xml
+++ b/kde/add/kmix.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/kde/add/libkcddb.xml b/kde/add/libkcddb.xml
index b3899e0f4b..0dcb0c0ced 100644
--- a/kde/add/libkcddb.xml
+++ b/kde/add/libkcddb.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/kde/add/okular.xml b/kde/add/okular.xml
index e14fd94c3a..991eaff021 100644
--- a/kde/add/okular.xml
+++ b/kde/add/okular.xml
@@ -6,9 +6,9 @@
-
+
-
+
]>
diff --git a/kde/core/kde-baseapps.xml b/kde/core/kde-baseapps.xml
index 0e53154932..0b596f2bb0 100644
--- a/kde/core/kde-baseapps.xml
+++ b/kde/core/kde-baseapps.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/kde/core/kde-runtime.xml b/kde/core/kde-runtime.xml
index 9311788677..06a9c9c67e 100644
--- a/kde/core/kde-runtime.xml
+++ b/kde/core/kde-runtime.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/kde/core/kdelibs.xml b/kde/core/kdelibs.xml
index b77ab73a92..a9d410ab33 100644
--- a/kde/core/kdelibs.xml
+++ b/kde/core/kdelibs.xml
@@ -6,9 +6,9 @@
-
+
-
+
]>
diff --git a/packages.ent b/packages.ent
index 28628b943f..10bf5e9afd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -521,17 +521,17 @@
-
+
-
-
+
+
-
-
+
+
diff --git a/x/lib/qt5.xml b/x/lib/qt5.xml
index 3fc40aebe0..ee0e61a5e0 100644
--- a/x/lib/qt5.xml
+++ b/x/lib/qt5.xml
@@ -221,7 +221,6 @@ ln -sfnv qt-&qt5-version; /opt/qt5
-datadir /usr/share/qt5 \
-docdir /usr/share/doc/qt5 \
-translationdir /usr/share/qt5/translations \
--demosdir /usr/share/doc/qt5/demos \
-examplesdir /usr/share/doc/qt5/examples \