[SCM] mate-desktop-environment Debian package branch, master, updated. 22b42cb8a4304d12fe66203f006e1d80fa300c35

[Stefano Karapetsas]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-desktop-environment.git;a=commitdiff;h=b494216

The following commit has been merged in the master branch:
commit b494216ccc04422bf89bd9a271fe854032a7311e
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date:   Thu May 1 14:56:10 2014 +0200

    Remove unused mate-unstable-preview.gschema.override
---
 debian/mate-unstable-preview.gschema.override | 7 -------
 debian/rules                                  | 2 --
 2 files changed, 9 deletions(-)

diff --git a/debian/mate-unstable-preview.gschema.override b/debian/mate-unstable-preview.gschema.override
deleted file mode 100644
index cf0c2a1..0000000
--- a/debian/mate-unstable-preview.gschema.override
+++ /dev/null
@@ -1,7 +0,0 @@
-[org.mate.Marco.general]
-compositing-manager=true
-center-new-windows=true
-side-by-side-tiling=true
-
-[org.mate.eom.full-screen]
-random=true
diff --git a/debian/rules b/debian/rules
index a8c5a7e..8265cb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,5 @@ endif
 ifeq ($(shell dpkg-vendor --is Debian && echo yes),yes)
 	dh_install -pmate-desktop-environment debian/mate-debian.gschema.override /usr/share/glib-2.0/schemas/
 endif
-	# GSettings overrides for MATE unstable preview
-	#dh_install -pmate-unstable-preview debian/mate-unstable-preview.gschema.override /usr/share/glib-2.0/schemas/
 	# this add video thumnbails support, until ffmpegthumbnailer 2.0.8 is in all repositories
 	dh_install -pmate-desktop-environment debian/mate-ffmpegthumbnailer.thumbnailer /usr/share/thumbnailers/

-- 
mate-desktop-environment Debian package