diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-01 04:51:26 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-01 04:51:26 -0800 |
| commit | 34d923516315018da476f12af991b5a9c371486f (patch) | |
| tree | be21aa5a122c39db90f4b8ec40f0a926eba7aa62 | |
| parent | e20b7002c4567fc64789ca408133d068ec4e1460 (diff) | |
| parent | becbb0ef2d06584817fdd85f3f2f4b2d63ac202d (diff) | |
| download | mate-desktop-34d923516315018da476f12af991b5a9c371486f.tar.bz2 mate-desktop-34d923516315018da476f12af991b5a9c371486f.tar.xz | |
Merge pull request #88 from infirit/1.6
Cherrypick usefull commits from master
| -rw-r--r-- | distro/archlinux/PKGBUILD | 38 | ||||
| -rw-r--r-- | distro/archlinux/mate-desktop.install | 22 | ||||
| -rw-r--r-- | mate-about/mate-about.h | 10 |
3 files changed, 9 insertions, 61 deletions
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD deleted file mode 100644 index 077863b..0000000 --- a/distro/archlinux/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -pkgname=mate-desktop -pkgver=custom -pkgrel=1 -pkgdesc="Library with common API for various MATE modules" -arch=(i686 x86_64) -license=(GPL LGPL) -depends=('libunique' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client') -makedepends=('mate-doc-utils' 'intltool') -options=('!emptydirs' '!libtool') -url="http://mate-desktop.org/" -groups=('mate') -source=() -sha256sums=() -install=mate-desktop.install - -build() { - cd "${srcdir}/../../../" - - ./autogen.sh \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-scrollkeeper \ - --disable-startup-notification \ - --enable-unique || return 1 - # --with-gtk=3.0 \ - # --enable-gnucat - make || return 1 -} - -package() { - cd "${srcdir}/../../../" - make DESTDIR="$pkgdir" install - - # prevent conflicts errors - # mv "${pkgdir}/usr/share/omf" "${pkgdir}/usr/share/mate-omf" -} diff --git a/distro/archlinux/mate-desktop.install b/distro/archlinux/mate-desktop.install deleted file mode 100644 index bf325ea..0000000 --- a/distro/archlinux/mate-desktop.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=mate-desktop - -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h index fd74b1c..56444d0 100644 --- a/mate-about/mate-about.h +++ b/mate-about/mate-about.h @@ -66,12 +66,13 @@ }; const char* authors[] = { + "MATE:", /* MATE founders */ "Perberos <[email protected]>", "Stefano Karapetsas <[email protected]>", "Steve Zesch <[email protected]>", "Clement Lefebvre <[email protected]>", - /* MATE developers */ + /* MATE developers and contributors */ "Scott Balneaves <[email protected]>", "Marcel Dijkstra <[email protected]>", "Jasmine Hassan <[email protected]>", @@ -84,7 +85,14 @@ "Yaakov Selkowitz <[email protected]>", "Sam Tygier <[email protected]>", "Wolfgang Ulbrich <[email protected]>", + "Sander Sweers <[email protected]>", + "Benjamin Denisart <[email protected]>", + "Efstathios Iosifidis <[email protected]>", + "Martin Wimpress <[email protected]>", + "John Paul Adrian Glaubitz <[email protected]>", + "Mike Gabriel <[email protected]>", /* GNOME developers */ + "GNOME:", "Jérôme Abela", "Rob Adams", "Djihed Afifi", |