Update to 2.12.1:

gnome-control-center 2.12.1

background:
- Make sure that the filename is valid utf8 and the file exists with utf8
  encoding, or fall back to filename encoding as specified by the user
  with glib's environment variables (Rodney Dawes) (168604)
- Set the style property "action-area-border (Rodney Dawes) (313680)

default-applications:
- List evolution-2.4 binary (Jan de Groot) (#315871)

gnome-settings-daemon:
- Don't leak the cursor theme name (Kjartan Maraas) (#314692)

mouse:
- fix a crasher when the cursor theme has no icon (Sebastien Bacher) (#317749)
- guard against invalid values from the GtkHScale widget (Rodrigo Moya)

themus:
- fix a typo with the StartupNotify option (Vincent Fretin) (#316159)

other:
- if the xcursor extension can't be found just build without xcursor support
  (Brian Cameron) (#316875)


translations:
Rostislav \"zbrox\" Raykov (bg)
Progga (bn)
Miloslav Trmac (cs)
Francisco Javier F. Serrador (es)
Ivar Smolin (et)
Iñaki Larrañaga Murgoitio (eu)
Christophe Merlet (RedFox) (fr)
Ignacio Casal Quinteiro (gl)
Erdal Ronahi (ku)
Christian Rose (sv)
Clytie Siddall (vi)
Funda Wang (zh_CN)

------------------------------------------------------------------------------
gnome-control-center 2.12.0

translations:
Jordi Mallach (ca)
Miloslav Trmac (cs)
Rhys Jones (cy)
Hendrik Richter (de)
Francisco Javier F. Serrador (es)
Vincent Untz (fr)
Gabor Kelemen (hu)
Young-Ho Cha (ko)
Reinout van Schouwen (nl)
Gnome PL Team (pl)
Evandro Fernandes Giovanini (pt_BR)
Duarte Loreto (pt)
Leonid Kanter (ru)
Marcel Telka (sk)
Elian Myftiu (sq)
Слободан Д. Средојевић (sr)
Baris Cicek (tr)
Clytie Siddall (vi)

------------------------------------------------------------------------------
gnome-control-center 2.11.92

about-me:
- typo fix (Francisco Javier F. Serrado) (#312845)
- use "wrapped" instead of "one" to handler the case where the passwd command
  finds the password wrapped. Use a long delay period.
  (Jaap Hatsima) (#312092)
- use integer to avoid comparison being always true due to limited range
  (Olaf Heiring).

background:

- Enable/disable the style-menu, shading-menu and color-picker buttons
  w.r.t gconf-keys (Veerapuram Varadhan).
- Replace the changing of some GtkDialog defaults through style properties with
  calls to gtk_widget_ensure_style and gtk_container_set_border_width
  (Rodney Dawes) (#313680)
- If the value for the "picture_options" key is set to "none", don't set the
  optin menu for the scaling options to tiled (Rodney Dawes) (#313883).

common:
- Get the Example icon that is specified by the icon theme, if it exists,
  and then fall back through a better list of icons to use (Rodney Dawes).

keyboard:
- don't use a page value, fix the different behaviour between widgets
  (Sebastien Bacher) (#301470).

other:
- configure fixes (Sergey V. Udaltsov, Ray Strode, Christian Persch)
- fix a leak (Rodrigo Moya)

translations:
Jens Seidel (de)
Kostas Papadimas (el)
Francisco Javier F. Serrador (es)
Ivar Smolin (et)
Gabor Kelemen (hu)
Mohammad DAMT (id)
Takeshi AIHANA (ja)
Žygimantas Beručka (lt)
Terance Edward Sola (nb)
Terance Edward Sola (no)
Sebastian Ivan (ro)
Слободан Д. Средојевић (sr)
Baris Cicek (tr)
Maxim V. Dziumanenko (uk)
Funda Wang (zh_CN)
Woodman Tuen (zh_TW)

------------------------------------------------------------------------------
gnome-control-center 2.11.91

about-me:

- fix the crash when closing the password dialog with the windo manager button
  (Diego Gonzalez) (#309736, #312580)
- change signature and handle error conditions from passwd (Diego Gonzalez)
  (#312092)
- handle protocol errors from EDS. (Diego Gonzalez) (#312450)

build:

- fix the build without gstreamer and with alsa (Paul Drain) (#307368)

fontilus:

- follow symlinks when getting info (Paolo Borelli) (#309744)

mouse:

- don't crash if there is no cursor theme installed (Sebastien Bacher)
  (#311599)
- update dynamically the double click label (Sebastien Bacher) (#166908)
- update of the glade file, no need to restart the session to apply
  the changes with GTK 2.8 (Sebastien Bacher) (#312070)


translations:

Rostislav \"zbrox\" Raykov (bg)
Miloslav Trmac (cs)
Adam Weinberger (en_CA)
Francisco Javier F. Serrador (es)
Ivar Smolin (et)
Ilkka Tuohela (fi)
Ankit Patel (gu)
Yuval Tanny (he)
Gabor Kelemen (hu)
Takeshi AIHANA (ja)
Terance Edward Sola (nb)
Reinout van Schouwen (nl)
Terance Edward Sola (no)
Marcel Telka (sk)
Слободан Д. Средојевић (sr)
Prajasakti Localisation Team (te)
Theppitak Karoonboonyanan (th)
Clytie Siddall (vi)
Funda Wang (zh_CN)

------------------------------------------------------------------------------
gnome-control-center 2.11.90

general:

- change the way XKB GConf preferences are handled so that:
  1) GConf keys are never written unless the user changes the preferences
  2) If the keys are unset, the default XKB settings are used
  (Mark McLoughlin) (#310513)
- remove wm-properties (Mark McLoughlin)
- switch to gnome-doc-utils (Sebastien Bacher)
- set windows' icon for the keyboard dialogs (Jaap A. Haitsma) (#305096)
- set a default icon for the capplets (Jaap A. Haitsma) (#305086)
- try to run gnome-screensaver before xscreensaver (Rodrigo Moya) (#302347)

about-me:

- change the order of the buttons to match the HIG (Denis Cranston) (#309632)

background:

- if xmlParseFile returns NULL, then just return, rather than trying to parse
  the document (Rodney Dawes) (#310041)
- update menu option when scrolling with the mouse (Sebastien Bacher) (#157396)
- use GtkColorButton instead of GnomeColorPicker (Sebastien Bacher) (#171676)

ui-properties:

- show a label with the "Text beside icons" mode (Sebastien Bacher) (#308845)

translations:

Rostislav \"zbrox\" Raykov (bg)
Miloslav Trmac (cs)
Hendrik Brandt (de)
Kostas Papadimas (el)
Adam Weinberger (en_CA)
Francisco Javier F. Serrador (es)
Priit Laes (et)
Ignacio Casal Quinteiro (gl)
Ankit Patel (gu)
Takeshi AIHANA (ja)
Terance Edward Sola (nb)
Reinout van Schouwen (nl)
Terance Edward Sola (no)
Marcel Telka (sk)
Theppitak Karoonboonyanan (th)
Clytie Siddall (vi)
Funda Wang (zh_CN)

------------------------------------------------------------------------------
gnome-control-center 2.11.6

general:

- expose the cursor theme settings as xsettings (Matthias Clasen) (#308104)
- fix a typo with a .schemas name (Jan Schmidt) (#307388)
- fix the markup usage of the XKB dialog (Sebastien Bacher) (#308279)
- make the copy dialog consistent with nautilus (William Jon McCann) (#309217)
- require libxft 2.1.7 (Christian Lohmaier) (#309558)

about-me:

- fix some typo (Clytie Siddall) (#302614)
- set dialog icon (Jaap A. Haitsma) (#309342)
- HIG fixes (Dennis Cranston) (#309952)
- improve the behaviour of the capplet when using large images (Diego Gonzalez)
- commit the changes so that we don't loose any data (Diego Gonzalez) (#309737)
- fix image loading when draging an image on the image button (Diego Gonzalez)
  (#309628)
- change the maxium width and height permitted on an image (Diego Gonzalez)
  (#309643)

background:

- fixed some leaks (Rodney Dawes, Kjartan Maraas)
- replace GnomeIconTheme by GtkIconTheme (Rodney Dawes, Jan de Groot) (#171677)

mouse:

- new cursor theme manager for the mouse capplet
  (Sven Herzberg, Matthias Clasen) (#110670)

translators:

Miloslav Trmac (cs)
Adam Weinberger (en_CA)
Francisco Javier F. Serrador (es)
Ivar Smolin (et)
Ignacio Casal Quinteiro (gl)
Terance Edward Sola (nb)
Reinout van Schouwen (nl)
Terance Edward Sola (no)
Marcel Telka (sk)
Theppitak Karoonboonyanan (th)

------------------------------------------------------------------------------
gnome-control-center 2.11.5

- new "about-me" capplet by Diego Gonzalez <diego@pemas.net>

translators:

Hendrik Richter (de)
Adam Weinberger (en_CA)
Ivar Smolin (et)
Meelad Zakaria (fa)
Terance Edward Sola (nb)
Reinout van Schouwen (nl)
Terance Edward Sola (no)
Marcel Telka (sk)
Elian Myftiu (sq)
Christian Rose (sv)
Theppitak Karoonboonyanan (th)
Funda Wang (zh_CN)
Woodman Tuen (zh_TW)

------------------------------------------------------------------------------
gnome-control-center 2.11.4

- fix a crasher with the clipboard manager (Sebastien Bacher)
- fix a crasher when changing the volume with the multimedia keys
  (Christophe Fergeau)
- make the sticky keys and slow keys dialog HIG compliants
  (Carlos Garnacho Parro)

------------------------------------------------------------------------------
gnome-control-center 2.11.3

- fix mute handling, particularly for devices without hardware mute support
  or with applications that use volume=0 for mute (Ronald S. Bultje)
- clipboard manager (Anders Carlsson)
- canvas a11y support (Carlos Garnacho Parro)
- name and description to the object information (Rodrigo Moya)


translator:

Vladimir Petkov (bg)
Miloslav Trmac (cs)
Rhys Jones (cy)
Martin Willemoes Hansen (da)
Adam Weinberger (en_CA)
Alessio Dessì (it)
Takeshi AIHANA (ja)
Kjartan Maraas (nb)
Kjartan Maraas (no)
Elian Myftiu (sq)
Theppitak Karoonboonyanan (th)

------------------------------------------------------------------------------
gnome-control-center 2.11.1

- allow to configure the menubar shortcut (Sebastien Bacher)
- new shell layout code (Carlos Garnacho Parro)
- port of the font capplet to gtk_font_button and some cleanup (Paolo Borelli)
- make proxy settings HIG compliant (Jorn Baayen)
- lot of cleanups (Kjartan Maraas)
- don't list themes using the Hidden property (Shakti Sen).
- fix the theme preview crasher with xorg/composite (Colin Gibbs)

translators:

Vladimir Petkov (bg)
Miloslav Trmac (cs)
Kostas Papadimas (el)
Adam Weinberger (en_CA)
Ivar Smolin (et)
Iñaki Larrañaga Murgoitio (eu)
Gabor Kelemen (hu)
Elian Myftiu (sq)
Maxim Dziumanenko (uk)
Canonical Ltd (xh)

5 files changed, 36 insertions, 38 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 0f627e09e8f..a92cccb09f0 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2005/08/21 11:29:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.50 2005/10/12 21:55:02 jmmv Exp $
 #
 
-DISTNAME=	control-center-2.10.2
+DISTNAME=	control-center-2.12.1
 PKGNAME=	gnome2-${DISTNAME}
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.12/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -24,6 +24,8 @@ USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--disable-alsa
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+INSTALL_MAKE_FLAGS+=	vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
+
 GCONF2_SCHEMAS= 	apps_gnome_settings_daemon_default_editor.schemas
 GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_keybindings.schemas
 GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_screensaver.schemas
@@ -60,13 +62,14 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../wm/metacity/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/xcursor/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index 73c9d674514..43a3b14f449 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/08/12 15:59:22 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/10/12 21:55:02 jmmv Exp $
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
 bin/gnome-background-properties
@@ -119,6 +119,21 @@ share/gconf/schemas/themus.schemas
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/help/control-center/C/config-accessibility-keyboard.xml
+share/gnome/help/control-center/C/config-background.xml
+share/gnome/help/control-center/C/config-behavior.xml
+share/gnome/help/control-center/C/config-cds.xml
+share/gnome/help/control-center/C/config-default-apps.xml
+share/gnome/help/control-center/C/config-file-type.xml
+share/gnome/help/control-center/C/config-hints.xml
+share/gnome/help/control-center/C/config-html.xml
+share/gnome/help/control-center/C/config-kbd.xml
+share/gnome/help/control-center/C/config-keybindings.xml
+share/gnome/help/control-center/C/config-mouse.xml
+share/gnome/help/control-center/C/config-screensaver.xml
+share/gnome/help/control-center/C/config-sound.xml
+share/gnome/help/control-center/C/config-themes.xml
+share/gnome/help/control-center/C/control-center.xml
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
 share/icons/hicolor/48x48/apps/gnome-control-center.png
@@ -158,6 +173,7 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/control-center-2.0.mo
@@ -184,6 +200,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/te/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/control-center-2.0.mo
@@ -193,11 +210,17 @@ ${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/control-center-2.0.mo
+share/omf/control-center/control-center-C.omf
 share/pixmaps/display-capplet.png
 @comment in xdg-dirs: @dirrm share/pixmaps
+@dirrm share/omf/control-center
+@comment in scrollkeeper: @dirrm share/omf
 @comment in ORBit2: @dirrm share/idl
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/gnome/vfolders
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome/cursor-fonts
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf2: @dirrm share/gconf/schemas
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 0f69711e603..594b2ad171b 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.22 2005/08/21 11:29:24 jmmv Exp $
+$NetBSD: distinfo,v 1.23 2005/10/12 21:55:02 jmmv Exp $
 
-SHA1 (control-center-2.10.2.tar.bz2) = 96daf4aff313bb9ee0abbb2b23af15cebd92206b
-RMD160 (control-center-2.10.2.tar.bz2) = 6c73d3c2c00fee3ee774bf0a10994af00af73625
-Size (control-center-2.10.2.tar.bz2) = 2833639 bytes
+SHA1 (control-center-2.12.1.tar.bz2) = fc648f7535eb01da64c1c47d9bef420b1c9b0927
+RMD160 (control-center-2.12.1.tar.bz2) = 297369394c20b453aea1345d389a731328f8c611
+Size (control-center-2.12.1.tar.bz2) = 1771524 bytes
 SHA1 (patch-aa) = 826bd6ef91135a61a86450ff150662156c833ae8
-SHA1 (patch-ab) = a522bf7b8d1108b2350bbc35125bc794a1fb0ac7
-SHA1 (patch-ac) = 0bec26fa35730ddd706ec8e80855d1bc72b1dd7d
 SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
 SHA1 (patch-af) = 50f179c3d2775f0a058d7644f6f9a0b958f4b531
diff --git a/x11/gnome2-control-center/patches/patch-ab b/x11/gnome2-control-center/patches/patch-ab
deleted file mode 100644
index 49c17d71c1b..00000000000
--- a/x11/gnome2-control-center/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/03/22 16:17:10 jmmv Exp $
-
---- vfs-methods/fontilus/Makefile.in.orig	2005-03-08 01:35:10.000000000 +0100
-+++ vfs-methods/fontilus/Makefile.in
-@@ -303,7 +303,7 @@ libnautilus_fontilus_la_LDFLAGS = -modul
- libnautilus_fontilus_la_LIBADD = $(FONT_CONTEXT_MENU_LIBS)
- libnautilus_fontilus_la_SOURCES = fontilus-context-menu.c
- 
--vfsmoduleconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
-+vfsmoduleconfdir = $(datadir)/examples/gnome2-control-center
- vfsmoduleconf_DATA = font-method.conf
- 
- vfsdirectorydir = $(datadir)/gnome/vfolders
diff --git a/x11/gnome2-control-center/patches/patch-ac b/x11/gnome2-control-center/patches/patch-ac
deleted file mode 100644
index 991a5a774ca..00000000000
--- a/x11/gnome2-control-center/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/03/22 16:17:10 jmmv Exp $
-
---- vfs-methods/themus/Makefile.in.orig	2005-03-08 01:35:10.000000000 +0100
-+++ vfs-methods/themus/Makefile.in
-@@ -328,7 +328,7 @@ libnautilus_themus_la_SOURCES = \
- Gladedir = $(GNOMECC_GLADE_DIR)
- Glade_DATA = apply-font.glade
- 
--vfsmoduleconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
-+vfsmoduleconfdir = $(datadir)/examples/gnome2-control-center
- vfsmoduleconf_DATA = theme-method.conf
- 
- vfsdirectorydir = $(datadir)/gnome/vfolders