diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:36 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:36 -0800 |
| commit | f7a3eb82ec1ee908fb5b9da753a40f0739323510 (patch) | |
| tree | f394c96ff0c9cf41f90fef2d0c4d9178e2a00b5b | |
| parent | 25c6a0f17cb85eb285daa158c5becb479731676d (diff) | |
| parent | d8d74d5201c3b5b3b9740983e61f9acf55a909fa (diff) | |
| download | mate-panel-f7a3eb82ec1ee908fb5b9da753a40f0739323510.tar.bz2 mate-panel-f7a3eb82ec1ee908fb5b9da753a40f0739323510.tar.xz | |
Merge pull request #150 from infirit/1.6
Cherrypick usefull commits from master
| -rw-r--r-- | applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in | 4 | ||||
| -rw-r--r-- | distro/archlinux/PKGBUILD | 39 | ||||
| -rw-r--r-- | distro/archlinux/mate-panel.install | 31 |
3 files changed, 2 insertions, 72 deletions
diff --git a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in index c041c53c..9a24988f 100644 --- a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in +++ b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in @@ -75,12 +75,12 @@ <_description>A list of locations to display in the calendar window.</_description> </key> <key name="temperature-unit" enum="org.mate.panel.applet.clock.TemperatureUnit"> - <default>'Default'</default> + <default>'Centigrade'</default> <_summary>Temperature unit</_summary> <_description>The unit to use when showing temperatures.</_description> </key> <key name="speed-unit" enum="org.mate.panel.applet.clock.SpeedUnit"> - <default>'Default'</default> + <default>'m/s'</default> <_summary>Speed unit</_summary> <_description>The unit to use when showing wind speed.</_description> </key> diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD deleted file mode 100644 index f4cedfac..00000000 --- a/distro/archlinux/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -pkgname=mate-panel -pkgver=1.1.1 -pkgrel=1 -pkgdesc="The MATE Panel" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libmatewnck' 'mate-conf' 'mate-menus' 'mate-desktop' 'librsvg' 'hicolor-icon-theme' 'libcanberra' 'libmatecomponentui' 'libmateweather') # 'evolution-data-server' -makedepends=('mate-doc-utils' 'pkgconfig' 'intltool' 'networkmanager') -options=('!emptydirs' '!libtool') -install=mate-panel.install -source=() -sha256sums=() -url="http://matsusoft.com.ar/projects/mate/" -groups=('mate') - -build() { - cd "${srcdir}/../../../" - - PYTHON=/usr/bin/python2 ./autogen.sh \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --libexecdir=/usr/lib/mate-panel \ - --disable-scrollkeeper \ - --enable-introspection \ - --enable-matecomponent || return 1 - make || return 1 -} - -package() { - cd "${srcdir}/../../../" - - make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/mateconf/schemas" - mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1 - rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas -} diff --git a/distro/archlinux/mate-panel.install b/distro/archlinux/mate-panel.install deleted file mode 100644 index 67255325..00000000 --- a/distro/archlinux/mate-panel.install +++ /dev/null @@ -1,31 +0,0 @@ -pkgname=mate-panel - -post_install() { - MATECONF_CONFIG_SOURCE=`usr/bin/mateconftool-2 --get-default-source` - usr/bin/mateconftool-2 --config-source="${MATECONF_CONFIG_SOURCE}" --direct --load \ - etc/mateconf/schemas/panel-default-setup.entries >/dev/null - usr/sbin/mateconfpkg --install ${pkgname} - - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - MATECONF_CONFIG_SOURCE=`usr/bin/mateconftool-2 --get-default-source` - - usr/bin/mateconftool-2 --config-source="${MATECONF_CONFIG_SOURCE}" --direct --unload \ - etc/mateconf/schemas/panel-default-setup.entries > /dev/null - - usr/sbin/mateconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} |