diff options
| author | Perberos <[email protected]> | 2012-01-26 11:02:03 -0300 |
|---|---|---|
| committer | Perberos <[email protected]> | 2012-01-26 11:02:03 -0300 |
| commit | 022106354aff7cabceed8a5fe48d7a0b6a303115 (patch) | |
| tree | 96f48baf566206955cd2b6bf26eeb023c81c5b35 | |
| parent | 2208fdb23d8766b344ff5e756028d3c241daa93a (diff) | |
| parent | 12554075223ee76be613d0de2d5b52bbb131ed9f (diff) | |
| download | mate-applets-022106354aff7cabceed8a5fe48d7a0b6a303115.tar.bz2 mate-applets-022106354aff7cabceed8a5fe48d7a0b6a303115.tar.xz | |
Merge branch 'master' of https://github.com/mate-desktop/mate-applets
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | distro/archlinux/PKGBUILD | 2 | ||||
| -rwxr-xr-x | distro/ubuntu/build | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/configure.in b/configure.in index de19f666..5692356b 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl *************************************************************************** dnl *** configure.in for MATE-APPLETS *** dnl *************************************************************************** -AC_INIT(mate-applets, 1.1.0) +AC_INIT(mate-applets, 1.1.1) AC_PREREQ(2.59) AM_CONFIG_HEADER(config.h) @@ -365,7 +365,7 @@ dnl *************************************************************************** dnl *** Set up gettext *** dnl *************************************************************************** -GETTEXT_PACKAGE=mate-applets-2.0 +GETTEXT_PACKAGE=mate-applets AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package]) AC_DEFINE_DIR(MATELOCALEDIR, "${datadir}/locale", [locale directory]) diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD index 63793235..294a98f9 100644 --- a/distro/archlinux/PKGBUILD +++ b/distro/archlinux/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mate-applets -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="Applets for MATE panel" arch=(i686 x86_64) diff --git a/distro/ubuntu/build b/distro/ubuntu/build index 4f4eeda8..ed5c5569 100755 --- a/distro/ubuntu/build +++ b/distro/ubuntu/build @@ -2,7 +2,7 @@ # fill it pkgname=mate-applets -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="MATE Applets" depends=('gstreamer0.10-plugins-base' 'mate-panel' 'mate-character-map' 'libgtop2-7' 'libmatenotify' 'cpufrequtils') diff --git a/po/POTFILES.in b/po/POTFILES.in index 654be499..7d86c6bc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -10,7 +10,7 @@ battstat/battstat-hal.c battstat/battstat.schemas.in [type: gettext/ini]battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in battstat/properties.c -battstat/sounds/battstat_applet.soundlist.in +battstat/sounds/mate-battstat_applet.soundlist.in charpick/charpick.c charpick/charpick.schemas.in [type: gettext/ini]charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in @@ -33,8 +33,6 @@ geyes/geyes.c geyes/geyes.schemas.in [type: gettext/ini]geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in geyes/themes.c -gkb-new/xmodmap/base.xml.in -gkb-new/xmodmap.sun/base.xml.in mateweather/mateweather-about.c mateweather/mateweather-applet.c mateweather/mateweather-dialog.c |