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

Stefano Karapetsas stefanokarapetsas-guest at moszumanska.debian.org
Thu May 1 13:01:25 UTC 2014


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

The following commit has been merged in the master branch:
commit 22b42cb8a4304d12fe66203f006e1d80fa300c35
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date:   Thu May 1 15:01:11 2014 +0200

    Install mate-ffmpegthumbnailer.thumbnailer only in wheezy
---
 debian/control | 3 ++-
 debian/rules   | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index afcb636..bc9c24b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: mate
 Priority: optional
 Maintainer: Stefano Karapetsas <stefano at karapetsas.com>
 Uploaders: Steve Zesch <stevezesch2 at gmail.com>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9),
+               lsb-release,
 Standards-Version: 3.9.5
 Homepage: http://www.mate-desktop.org/
 
diff --git a/debian/rules b/debian/rules
index 8265cb6..dbf0427 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,5 +13,9 @@ 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
-	# this add video thumnbails support, until ffmpegthumbnailer 2.0.8 is in all repositories
+ifeq ($(shell dpkg-vendor --is Debian && echo yes),yes)
+ifeq ($(shell lsb_release -cs),wheezy)
+	# this add video thumnbails support, because ffmpegthumbnailer 2.0.8 is not in wheezy
 	dh_install -pmate-desktop-environment debian/mate-ffmpegthumbnailer.thumbnailer /usr/share/thumbnailers/
+endif
+endif

-- 
mate-desktop-environment Debian package



More information about the pkg-mate-commits mailing list