summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2002-12-20 03:44:15 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2002-12-20 03:44:15 +0800
commit431cfe4c037841e490d9ca8a7653c5123cd82465 (patch)
tree9d631b991c6c0c4da0092d544bfcb0f851366a4e /x11
parent42715075aab4d62ed7ea854749e6534a72a3a2bc (diff)
downloadmarcuscom-ports-431cfe4c037841e490d9ca8a7653c5123cd82465.tar
marcuscom-ports-431cfe4c037841e490d9ca8a7653c5123cd82465.tar.gz
marcuscom-ports-431cfe4c037841e490d9ca8a7653c5123cd82465.tar.bz2
marcuscom-ports-431cfe4c037841e490d9ca8a7653c5123cd82465.tar.lz
marcuscom-ports-431cfe4c037841e490d9ca8a7653c5123cd82465.tar.xz
marcuscom-ports-431cfe4c037841e490d9ca8a7653c5123cd82465.tar.zst
marcuscom-ports-431cfe4c037841e490d9ca8a7653c5123cd82465.zip
Update to 2.1.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@310 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-applets/Makefile4
-rw-r--r--x11/gnome-applets/distinfo2
-rw-r--r--x11/gnome-applets/files/patch-aa48
-rw-r--r--x11/gnome-applets/files/patch-battstat_Makefile.in27
-rw-r--r--x11/gnome-applets/pkg-plist16
-rw-r--r--x11/gnomeapplets2/Makefile4
-rw-r--r--x11/gnomeapplets2/distinfo2
-rw-r--r--x11/gnomeapplets2/files/patch-aa48
-rw-r--r--x11/gnomeapplets2/files/patch-battstat_Makefile.in27
-rw-r--r--x11/gnomeapplets2/pkg-plist16
10 files changed, 108 insertions, 86 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index c8b00beef..97c349033 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 2.1.1
+PORTVERSION= 2.1.3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-applets/2.1
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOMENG= yes
-USE_GNOME= gnomeprefix gnomehack
+USE_GNOME= gnomehier gnomeprefix gnomehack
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 2a0e0aa7e..1d43a59e3 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.1.1.tar.bz2) = f8e24f9480b13815215d626ee36cff17
+MD5 (gnome2/gnome-applets-2.1.3.tar.bz2) = 93d45863336a87b143df0b7cb7a24dfb
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 6e97117be..fc72f4f9e 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig Sun Nov 3 14:13:35 2002
-+++ configure Mon Nov 11 16:56:45 2002
-@@ -5682,6 +5682,7 @@
+--- configure.orig Mon Dec 16 17:15:36 2002
++++ configure Thu Dec 19 13:43:27 2002
+@@ -7862,6 +7862,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
++c_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8918,6 +8919,7 @@
+@@ -12328,6 +12329,7 @@
*irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
*linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
*netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -16,41 +16,41 @@
*solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
esac
case "$host" in
-@@ -8980,6 +8982,20 @@
+@@ -12391,6 +12393,20 @@
fi
-
+
;;
+ i386-*-freebsd*)
-+ HAVE_LIBAPM=no
++ HAVE_LIBAPM=no
+if test "x$HAVE_LIBAPM" = "xyes"; then
-+ HAVE_LIBAPM_TRUE=
-+ HAVE_LIBAPM_FALSE='#'
++ HAVE_LIBAPM_TRUE=
++ HAVE_LIBAPM_FALSE='#'
+else
-+ HAVE_LIBAPM_TRUE='#'
-+ HAVE_LIBAPM_FALSE=
++ HAVE_LIBAPM_TRUE='#'
++ HAVE_LIBAPM_FALSE=
+fi
-+ ;;
++ ;;
+ *-*-freebsd*)
-+ build_battstat_applet=no
++ build_battstat_applet=no
+
-+ ;;
++ ;;
*-*-linux*)
- echo $ac_n "checking for apm_read in -lapm""... $ac_c" 1>&6
- echo "configure:8986: checking for apm_read in -lapm" >&5
-@@ -9567,14 +9583,14 @@
+ echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
+ echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6
+@@ -13688,14 +13704,14 @@
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
-#define GNOME_ICONDIR "${prefix}/share/pixmaps"
+#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
+ _ACEOF
- #defined the below to enable help to work for applets
+ #defined the below to enable help to work for applets
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
-#define DATADIR "${prefix}/share"
+#define DATADIR "${datadir}"
- EOF
+ _ACEOF
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
diff --git a/x11/gnome-applets/files/patch-battstat_Makefile.in b/x11/gnome-applets/files/patch-battstat_Makefile.in
index 6b05c2b4e..f47e6bab6 100644
--- a/x11/gnome-applets/files/patch-battstat_Makefile.in
+++ b/x11/gnome-applets/files/patch-battstat_Makefile.in
@@ -1,26 +1,27 @@
---- battstat/Makefile.in.orig Mon Nov 11 16:57:08 2002
-+++ battstat/Makefile.in Mon Nov 11 16:58:06 2002
-@@ -146,11 +146,11 @@
+--- battstat/Makefile.in.orig Thu Dec 19 13:50:27 2002
++++ battstat/Makefile.in Thu Dec 19 13:51:02 2002
+@@ -148,11 +148,11 @@
pixmapsdir = $(datadir)/pixmaps
pixmaps_DATA = battstat.png
- @HAVE_LIBAPM_TRUE@APMLIB = -lapm
--@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
+ @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
+-@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
+@HAVE_LIBAPM_FALSE@APMLIB =
@HAVE_LIBAPM_TRUE@APMDIR =
--@HAVE_LIBAPM_FALSE@APMDIR = apmlib
+-@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
+@HAVE_LIBAPM_FALSE@APMDIR =
@HAVE_LIBAPM_TRUE@APMINC =
--@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
+-@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
+@HAVE_LIBAPM_FALSE@APMINC =
SUBDIRS = docs sounds $(APMDIR)
-@@ -196,7 +196,7 @@
- battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
- battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES =
--@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =
+@@ -223,8 +223,7 @@
+ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
+ @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
+ @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \
+-@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \
+-@HAVE_LIBAPM_FALSE@apmlib/libapm.a
++@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la
battstat_applet_2_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 8f9a65377..8b825f3df 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -143,6 +143,7 @@ share/gnome/gkb/IT_Italian.keyprop
share/gnome/gkb/IT_Italian_x.keyprop
share/gnome/gkb/JP_Japanese.keyprop
share/gnome/gkb/JP_Japanese_x.keyprop
+share/gnome/gkb/KR_Korean.keyprop
share/gnome/gkb/LA_Lao_x.keyprop
share/gnome/gkb/LT_Lithuanian.keyprop
share/gnome/gkb/LT_Lithuanian_x.keyprop
@@ -195,9 +196,10 @@ share/gnome/gkb/US.keyprop
share/gnome/gkb/US_English.keyprop
share/gnome/gkb/US_international.keyprop
share/gnome/gkb/VN_Vietnamese.keyprop
-share/gnome/gkb/YU_Serbo-Croatian_x.keyprop
+share/gnome/gkb/YU_Serb_x.keyprop
share/gnome/gkb/Yugoslav.keyprop
-%%BATTER%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
+share/gnome/gkb/presets.xml
+%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml
share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml
share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml
@@ -305,6 +307,7 @@ share/gnome/pixmaps/gkb/it.png
share/gnome/pixmaps/gkb/jo.png
share/gnome/pixmaps/gkb/jp.png
share/gnome/pixmaps/gkb/km.png
+share/gnome/pixmaps/gkb/kr.png
share/gnome/pixmaps/gkb/kw.png
share/gnome/pixmaps/gkb/lam.png
share/gnome/pixmaps/gkb/la.png
@@ -329,6 +332,7 @@ share/gnome/pixmaps/gkb/se.png
share/gnome/pixmaps/gkb/si.png
share/gnome/pixmaps/gkb/sk.png
share/gnome/pixmaps/gkb/so.png
+share/gnome/pixmaps/gkb/sr.png
share/gnome/pixmaps/gkb/su.png
share/gnome/pixmaps/gkb/sv.png
share/gnome/pixmaps/gkb/sy.png
@@ -351,6 +355,11 @@ share/gnome/pixmaps/gweather/tstorm.xpm
share/gnome/pixmaps/mini-commander/browser-mini.xpm
share/gnome/pixmaps/mini-commander/history-mini.xpm
share/gnome/pixmaps/mixer/gnome-mixer-applet.png
+share/gnome/pixmaps/mixer/volume-max.png
+share/gnome/pixmaps/mixer/volume-medium.png
+share/gnome/pixmaps/mixer/volume-min.png
+share/gnome/pixmaps/mixer/volume-mute.png
+share/gnome/pixmaps/mixer/volume-zero.png
share/gnome/pixmaps/wireless-applet/broken-0.png
share/gnome/pixmaps/wireless-applet/no-link-0.png
share/gnome/pixmaps/wireless-applet/signal-1-40.png
@@ -399,6 +408,7 @@ share/gnome/xmodmap/xmodmap.il_phonetic
share/gnome/xmodmap/xmodmap.is
share/gnome/xmodmap/xmodmap.it
share/gnome/xmodmap/xmodmap.jp
+share/gnome/xmodmap/xmodmap.kr
share/gnome/xmodmap/xmodmap.la
share/gnome/xmodmap/xmodmap.lt
share/gnome/xmodmap/xmodmap.lt_b
@@ -461,6 +471,7 @@ share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
@@ -511,7 +522,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/gweather
@dirrm share/gnome/gkb
@dirrm share/gnome/gen_util
-@dirrm share/gnome/geyes
%%BATTERY%%@dirrm share/gnome/battstat_applet
@dirrm libexec/gnome-applets
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index c8b00beef..97c349033 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 2.1.1
+PORTVERSION= 2.1.3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-applets/2.1
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOMENG= yes
-USE_GNOME= gnomeprefix gnomehack
+USE_GNOME= gnomehier gnomeprefix gnomehack
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 2a0e0aa7e..1d43a59e3 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.1.1.tar.bz2) = f8e24f9480b13815215d626ee36cff17
+MD5 (gnome2/gnome-applets-2.1.3.tar.bz2) = 93d45863336a87b143df0b7cb7a24dfb
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index 6e97117be..fc72f4f9e 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig Sun Nov 3 14:13:35 2002
-+++ configure Mon Nov 11 16:56:45 2002
-@@ -5682,6 +5682,7 @@
+--- configure.orig Mon Dec 16 17:15:36 2002
++++ configure Thu Dec 19 13:43:27 2002
+@@ -7862,6 +7862,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
++c_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8918,6 +8919,7 @@
+@@ -12328,6 +12329,7 @@
*irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
*linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
*netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -16,41 +16,41 @@
*solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
esac
case "$host" in
-@@ -8980,6 +8982,20 @@
+@@ -12391,6 +12393,20 @@
fi
-
+
;;
+ i386-*-freebsd*)
-+ HAVE_LIBAPM=no
++ HAVE_LIBAPM=no
+if test "x$HAVE_LIBAPM" = "xyes"; then
-+ HAVE_LIBAPM_TRUE=
-+ HAVE_LIBAPM_FALSE='#'
++ HAVE_LIBAPM_TRUE=
++ HAVE_LIBAPM_FALSE='#'
+else
-+ HAVE_LIBAPM_TRUE='#'
-+ HAVE_LIBAPM_FALSE=
++ HAVE_LIBAPM_TRUE='#'
++ HAVE_LIBAPM_FALSE=
+fi
-+ ;;
++ ;;
+ *-*-freebsd*)
-+ build_battstat_applet=no
++ build_battstat_applet=no
+
-+ ;;
++ ;;
*-*-linux*)
- echo $ac_n "checking for apm_read in -lapm""... $ac_c" 1>&6
- echo "configure:8986: checking for apm_read in -lapm" >&5
-@@ -9567,14 +9583,14 @@
+ echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
+ echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6
+@@ -13688,14 +13704,14 @@
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
-#define GNOME_ICONDIR "${prefix}/share/pixmaps"
+#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
+ _ACEOF
- #defined the below to enable help to work for applets
+ #defined the below to enable help to work for applets
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
-#define DATADIR "${prefix}/share"
+#define DATADIR "${datadir}"
- EOF
+ _ACEOF
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
index 6b05c2b4e..f47e6bab6 100644
--- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in
+++ b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
@@ -1,26 +1,27 @@
---- battstat/Makefile.in.orig Mon Nov 11 16:57:08 2002
-+++ battstat/Makefile.in Mon Nov 11 16:58:06 2002
-@@ -146,11 +146,11 @@
+--- battstat/Makefile.in.orig Thu Dec 19 13:50:27 2002
++++ battstat/Makefile.in Thu Dec 19 13:51:02 2002
+@@ -148,11 +148,11 @@
pixmapsdir = $(datadir)/pixmaps
pixmaps_DATA = battstat.png
- @HAVE_LIBAPM_TRUE@APMLIB = -lapm
--@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
+ @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
+-@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
+@HAVE_LIBAPM_FALSE@APMLIB =
@HAVE_LIBAPM_TRUE@APMDIR =
--@HAVE_LIBAPM_FALSE@APMDIR = apmlib
+-@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
+@HAVE_LIBAPM_FALSE@APMDIR =
@HAVE_LIBAPM_TRUE@APMINC =
--@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
+-@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
+@HAVE_LIBAPM_FALSE@APMINC =
SUBDIRS = docs sounds $(APMDIR)
-@@ -196,7 +196,7 @@
- battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
- battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES =
--@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =
+@@ -223,8 +223,7 @@
+ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
+ @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
+ @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \
+-@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \
+-@HAVE_LIBAPM_FALSE@apmlib/libapm.a
++@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la
battstat_applet_2_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 8f9a65377..8b825f3df 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -143,6 +143,7 @@ share/gnome/gkb/IT_Italian.keyprop
share/gnome/gkb/IT_Italian_x.keyprop
share/gnome/gkb/JP_Japanese.keyprop
share/gnome/gkb/JP_Japanese_x.keyprop
+share/gnome/gkb/KR_Korean.keyprop
share/gnome/gkb/LA_Lao_x.keyprop
share/gnome/gkb/LT_Lithuanian.keyprop
share/gnome/gkb/LT_Lithuanian_x.keyprop
@@ -195,9 +196,10 @@ share/gnome/gkb/US.keyprop
share/gnome/gkb/US_English.keyprop
share/gnome/gkb/US_international.keyprop
share/gnome/gkb/VN_Vietnamese.keyprop
-share/gnome/gkb/YU_Serbo-Croatian_x.keyprop
+share/gnome/gkb/YU_Serb_x.keyprop
share/gnome/gkb/Yugoslav.keyprop
-%%BATTER%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
+share/gnome/gkb/presets.xml
+%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml
share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml
share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml
@@ -305,6 +307,7 @@ share/gnome/pixmaps/gkb/it.png
share/gnome/pixmaps/gkb/jo.png
share/gnome/pixmaps/gkb/jp.png
share/gnome/pixmaps/gkb/km.png
+share/gnome/pixmaps/gkb/kr.png
share/gnome/pixmaps/gkb/kw.png
share/gnome/pixmaps/gkb/lam.png
share/gnome/pixmaps/gkb/la.png
@@ -329,6 +332,7 @@ share/gnome/pixmaps/gkb/se.png
share/gnome/pixmaps/gkb/si.png
share/gnome/pixmaps/gkb/sk.png
share/gnome/pixmaps/gkb/so.png
+share/gnome/pixmaps/gkb/sr.png
share/gnome/pixmaps/gkb/su.png
share/gnome/pixmaps/gkb/sv.png
share/gnome/pixmaps/gkb/sy.png
@@ -351,6 +355,11 @@ share/gnome/pixmaps/gweather/tstorm.xpm
share/gnome/pixmaps/mini-commander/browser-mini.xpm
share/gnome/pixmaps/mini-commander/history-mini.xpm
share/gnome/pixmaps/mixer/gnome-mixer-applet.png
+share/gnome/pixmaps/mixer/volume-max.png
+share/gnome/pixmaps/mixer/volume-medium.png
+share/gnome/pixmaps/mixer/volume-min.png
+share/gnome/pixmaps/mixer/volume-mute.png
+share/gnome/pixmaps/mixer/volume-zero.png
share/gnome/pixmaps/wireless-applet/broken-0.png
share/gnome/pixmaps/wireless-applet/no-link-0.png
share/gnome/pixmaps/wireless-applet/signal-1-40.png
@@ -399,6 +408,7 @@ share/gnome/xmodmap/xmodmap.il_phonetic
share/gnome/xmodmap/xmodmap.is
share/gnome/xmodmap/xmodmap.it
share/gnome/xmodmap/xmodmap.jp
+share/gnome/xmodmap/xmodmap.kr
share/gnome/xmodmap/xmodmap.la
share/gnome/xmodmap/xmodmap.lt
share/gnome/xmodmap/xmodmap.lt_b
@@ -461,6 +471,7 @@ share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
@@ -511,7 +522,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/gweather
@dirrm share/gnome/gkb
@dirrm share/gnome/gen_util
-@dirrm share/gnome/geyes
%%BATTERY%%@dirrm share/gnome/battstat_applet
@dirrm libexec/gnome-applets
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs