--- control-center-2.18.1.orig/debian/patches/02_xrdb.patch +++ control-center-2.18.1/debian/patches/02_xrdb.patch @@ -0,0 +1,12 @@ +diff -Nur control-center-2.17.91/gnome-settings-daemon/gnome-settings-xrdb.c control-center-2.17.91.new/gnome-settings-daemon/gnome-settings-xrdb.c +--- control-center-2.17.91/gnome-settings-daemon/gnome-settings-xrdb.c 2007-02-05 12:11:42.000000000 +0100 ++++ control-center-2.17.91.new/gnome-settings-daemon/gnome-settings-xrdb.c 2007-02-13 10:25:09.000000000 +0100 +@@ -32,7 +32,7 @@ + #include "gnome-settings-daemon.h" + #include "gnome-settings-xrdb.h" + +-#define SYSTEM_AD_DIR GNOMECC_DATA_DIR "/xrdb" ++#define SYSTEM_AD_DIR "/etc/gnome/config" + #define GENERAL_AD SYSTEM_AD_DIR "/General.ad" + #define USER_AD_DIR ".gnome2/xrdb" + #define USER_X_RESOURCES ".Xresources" --- control-center-2.18.1.orig/debian/patches/90_workaround_gnome_doc_utils_bug.patch +++ control-center-2.18.1/debian/patches/90_workaround_gnome_doc_utils_bug.patch @@ -0,0 +1,89 @@ +diff -Nur control-center-2.18.1/help/Makefile.in control-center-2.18.1.new/help/Makefile.in +--- control-center-2.18.1/help/Makefile.in 2007-04-10 13:56:16.000000000 +0200 ++++ control-center-2.18.1.new/help/Makefile.in 2007-04-10 22:13:17.000000000 +0200 +@@ -138,6 +138,8 @@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ + GDK_PIXBUF_CSOURCE_32 = @GDK_PIXBUF_CSOURCE_32@ ++GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@ ++GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GMOFILES = @GMOFILES@ +@@ -322,7 +324,6 @@ + $(filter $(LINGUAS),$(DOC_LINGUAS)), \ + $(DOC_LINGUAS)) + +-_DOC_ABS_SRCDIR = @abs_srcdir@ + + ################################################################################ + db2omf_args = \ +@@ -334,11 +335,11 @@ + --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ + --stringparam db2omf.omf_dir "$(OMF_DIR)" \ + --stringparam db2omf.help_dir "$(HELP_DIR)" \ +- --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ ++ --stringparam db2omf.omf_in "`pwd`/$(_DOC_OMF_IN)" \ + --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)" \ + $(_db2omf) $(2) + +-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) ++_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(srcdir)/$(DOC_MODULE).omf.in)) + _DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ + $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) + +@@ -629,17 +630,13 @@ + done; + cp $@.tmp $@ && rm -f $@.tmp + +-dist-check-gdu: +-@HAVE_GNOME_DOC_UTILS_FALSE@ @echo "*** GNOME Doc Utils must be installed in order to make dist" +-@HAVE_GNOME_DOC_UTILS_FALSE@ @false +- + .PHONY: dist-doc-header + dist-doc-header: $(DOC_H_FILE) + @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ + echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ + $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; + +-doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) ++doc-dist-hook: $(if $(DOC_H_FILE),dist-doc-header) + + .PHONY: clean-doc-header + clean-local: $(_clean_doc_header) +@@ -675,9 +672,9 @@ + _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl + _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl + +-@ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` +-@ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` +-@ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml ++_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` ++_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` ++_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml + + $(_DOC_OMF_DB) : $(_DOC_OMF_IN) + $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml +@@ -712,7 +709,11 @@ + fi; + @docs=; \ + list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ +- docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ ++ if test -f $$doc; then \ ++ docs="$$docs ../$$doc"; \ ++ else \ ++ docs="$$docs ../$(srcdir)/$$doc"; \ ++ fi; \ + done; \ + if ! test -f $@; then \ + echo "(cd $(dir $@) && \ +@@ -733,7 +734,8 @@ + $(_DOC_LC_DOCS) : $(_DOC_POFILES) + $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) + if ! test -d $(dir $@); then mkdir $(dir $@); fi +- if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ ++ case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";; esac; \ ++ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \ + (cd $(dir $@) && \ + $(_xml2po) -e -p \ + "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \ --- control-center-2.18.1.orig/debian/patches/70_from_bugzilla_extra_titlebar_actions_listed.patch +++ control-center-2.18.1/debian/patches/70_from_bugzilla_extra_titlebar_actions_listed.patch @@ -0,0 +1,50 @@ +Index: libwindow-settings/metacity-window-manager.c +=================================================================== +--- libwindow-settings/metacity-window-manager.c (revision 7412) ++++ libwindow-settings/metacity-window-manager.c (working copy) +@@ -44,7 +44,9 @@ + enum + { + DOUBLE_CLICK_MAXIMIZE, +- DOUBLE_CLICK_SHADE ++ DOUBLE_CLICK_MINIMIZE, ++ DOUBLE_CLICK_SHADE, ++ DOUBLE_CLICK_NONE + }; + + static GnomeWindowManagerClass *parent_class; +@@ -209,6 +211,12 @@ metacity_change_settings (GnomeWindowMan + case DOUBLE_CLICK_MAXIMIZE: + action = "toggle_maximize"; + break; ++ case DOUBLE_CLICK_MINIMIZE: ++ action = "minimize"; ++ break; ++ case DOUBLE_CLICK_NONE: ++ action = "none"; ++ break; + } + + if (action != NULL) { +@@ -354,6 +362,10 @@ metacity_get_settings (GnomeWindowManage + settings->double_click_action = DOUBLE_CLICK_SHADE; + else if (strcmp (str, "toggle_maximize") == 0) + settings->double_click_action = DOUBLE_CLICK_MAXIMIZE; ++ else if (strcmp (str, "minimize") == 0) ++ settings->double_click_action = DOUBLE_CLICK_MINIMIZE; ++ else if (strcmp (str, "none") == 0) ++ settings->double_click_action = DOUBLE_CLICK_NONE; + else + settings->double_click_action = DOUBLE_CLICK_SHADE; + +@@ -376,7 +388,9 @@ metacity_get_double_click_actions (Gnome + { + static GnomeWMDoubleClickAction actions[] = { + { DOUBLE_CLICK_MAXIMIZE, N_("Maximize") }, +- { DOUBLE_CLICK_SHADE, N_("Roll up") } ++ { DOUBLE_CLICK_MINIMIZE, N_("Minimize") }, ++ { DOUBLE_CLICK_SHADE, N_("Roll up") }, ++ { DOUBLE_CLICK_NONE, N_("None") } + }; + static gboolean initialized = FALSE; + --- control-center-2.18.1.orig/debian/patches/37_use_dynamic_libslab.patch +++ control-center-2.18.1/debian/patches/37_use_dynamic_libslab.patch @@ -0,0 +1,24 @@ +diff -Nur control-center-2.18.1/configure control-center-2.18.1.new/configure +--- control-center-2.18.1/configure 2007-04-10 13:56:12.000000000 +0200 ++++ control-center-2.18.1.new/configure 2007-04-10 15:11:58.000000000 +0200 +@@ -26637,7 +26637,7 @@ + CPPFLAGS=$savecppflags + + +-ENABLE_DYNAMIC_LIBSLAB=0 ++ENABLE_DYNAMIC_LIBSLAB=1 + if test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1"; then + ENABLE_DYNAMIC_LIBSLAB_TRUE= + ENABLE_DYNAMIC_LIBSLAB_FALSE='#' +diff -Nur control-center-2.18.1/configure.in control-center-2.18.1.new/configure.in +--- control-center-2.18.1/configure.in 2007-04-10 15:11:35.000000000 +0200 ++++ control-center-2.18.1.new/configure.in 2007-04-10 15:11:48.000000000 +0200 +@@ -89,7 +89,7 @@ + dnl Check that we meet the dependencies + dnl ============================================== + +-ENABLE_DYNAMIC_LIBSLAB=0 ++ENABLE_DYNAMIC_LIBSLAB=1 + AM_CONDITIONAL(ENABLE_DYNAMIC_LIBSLAB, test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1") + + COMMON_MODULES="gtk+-2.0 >= 2.3.0 dnl --- control-center-2.18.1.orig/debian/patches/16_preferred_applications_list_cleanup.patch +++ control-center-2.18.1/debian/patches/16_preferred_applications_list_cleanup.patch @@ -0,0 +1,73 @@ +diff -Nur control-center-2.17.91/capplets/default-applications/gnome-default-applications.xml.in control-center-2.17.91.new/capplets/default-applications/gnome-default-applications.xml.in +--- control-center-2.17.91/capplets/default-applications/gnome-default-applications.xml.in 2007-02-19 19:00:10.000000000 +0100 ++++ control-center-2.17.91.new/capplets/default-applications/gnome-default-applications.xml.in 2007-02-19 19:02:32.000000000 +0100 +@@ -82,26 +82,6 @@ + iceweasel -remote "openurl(%s,new-window)" + + +- <_name>Mozilla 1.6 +- mozilla-1.6 +- mozilla-1.6 %s +- mozilla-icon +- false +- true +- mozilla-1.6 -remote "openurl(%s,new-tab)" +- mozilla-1.6 -remote "openurl(%s,new-window)" +- +- +- <_name>Mozilla +- mozilla +- mozilla %s +- mozilla-icon +- false +- true +- mozilla -remote "openurl(%s,new-tab)" +- mozilla -remote "openurl(%s,new-window)" +- +- + <_name>Netscape Communicator + netscape + netscape %s +@@ -120,14 +100,6 @@ + false + + +- <_name>W3M Text Browser +- w3m +- w3m %s +- gnome-mime-application-x-executable +- true +- false +- +- + <_name>Lynx Text Browser + lynx + lynx %s +@@ -154,13 +126,6 @@ + false + + +- <_name>Evolution Mail Reader 2.2 +- evolution-2.2 +- evolution-2.2 %s +- evolution +- false +- +- + <_name>Evolution Mail Reader 2.0 + evolution-2.0 + evolution-2.0 %s +@@ -231,13 +196,6 @@ + false + + +- <_name>Mozilla Mail +- mozilla +- mozilla -mail %s +- mozilla-mail-icon +- false +- +- + <_name>Mutt + mutt + mutt %s --- control-center-2.18.1.orig/debian/patches/36-compiz-keybindings-support.patch +++ control-center-2.18.1/debian/patches/36-compiz-keybindings-support.patch @@ -0,0 +1,23 @@ +diff -ruN control-center-2.17.91/capplets/common/wm-common.h control-center-2.17.91.new/capplets/common/wm-common.h +--- control-center-2.17.91/capplets/common/wm-common.h 2007-01-02 13:47:02.000000000 +0100 ++++ control-center-2.17.91.new/capplets/common/wm-common.h 2007-02-18 14:56:08.000000000 +0100 +@@ -3,6 +3,7 @@ + + #define WM_COMMON_METACITY "Metacity" + #define WM_COMMON_SAWFISH "Sawfish" ++#define WM_COMMON_COMPIZ "compiz" + #define WM_COMMON_UNKNOWN "Unknown" + + gchar *wm_common_get_current_window_manager (void); +diff -ruN control-center-2.17.91/capplets/keybindings/gnome-keybinding-properties.c control-center-2.17.91.new/capplets/keybindings/gnome-keybinding-properties.c +--- control-center-2.17.91/capplets/keybindings/gnome-keybinding-properties.c 2007-02-12 10:28:24.000000000 +0100 ++++ control-center-2.17.91.new/capplets/keybindings/gnome-keybinding-properties.c 2007-02-18 14:55:20.000000000 +0100 +@@ -568,7 +568,7 @@ + append_keys_to_tree (dialog, _("Desktop"), desktop_key_list); + append_keys_to_tree (dialog, _("Sound"), sounds_key_list); + +- if (strcmp((char *) wm_name, WM_COMMON_METACITY) == 0) ++ if (strcmp((char *) wm_name, WM_COMMON_METACITY) == 0 || strcmp((char *) wm_name, WM_COMMON_COMPIZ) == 0) + { + append_keys_to_tree (dialog, _("Window Management"), metacity_key_list); + } --- control-center-2.18.1.orig/debian/patches/25_window_manager_settings.patch +++ control-center-2.18.1/debian/patches/25_window_manager_settings.patch @@ -0,0 +1,1601 @@ +diff -Nur control-center-2.17.90/capplets/windows/Makefile.am control-center-2.17.90.new/capplets/windows/Makefile.am +--- control-center-2.17.90/capplets/windows/Makefile.am 2007-01-02 13:47:02.000000000 +0100 ++++ control-center-2.17.90.new/capplets/windows/Makefile.am 2007-01-23 10:25:07.000000000 +0100 +@@ -17,7 +17,7 @@ + + INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \ + -I$(top_srcdir)/libwindow-settings \ +- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ ++ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \ + -DGLADEDIR=\""$(gladedir)"\" \ + -DPIXMAPDIR=\""$(pixmapdir)"\" + +diff -Nur control-center-2.17.90/capplets/windows/Makefile.in control-center-2.17.90.new/capplets/windows/Makefile.in +--- control-center-2.17.90/capplets/windows/Makefile.in 2007-01-22 18:42:53.000000000 +0100 ++++ control-center-2.17.90.new/capplets/windows/Makefile.in 2007-01-23 10:25:07.000000000 +0100 +@@ -349,7 +349,7 @@ + desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) + INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \ + -I$(top_srcdir)/libwindow-settings \ +- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ ++ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \ + -DGLADEDIR=\""$(gladedir)"\" \ + -DPIXMAPDIR=\""$(pixmapdir)"\" + +diff -Nur control-center-2.17.90/capplets/windows/Makefile.in.orig control-center-2.17.90.new/capplets/windows/Makefile.in.orig +--- control-center-2.17.90/capplets/windows/Makefile.in.orig 1970-01-01 01:00:00.000000000 +0100 ++++ control-center-2.17.90.new/capplets/windows/Makefile.in.orig 2007-01-22 18:42:53.000000000 +0100 +@@ -0,0 +1,680 @@ ++# Makefile.in generated by automake 1.10 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++bin_PROGRAMS = gnome-window-properties$(EXEEXT) ++subdir = capplets/windows ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/window-properties.desktop.in.in ChangeLog ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ ++ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = window-properties.desktop.in ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ ++ "$(DESTDIR)$(gladedir)" ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++PROGRAMS = $(bin_PROGRAMS) ++am_gnome_window_properties_OBJECTS = \ ++ gnome-window-properties.$(OBJEXT) ++gnome_window_properties_OBJECTS = \ ++ $(am_gnome_window_properties_OBJECTS) ++am__DEPENDENCIES_1 = ++gnome_window_properties_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/libwindow-settings/libgnome-window-settings.la ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(gnome_window_properties_SOURCES) ++DIST_SOURCES = $(gnome_window_properties_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++desktopDATA_INSTALL = $(INSTALL_DATA) ++gladeDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(desktop_DATA) $(glade_DATA) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ABOUTME_LIBS = @ABOUTME_LIBS@ ++ACLOCAL = @ACLOCAL@ ++ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ++ALL_LINGUAS = @ALL_LINGUAS@ ++ALSA_CFLAGS = @ALSA_CFLAGS@ ++ALSA_LIBS = @ALSA_LIBS@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ ++AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ ++CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ ++CAPPLET_LIBS = @CAPPLET_LIBS@ ++CATALOGS = @CATALOGS@ ++CATOBJEXT = @CATOBJEXT@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CONFIG_ARCHIVER_INCLUDEDIR = @CONFIG_ARCHIVER_INCLUDEDIR@ ++CONFIG_ARCHIVER_LIBDIR = @CONFIG_ARCHIVER_LIBDIR@ ++CONFIG_ARCHIVER_LIBS = @CONFIG_ARCHIVER_LIBS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DATADIRNAME = @DATADIRNAME@ ++DBUS_CFLAGS = @DBUS_CFLAGS@ ++DBUS_LIBS = @DBUS_LIBS@ ++DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ ++DEFAULT_APPLICATIONS_CAPPLET_CFLAGS = @DEFAULT_APPLICATIONS_CAPPLET_CFLAGS@ ++DEFAULT_APPLICATIONS_CAPPLET_LIBS = @DEFAULT_APPLICATIONS_CAPPLET_LIBS@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DISPLAY_CAPPLET_CFLAGS = @DISPLAY_CAPPLET_CFLAGS@ ++DISPLAY_CAPPLET_LIBS = @DISPLAY_CAPPLET_LIBS@ ++DOC_USER_FORMATS = @DOC_USER_FORMATS@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++ESD_CFLAGS = @ESD_CFLAGS@ ++ESD_LIBS = @ESD_LIBS@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++FONTILUS = @FONTILUS@ ++FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@ ++FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@ ++FONT_CONTEXT_MENU_CFLAGS = @FONT_CONTEXT_MENU_CFLAGS@ ++FONT_CONTEXT_MENU_LIBS = @FONT_CONTEXT_MENU_LIBS@ ++FONT_METHOD_CFLAGS = @FONT_METHOD_CFLAGS@ ++FONT_METHOD_LIBS = @FONT_METHOD_LIBS@ ++FONT_THUMBNAILER_CFLAGS = @FONT_THUMBNAILER_CFLAGS@ ++FONT_THUMBNAILER_LIBS = @FONT_THUMBNAILER_LIBS@ ++FONT_VIEW_CFLAGS = @FONT_VIEW_CFLAGS@ ++FONT_VIEW_LIBS = @FONT_VIEW_LIBS@ ++FREETYPE_CONFIG = @FREETYPE_CONFIG@ ++GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ ++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ ++GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ ++GDK_PIXBUF_CSOURCE_32 = @GDK_PIXBUF_CSOURCE_32@ ++GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@ ++GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ ++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GMOFILES = @GMOFILES@ ++GMSGFMT = @GMSGFMT@ ++GNOMECC_CAPPLETS_CFLAGS = @GNOMECC_CAPPLETS_CFLAGS@ ++GNOMECC_CAPPLETS_CLEANFILES = @GNOMECC_CAPPLETS_CLEANFILES@ ++GNOMECC_CAPPLETS_EXTRA_DIST = @GNOMECC_CAPPLETS_EXTRA_DIST@ ++GNOMECC_CAPPLETS_LIBS = @GNOMECC_CAPPLETS_LIBS@ ++GNOMECC_CFLAGS = @GNOMECC_CFLAGS@ ++GNOMECC_GLADE_DIR = @GNOMECC_GLADE_DIR@ ++GNOMECC_ICONS_DIR = @GNOMECC_ICONS_DIR@ ++GNOMECC_LIBS = @GNOMECC_LIBS@ ++GNOMECC_PIXMAPS_DIR = @GNOMECC_PIXMAPS_DIR@ ++GNOME_CFLAGS = @GNOME_CFLAGS@ ++GNOME_DESKTOP_CFLAGS = @GNOME_DESKTOP_CFLAGS@ ++GNOME_DESKTOP_LIBS = @GNOME_DESKTOP_LIBS@ ++GNOME_LIBS = @GNOME_LIBS@ ++GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ ++GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ ++GREP = @GREP@ ++GST_CFLAGS = @GST_CFLAGS@ ++GST_LIBS = @GST_LIBS@ ++GTK_CFLAGS = @GTK_CFLAGS@ ++GTK_LIBS = @GTK_LIBS@ ++HAL_CFLAGS = @HAL_CFLAGS@ ++HAL_LIBS = @HAL_LIBS@ ++HELP_DIR = @HELP_DIR@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++INSTOBJEXT = @INSTOBJEXT@ ++INTLLIBS = @INTLLIBS@ ++INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ ++INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ ++INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++INTLTOOL_ICONV = @INTLTOOL_ICONV@ ++INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ ++INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ ++INTLTOOL_MERGE = @INTLTOOL_MERGE@ ++INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ ++INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ ++INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ ++INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ ++INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ ++INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ ++INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ ++INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ ++INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ ++INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ ++INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ ++INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ ++INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ ++INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ ++INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ ++LDFLAGS = @LDFLAGS@ ++LIBBONOBO_IDL_DIR = @LIBBONOBO_IDL_DIR@ ++LIBEBOOK_CFLAGS = @LIBEBOOK_CFLAGS@ ++LIBEBOOK_LIBS = @LIBEBOOK_LIBS@ ++LIBGNOMEKBDUI_CFLAGS = @LIBGNOMEKBDUI_CFLAGS@ ++LIBGNOMEKBDUI_LIBS = @LIBGNOMEKBDUI_LIBS@ ++LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS@ ++LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ ++LIBSLAB_LIBS = @LIBSLAB_LIBS@ ++LIBTOOL = @LIBTOOL@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++METACITY_CFLAGS = @METACITY_CFLAGS@ ++METACITY_LIBS = @METACITY_LIBS@ ++MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ ++MSGFMT = @MSGFMT@ ++OBJEXT = @OBJEXT@ ++OLD_CAPPLET_CFLAGS = @OLD_CAPPLET_CFLAGS@ ++OLD_CAPPLET_LIBS = @OLD_CAPPLET_LIBS@ ++OMF_DIR = @OMF_DIR@ ++ORBIT_IDL = @ORBIT_IDL@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PKG_CONFIG = @PKG_CONFIG@ ++POFILES = @POFILES@ ++POSUB = @POSUB@ ++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ ++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ ++RANLIB = @RANLIB@ ++SCREENSAVER_LIBS = @SCREENSAVER_LIBS@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ ++SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ ++STRIP = @STRIP@ ++THEME_METHOD_CFLAGS = @THEME_METHOD_CFLAGS@ ++THEME_METHOD_LIBS = @THEME_METHOD_LIBS@ ++THEMUS = @THEMUS@ ++THEMUS_APPLIER_CFLAGS = @THEMUS_APPLIER_CFLAGS@ ++THEMUS_APPLIER_LIBS = @THEMUS_APPLIER_LIBS@ ++THEMUS_COMPONENT_CFLAGS = @THEMUS_COMPONENT_CFLAGS@ ++THEMUS_COMPONENT_LIBS = @THEMUS_COMPONENT_LIBS@ ++THEMUS_THUMBNAILER_CFLAGS = @THEMUS_THUMBNAILER_CFLAGS@ ++THEMUS_THUMBNAILER_LIBS = @THEMUS_THUMBNAILER_LIBS@ ++TYPING_BREAK = @TYPING_BREAK@ ++UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ ++USE_NLS = @USE_NLS@ ++VERSION = @VERSION@ ++VFS_CAPPLET_CFLAGS = @VFS_CAPPLET_CFLAGS@ ++VFS_CAPPLET_LIBS = @VFS_CAPPLET_LIBS@ ++WARN_CFLAGS = @WARN_CFLAGS@ ++XCURSOR_CFLAGS = @XCURSOR_CFLAGS@ ++XCURSOR_LIBS = @XCURSOR_LIBS@ ++XF86MISC_LIBS = @XF86MISC_LIBS@ ++XGETTEXT = @XGETTEXT@ ++XMKMF = @XMKMF@ ++X_CFLAGS = @X_CFLAGS@ ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++X_LIBS = @X_LIBS@ ++X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++gnome_window_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) \ ++ $(top_builddir)/libwindow-settings/libgnome-window-settings.la ++ ++gnome_window_properties_SOURCES = \ ++ gnome-window-properties.c ++ ++gladedir = $(GNOMECC_GLADE_DIR) ++glade_DATA = gnome-window-properties.glade ++desktopdir = $(datadir)/applications ++Desktop_in_files = window-properties.desktop.in ++desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) ++INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \ ++ -I$(top_srcdir)/libwindow-settings \ ++ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ ++ -DGLADEDIR=\""$(gladedir)"\" \ ++ -DPIXMAPDIR=\""$(pixmapdir)"\" ++ ++CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) ++EXTRA_DIST = $(glade_DATA) ++all: all-am ++ ++.SUFFIXES: ++.SUFFIXES: .c .lo .o .obj ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu capplets/windows/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu capplets/windows/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++window-properties.desktop.in: $(top_builddir)/config.status $(srcdir)/window-properties.desktop.in.in ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ++install-binPROGRAMS: $(bin_PROGRAMS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ if test -f $$p \ ++ || test -f $$p1 \ ++ ; then \ ++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ else :; fi; \ ++ done ++ ++uninstall-binPROGRAMS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++ ++clean-binPROGRAMS: ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f $$p $$f"; \ ++ rm -f $$p $$f ; \ ++ done ++gnome-window-properties$(EXEEXT): $(gnome_window_properties_OBJECTS) $(gnome_window_properties_DEPENDENCIES) ++ @rm -f gnome-window-properties$(EXEEXT) ++ $(LINK) $(gnome_window_properties_OBJECTS) $(gnome_window_properties_LDADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-window-properties.Po@am__quote@ ++ ++.c.o: ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< ++ ++.c.obj: ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` ++ ++.c.lo: ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++install-desktopDATA: $(desktop_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" ++ @list='$(desktop_DATA)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ ++ $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ ++ done ++ ++uninstall-desktopDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(desktop_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ ++ done ++install-gladeDATA: $(glade_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ @list='$(glade_DATA)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ ++ $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ done ++ ++uninstall-gladeDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(glade_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(PROGRAMS) $(DATA) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-tags ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: install-desktopDATA install-gladeDATA ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binPROGRAMS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ ++ uninstall-gladeDATA ++ ++.MAKE: install-am install-strip ++ ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ++ clean-generic clean-libtool ctags distclean distclean-compile \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-binPROGRAMS install-data install-data-am \ ++ install-desktopDATA install-dvi install-dvi-am install-exec \ ++ install-exec-am install-gladeDATA install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-binPROGRAMS \ ++ uninstall-desktopDATA uninstall-gladeDATA ++ ++ ++@INTLTOOL_DESKTOP_RULE@ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -Nur control-center-2.17.90/libwindow-settings/Makefile.am control-center-2.17.90.new/libwindow-settings/Makefile.am +--- control-center-2.17.90/libwindow-settings/Makefile.am 2007-01-02 13:46:58.000000000 +0100 ++++ control-center-2.17.90.new/libwindow-settings/Makefile.am 2007-01-23 10:25:07.000000000 +0100 +@@ -1,4 +1,4 @@ +-WM_MODULE_DIR=$(libdir)/window-manager-settings ++WM_MODULE_DIR=$(libdir)/libgnome-window-settings1 + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +diff -Nur control-center-2.17.90/libwindow-settings/Makefile.in control-center-2.17.90.new/libwindow-settings/Makefile.in +--- control-center-2.17.90/libwindow-settings/Makefile.in 2007-01-22 18:42:58.000000000 +0100 ++++ control-center-2.17.90.new/libwindow-settings/Makefile.in 2007-01-23 10:25:40.000000000 +0100 +@@ -351,7 +351,7 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-WM_MODULE_DIR = $(libdir)/window-manager-settings ++WM_MODULE_DIR = $(libdir)/libgnome-window-settings1 + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ +diff -Nur control-center-2.17.90/Makefile.am.orig control-center-2.17.90.new/Makefile.am.orig +--- control-center-2.17.90/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100 ++++ control-center-2.17.90.new/Makefile.am.orig 2007-01-09 16:25:16.000000000 +0100 +@@ -0,0 +1,27 @@ ++SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods idl schemas $(TYPING_BREAK) ++ ++ACLOCAL_AMFLAGS = -I m4 ++ ++#I removed the root-manager for now ++# ++# it generated this error : ++# root-manager.c:55:31: security/pam_appl.h: No such file or directory ++# while compiling. I guess we need to check for pam or something ++# in the configure.in file. Since we are not using it now, i will ++# remove it from the default build. Chema ++ ++DISTCLEANFILES = \ ++ intltool-extract \ ++ intltool-merge \ ++ intltool-update \ ++ gnome-doc-utils.make ++ ++EXTRA_DIST = \ ++ control-center.spec.in \ ++ control-center.spec \ ++ intltool-extract.in \ ++ intltool-merge.in \ ++ intltool-update.in \ ++ gnome-doc-utils.make ++ ++DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb +diff -Nur control-center-2.17.90/Makefile.am.rej control-center-2.17.90.new/Makefile.am.rej +--- control-center-2.17.90/Makefile.am.rej 1970-01-01 01:00:00.000000000 +0100 ++++ control-center-2.17.90.new/Makefile.am.rej 2007-01-23 10:25:02.000000000 +0100 +@@ -0,0 +1,11 @@ ++*************** ++*** 1,4 **** ++- WM_MODULE_DIR=$(libdir)/window-manager-settings ++ ++ INCLUDES = \ ++ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ++--- 1,4 ---- +++ WM_MODULE_DIR=$(libdir)/libgnome-window-settings1 ++ ++ INCLUDES = \ ++ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +diff -Nur control-center-2.17.90/Makefile.in.orig control-center-2.17.90.new/Makefile.in.orig +--- control-center-2.17.90/Makefile.in.orig 1970-01-01 01:00:00.000000000 +0100 ++++ control-center-2.17.90.new/Makefile.in.orig 2007-01-22 18:43:02.000000000 +0100 +@@ -0,0 +1,801 @@ ++# Makefile.in generated by automake 1.10 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++subdir = . ++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ ++ $(srcdir)/control-center.spec.in $(top_srcdir)/configure \ ++ AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \ ++ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ ++ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno config.status.lineno ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = control-center.spec ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++distdir = $(PACKAGE)-$(VERSION) ++top_distdir = $(distdir) ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++DIST_ARCHIVES = $(distdir).tar.gz ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print ++ABOUTME_LIBS = @ABOUTME_LIBS@ ++ACLOCAL = @ACLOCAL@ ++ACLOCAL_AMFLAGS = -I m4 ++ALL_LINGUAS = @ALL_LINGUAS@ ++ALSA_CFLAGS = @ALSA_CFLAGS@ ++ALSA_LIBS = @ALSA_LIBS@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ ++AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ ++CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ ++CAPPLET_LIBS = @CAPPLET_LIBS@ ++CATALOGS = @CATALOGS@ ++CATOBJEXT = @CATOBJEXT@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CONFIG_ARCHIVER_INCLUDEDIR = @CONFIG_ARCHIVER_INCLUDEDIR@ ++CONFIG_ARCHIVER_LIBDIR = @CONFIG_ARCHIVER_LIBDIR@ ++CONFIG_ARCHIVER_LIBS = @CONFIG_ARCHIVER_LIBS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DATADIRNAME = @DATADIRNAME@ ++DBUS_CFLAGS = @DBUS_CFLAGS@ ++DBUS_LIBS = @DBUS_LIBS@ ++DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ ++DEFAULT_APPLICATIONS_CAPPLET_CFLAGS = @DEFAULT_APPLICATIONS_CAPPLET_CFLAGS@ ++DEFAULT_APPLICATIONS_CAPPLET_LIBS = @DEFAULT_APPLICATIONS_CAPPLET_LIBS@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DISPLAY_CAPPLET_CFLAGS = @DISPLAY_CAPPLET_CFLAGS@ ++DISPLAY_CAPPLET_LIBS = @DISPLAY_CAPPLET_LIBS@ ++DOC_USER_FORMATS = @DOC_USER_FORMATS@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++ESD_CFLAGS = @ESD_CFLAGS@ ++ESD_LIBS = @ESD_LIBS@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++FONTILUS = @FONTILUS@ ++FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@ ++FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@ ++FONT_CONTEXT_MENU_CFLAGS = @FONT_CONTEXT_MENU_CFLAGS@ ++FONT_CONTEXT_MENU_LIBS = @FONT_CONTEXT_MENU_LIBS@ ++FONT_METHOD_CFLAGS = @FONT_METHOD_CFLAGS@ ++FONT_METHOD_LIBS = @FONT_METHOD_LIBS@ ++FONT_THUMBNAILER_CFLAGS = @FONT_THUMBNAILER_CFLAGS@ ++FONT_THUMBNAILER_LIBS = @FONT_THUMBNAILER_LIBS@ ++FONT_VIEW_CFLAGS = @FONT_VIEW_CFLAGS@ ++FONT_VIEW_LIBS = @FONT_VIEW_LIBS@ ++FREETYPE_CONFIG = @FREETYPE_CONFIG@ ++GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ ++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ ++GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ ++GDK_PIXBUF_CSOURCE_32 = @GDK_PIXBUF_CSOURCE_32@ ++GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@ ++GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ ++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GMOFILES = @GMOFILES@ ++GMSGFMT = @GMSGFMT@ ++GNOMECC_CAPPLETS_CFLAGS = @GNOMECC_CAPPLETS_CFLAGS@ ++GNOMECC_CAPPLETS_CLEANFILES = @GNOMECC_CAPPLETS_CLEANFILES@ ++GNOMECC_CAPPLETS_EXTRA_DIST = @GNOMECC_CAPPLETS_EXTRA_DIST@ ++GNOMECC_CAPPLETS_LIBS = @GNOMECC_CAPPLETS_LIBS@ ++GNOMECC_CFLAGS = @GNOMECC_CFLAGS@ ++GNOMECC_GLADE_DIR = @GNOMECC_GLADE_DIR@ ++GNOMECC_ICONS_DIR = @GNOMECC_ICONS_DIR@ ++GNOMECC_LIBS = @GNOMECC_LIBS@ ++GNOMECC_PIXMAPS_DIR = @GNOMECC_PIXMAPS_DIR@ ++GNOME_CFLAGS = @GNOME_CFLAGS@ ++GNOME_DESKTOP_CFLAGS = @GNOME_DESKTOP_CFLAGS@ ++GNOME_DESKTOP_LIBS = @GNOME_DESKTOP_LIBS@ ++GNOME_LIBS = @GNOME_LIBS@ ++GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ ++GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ ++GREP = @GREP@ ++GST_CFLAGS = @GST_CFLAGS@ ++GST_LIBS = @GST_LIBS@ ++GTK_CFLAGS = @GTK_CFLAGS@ ++GTK_LIBS = @GTK_LIBS@ ++HAL_CFLAGS = @HAL_CFLAGS@ ++HAL_LIBS = @HAL_LIBS@ ++HELP_DIR = @HELP_DIR@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++INSTOBJEXT = @INSTOBJEXT@ ++INTLLIBS = @INTLLIBS@ ++INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ ++INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ ++INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++INTLTOOL_ICONV = @INTLTOOL_ICONV@ ++INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ ++INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ ++INTLTOOL_MERGE = @INTLTOOL_MERGE@ ++INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ ++INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ ++INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ ++INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ ++INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ ++INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ ++INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ ++INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ ++INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ ++INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ ++INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ ++INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ ++INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ ++INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ ++INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ ++LDFLAGS = @LDFLAGS@ ++LIBBONOBO_IDL_DIR = @LIBBONOBO_IDL_DIR@ ++LIBEBOOK_CFLAGS = @LIBEBOOK_CFLAGS@ ++LIBEBOOK_LIBS = @LIBEBOOK_LIBS@ ++LIBGNOMEKBDUI_CFLAGS = @LIBGNOMEKBDUI_CFLAGS@ ++LIBGNOMEKBDUI_LIBS = @LIBGNOMEKBDUI_LIBS@ ++LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS@ ++LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ ++LIBSLAB_LIBS = @LIBSLAB_LIBS@ ++LIBTOOL = @LIBTOOL@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++METACITY_CFLAGS = @METACITY_CFLAGS@ ++METACITY_LIBS = @METACITY_LIBS@ ++MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ ++MSGFMT = @MSGFMT@ ++OBJEXT = @OBJEXT@ ++OLD_CAPPLET_CFLAGS = @OLD_CAPPLET_CFLAGS@ ++OLD_CAPPLET_LIBS = @OLD_CAPPLET_LIBS@ ++OMF_DIR = @OMF_DIR@ ++ORBIT_IDL = @ORBIT_IDL@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PKG_CONFIG = @PKG_CONFIG@ ++POFILES = @POFILES@ ++POSUB = @POSUB@ ++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ ++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ ++RANLIB = @RANLIB@ ++SCREENSAVER_LIBS = @SCREENSAVER_LIBS@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ ++SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ ++STRIP = @STRIP@ ++THEME_METHOD_CFLAGS = @THEME_METHOD_CFLAGS@ ++THEME_METHOD_LIBS = @THEME_METHOD_LIBS@ ++THEMUS = @THEMUS@ ++THEMUS_APPLIER_CFLAGS = @THEMUS_APPLIER_CFLAGS@ ++THEMUS_APPLIER_LIBS = @THEMUS_APPLIER_LIBS@ ++THEMUS_COMPONENT_CFLAGS = @THEMUS_COMPONENT_CFLAGS@ ++THEMUS_COMPONENT_LIBS = @THEMUS_COMPONENT_LIBS@ ++THEMUS_THUMBNAILER_CFLAGS = @THEMUS_THUMBNAILER_CFLAGS@ ++THEMUS_THUMBNAILER_LIBS = @THEMUS_THUMBNAILER_LIBS@ ++TYPING_BREAK = @TYPING_BREAK@ ++UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ ++USE_NLS = @USE_NLS@ ++VERSION = @VERSION@ ++VFS_CAPPLET_CFLAGS = @VFS_CAPPLET_CFLAGS@ ++VFS_CAPPLET_LIBS = @VFS_CAPPLET_LIBS@ ++WARN_CFLAGS = @WARN_CFLAGS@ ++XCURSOR_CFLAGS = @XCURSOR_CFLAGS@ ++XCURSOR_LIBS = @XCURSOR_LIBS@ ++XF86MISC_LIBS = @XF86MISC_LIBS@ ++XGETTEXT = @XGETTEXT@ ++XMKMF = @XMKMF@ ++X_CFLAGS = @X_CFLAGS@ ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++X_LIBS = @X_LIBS@ ++X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods idl schemas $(TYPING_BREAK) ++ ++#I removed the root-manager for now ++# ++# it generated this error : ++# root-manager.c:55:31: security/pam_appl.h: No such file or directory ++# while compiling. I guess we need to check for pam or something ++# in the configure.in file. Since we are not using it now, i will ++# remove it from the default build. Chema ++DISTCLEANFILES = \ ++ intltool-extract \ ++ intltool-merge \ ++ intltool-update \ ++ gnome-doc-utils.make ++ ++EXTRA_DIST = \ ++ control-center.spec.in \ ++ control-center.spec \ ++ intltool-extract.in \ ++ intltool-merge.in \ ++ intltool-update.in \ ++ gnome-doc-utils.make ++ ++DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb ++all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive ++ ++.SUFFIXES: ++am--refresh: ++ @: ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ ++ cd $(srcdir) && $(AUTOMAKE) --gnu \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ echo ' $(SHELL) ./config.status'; \ ++ $(SHELL) ./config.status;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ $(SHELL) ./config.status --recheck ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(srcdir) && $(AUTOCONF) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ ++config.h: stamp-h1 ++ @if test ! -f $@; then \ ++ rm -f stamp-h1; \ ++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ ++ else :; fi ++ ++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ++ @rm -f stamp-h1 ++ cd $(top_builddir) && $(SHELL) ./config.status config.h ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_srcdir) && $(AUTOHEADER) ++ rm -f stamp-h1 ++ touch $@ ++ ++distclean-hdr: ++ -rm -f config.h stamp-h1 ++control-center.spec: $(top_builddir)/config.status $(srcdir)/control-center.spec.in ++ cd $(top_builddir) && $(SHELL) ./config.status $@ ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ $(am__remove_distdir) ++ test -d $(distdir) || mkdir $(distdir) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r $(distdir) ++dist-gzip: distdir ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++dist-bzip2: distdir ++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(am__remove_distdir) ++ ++dist-tarZ: distdir ++ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ++ $(am__remove_distdir) ++ ++dist-shar: distdir ++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ $(am__remove_distdir) ++ ++dist-zip: distdir ++ -rm -f $(distdir).zip ++ zip -rq $(distdir).zip $(distdir) ++ $(am__remove_distdir) ++ ++dist dist-all: distdir ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++# This target untars the dist file and tries a VPATH configuration. Then ++# it guarantees that the distribution is self-contained by making another ++# tarfile. ++distcheck: dist ++ case '$(DIST_ARCHIVES)' in \ ++ *.tar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ *.tar.bz2*) \ ++ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.Z*) \ ++ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ++ *.shar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ *.zip*) \ ++ unzip $(distdir).zip ;;\ ++ esac ++ chmod -R a-w $(distdir); chmod a+w $(distdir) ++ mkdir $(distdir)/_build ++ mkdir $(distdir)/_inst ++ chmod a-w $(distdir) ++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ++ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ++ && cd $(distdir)/_build \ ++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ $(DISTCHECK_CONFIGURE_FLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dvi \ ++ && $(MAKE) $(AM_MAKEFLAGS) check \ ++ && $(MAKE) $(AM_MAKEFLAGS) install \ ++ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ++ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ++ distuninstallcheck \ ++ && chmod -R a-w "$$dc_install_base" \ ++ && ({ \ ++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ++ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ++ } || { rm -rf "$$dc_destdir"; exit 1; }) \ ++ && rm -rf "$$dc_destdir" \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist \ ++ && rm -rf $(DIST_ARCHIVES) \ ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ $(am__remove_distdir) ++ @(echo "$(distdir) archives ready for distribution: "; \ ++ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' ++distuninstallcheck: ++ @cd $(distuninstallcheck_dir) \ ++ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ || { echo "ERROR: files left after uninstall:" ; \ ++ if test -n "$(DESTDIR)"; then \ ++ echo " (check DESTDIR support)"; \ ++ fi ; \ ++ $(distuninstallcheck_listfiles) ; \ ++ exit 1; } >&2 ++distcleancheck: distclean ++ @if test '$(srcdir)' = . ; then \ ++ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ++ exit 1 ; \ ++ fi ++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left in build directory after distclean:" ; \ ++ $(distcleancheck_listfiles) ; \ ++ exit 1; } >&2 ++check-am: all-am ++check: check-recursive ++all-am: Makefile config.h ++installdirs: installdirs-recursive ++installdirs-am: ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive ++ ++clean-am: clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-hdr \ ++ distclean-libtool distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++html: html-recursive ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-recursive ++ ++install-exec-am: ++ ++install-html: install-html-recursive ++ ++install-info: install-info-recursive ++ ++install-man: ++ ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -rf $(top_srcdir)/autom4te.cache ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-generic mostlyclean-libtool ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am clean clean-generic \ ++ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ ++ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ ++ distclean-generic distclean-hdr distclean-libtool \ ++ distclean-tags distcleancheck distdir distuninstallcheck dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -Nur control-center-2.17.90/Makefile.in.rej control-center-2.17.90.new/Makefile.in.rej +--- control-center-2.17.90/Makefile.in.rej 1970-01-01 01:00:00.000000000 +0100 ++++ control-center-2.17.90.new/Makefile.in.rej 2007-01-23 10:25:02.000000000 +0100 +@@ -0,0 +1,17 @@ ++*************** ++*** 353,359 **** ++ sharedstatedir = @sharedstatedir@ ++ sysconfdir = @sysconfdir@ ++ target_alias = @target_alias@ ++- WM_MODULE_DIR = $(libdir)/window-manager-settings ++ INCLUDES = \ ++ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ++ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ ++--- 353,359 ---- ++ sharedstatedir = @sharedstatedir@ ++ sysconfdir = @sysconfdir@ ++ target_alias = @target_alias@ +++ WM_MODULE_DIR = $(libdir)/libgnome-window-settings1 ++ INCLUDES = \ ++ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ++ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ --- control-center-2.18.1.orig/debian/patches/34_at_properties_onboard_and_new_interface.patch +++ control-center-2.18.1/debian/patches/34_at_properties_onboard_and_new_interface.patch @@ -0,0 +1,1094 @@ +diff -Nur control-center-2.17.91/capplets/accessibility/at-properties/at-enable-dialog.glade control-center-2.17.91.new/capplets/accessibility/at-properties/at-enable-dialog.glade +--- control-center-2.17.91/capplets/accessibility/at-properties/at-enable-dialog.glade 2007-01-02 13:47:01.000000000 +0100 ++++ control-center-2.17.91.new/capplets/accessibility/at-properties/at-enable-dialog.glade 2007-02-13 10:29:03.000000000 +0100 +@@ -12,6 +12,13 @@ + False + False + False ++ True ++ False ++ False ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ GDK_GRAVITY_NORTH_WEST ++ True ++ False + False + + +@@ -33,6 +40,7 @@ + gtk-help + True + GTK_RELIEF_NORMAL ++ True + -11 + + +@@ -44,6 +52,7 @@ + True + True + GTK_RELIEF_NORMAL ++ True + 0 + + +@@ -53,6 +62,10 @@ + 0.5 + 0 + 0 ++ 0 ++ 0 ++ 0 ++ 0 + + + +@@ -88,6 +101,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -111,6 +128,7 @@ + gtk-close + True + GTK_RELIEF_NORMAL ++ True + -7 + + +@@ -155,6 +173,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -197,6 +219,7 @@ + _Enable assistive technologies + True + GTK_RELIEF_NORMAL ++ True + False + False + True +@@ -221,6 +244,29 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ _Password dialogs as floating windows ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True + + + 0 +@@ -272,7 +318,7 @@ + + + True +- <b>Applications</b> ++ <b>Screenreader and magnifier</b> - <i>Requires assistive technologies</i> + False + True + GTK_JUSTIFY_LEFT +@@ -282,6 +328,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -291,25 +341,16 @@ + + + +- ++ + True +- False +- 12 +- +- +- +- True +- 0.5 +- 0 +- 0 +- 0 +- +- +- 0 +- False +- False +- +- ++ 0 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 34 ++ 0 + + + +@@ -318,23 +359,173 @@ + 6 + + +- ++ + True +- Start these assistive technologies every time you log in: +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 6 ++ False ++ 5 ++ ++ ++ ++ 33 ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 2 ++ ++ ++ ++ True ++ gtk-yes ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Start ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ 33 ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 2 ++ ++ ++ ++ True ++ gtk-preferences ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Settings ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ False ++ True ++ ++ + + + 0 +- False +- False ++ True ++ True + + + +@@ -342,9 +533,10 @@ + + True + True +- _Screenreader ++ Start _screenreader and magnifier at log in + True + GTK_RELIEF_NORMAL ++ True + False + False + True +@@ -355,35 +547,235 @@ + False + + ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ False ++ 6 ++ ++ ++ ++ True ++ <b>On-screen keyboard</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ 0 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 34 ++ 0 ++ ++ ++ ++ True ++ False ++ 6 ++ ++ ++ ++ True ++ False ++ 5 + + +- ++ ++ 33 + True + True +- _Magnifier +- True + GTK_RELIEF_NORMAL +- False +- False +- True ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 2 ++ ++ ++ ++ True ++ gtk-yes ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Start ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ + + + 0 + False +- False ++ True + + + + +- ++ ++ 33 + True + True +- _On-screen keyboard +- True + GTK_RELIEF_NORMAL +- False +- False +- True ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 2 ++ ++ ++ ++ True ++ gtk-preferences ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Settings ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ + + + 0 +@@ -391,38 +783,36 @@ + False + + ++ ++ ++ 0 ++ False ++ False ++ ++ + +- +- +- True +- +- +- 0 +- True +- True +- +- ++ ++ ++ True ++ True ++ Start _on-screen keyboard at log in ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ + +- +- +- True +- +- False +- True +- GTK_JUSTIFY_LEFT +- True +- False +- 0 +- 0.5 +- 0 +- 0 +- +- +- 0 +- False +- False +- +- ++ ++ ++ True + + + 0 +@@ -430,18 +820,38 @@ + True + + ++ ++ ++ ++ True ++ ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ + +- +- 0 +- True +- True +- + + + + 0 +- False +- False ++ True ++ True + + + +diff -Nur control-center-2.17.91/capplets/accessibility/at-properties/at-startup-session.c control-center-2.17.91.new/capplets/accessibility/at-properties/at-startup-session.c +--- control-center-2.17.91/capplets/accessibility/at-properties/at-startup-session.c 2007-01-02 13:47:01.000000000 +0100 ++++ control-center-2.17.91.new/capplets/accessibility/at-properties/at-startup-session.c 2007-02-13 10:29:03.000000000 +0100 +@@ -83,7 +83,7 @@ + startup_state->enabled.screenreader = (braille_active || speech_active); + startup_state->enabled.magnifier = mag_active; + } +- else if (exec_name && !strcmp(exec_name, "gok")) { ++ else if ((exec_name && !strcmp(exec_name, "gok")) || (exec_name && !strcmp(exec_name, "onboard"))) { + startup_state->enabled.osk = TRUE; + } + g_free (exec_name); +@@ -95,10 +95,17 @@ + + prog = g_find_program_in_path ("gok"); + if (prog != NULL) { +- startup_state->enabled.osk_installed = TRUE; ++ startup_state->enabled.gok_installed = TRUE; + g_free (prog); + } else { +- startup_state->enabled.osk_installed = FALSE; ++ startup_state->enabled.gok_installed = FALSE; ++ } ++ prog = g_find_program_in_path ("onboard"); ++ if (prog != NULL) { ++ startup_state->enabled.onboard_installed = TRUE; ++ g_free (prog); ++ } else { ++ startup_state->enabled.onboard_installed = FALSE; + } + + prog = g_find_program_in_path ("gnopernicus"); +@@ -123,6 +130,10 @@ + startup_state->enabled.screenreader_installed = + startup_state->enabled.orca_installed || + startup_state->enabled.gnopernicus_installed; ++ ++ startup_state->enabled.osk_installed = ++ startup_state->enabled.gok_installed || ++ startup_state->enabled.onboard_installed; + } + + void +@@ -167,11 +178,19 @@ + } + if (startup_state->enabled.osk) { + if (!at_startup_state_recent.enabled.osk) +- at_list = at_startup_list_add (at_list, "gok"); ++ if (startup_state->enabled.onboard_installed) { ++ at_list = at_startup_list_remove (at_list, "gok"); ++ at_list = at_startup_list_add (at_list, "onboard"); ++ } ++ else if (startup_state->enabled.gok_installed) { ++ at_list = at_startup_list_remove (at_list, "onboard"); ++ at_list = at_startup_list_add (at_list, "gok"); ++ } + } + else { + if (at_startup_state_recent.enabled.osk) + at_list = at_startup_list_remove (at_list, "gok"); ++ at_list = at_startup_list_remove (at_list, "onboard"); + } + if (at_startup_state_recent.flags != startup_state->flags) { + at_startup_state_recent.flags = startup_state->flags; +diff -Nur control-center-2.17.91/capplets/accessibility/at-properties/at-startup-session.h control-center-2.17.91.new/capplets/accessibility/at-properties/at-startup-session.h +--- control-center-2.17.91/capplets/accessibility/at-properties/at-startup-session.h 2007-01-02 13:47:01.000000000 +0100 ++++ control-center-2.17.91.new/capplets/accessibility/at-properties/at-startup-session.h 2007-02-13 10:29:03.000000000 +0100 +@@ -12,6 +12,8 @@ + guint screenreader_installed:1; + guint gnopernicus_installed:1; + guint orca_installed:1; ++ guint onboard_installed:1; ++ guint gok_installed:1; + } enabled; + } AtStartupState; + +diff -Nur control-center-2.17.91/capplets/accessibility/at-properties/main.c control-center-2.17.91.new/capplets/accessibility/at-properties/main.c +--- control-center-2.17.91/capplets/accessibility/at-properties/main.c 2007-02-12 10:28:24.000000000 +0100 ++++ control-center-2.17.91.new/capplets/accessibility/at-properties/main.c 2007-02-13 10:29:38.000000000 +0100 +@@ -8,11 +8,15 @@ + #include "activate-settings-daemon.h" + #include "at-startup-session.h" + ++#include ++ + #define ACCESSIBILITY_KEY "/desktop/gnome/interface/accessibility" + #define ACCESSIBILITY_KEY_DIR "/desktop/gnome/interface" + #define AT_STARTUP_DIR "/desktop/gnome/accessibility/startup" + #define AT_STARTUP_KEY "/desktop/gnome/accessibility/startup/exec_ats" + #define SR_PREFS_DIR "/apps/gnopernicus/srcore" ++#define GKSU_NO_GRAB_KEY "/apps/gksu/disable-grab" ++#define GKSU_NO_GRAB_KEY_DIR "/apps/gksu" + + static AtStartupState at_startup_state, at_startup_state_initial; + +@@ -33,16 +37,28 @@ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_keyboard_toggle")), + at_startup_state.enabled.osk); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_screenreader_toggle")), +- at_startup_state.enabled.screenreader); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_magnifier_toggle")), +- at_startup_state.enabled.magnifier); ++ at_startup_state.enabled.screenreader | at_startup_state.enabled.magnifier); ++ //gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_magnifier_toggle")), ++ // at_startup_state.enabled.magnifier); + + gtk_widget_set_sensitive (WID ("at_keyboard_toggle"), + at_startup_state.enabled.osk_installed); ++ + gtk_widget_set_sensitive (WID ("at_screenreader_toggle"), ++ at_startup_state.enabled.screenreader_installed | at_startup_state.enabled.magnifier_installed); ++ //gtk_widget_set_sensitive (WID ("at_magnifier_toggle"), ++ // at_startup_state.enabled.magnifier_installed); ++ ++ gtk_widget_set_sensitive (WID ("at_osk_start_button"), ++ at_startup_state.enabled.osk_installed); ++ gtk_widget_set_sensitive (WID ("at_osk_settings_button"), ++ at_startup_state.enabled.osk_installed); ++ ++ gtk_widget_set_sensitive (WID ("at_sr_start_button"), + at_startup_state.enabled.screenreader_installed); +- gtk_widget_set_sensitive (WID ("at_magnifier_toggle"), +- at_startup_state.enabled.magnifier_installed); ++ gtk_widget_set_sensitive (WID ("at_sr_settings_button"), ++ at_startup_state.enabled.screenreader_installed); ++ + + if (at_startup_state.enabled.osk_installed && + at_startup_state.enabled.screenreader_installed && +@@ -57,9 +73,9 @@ + if (!at_startup_state.enabled.osk_installed && + !(at_startup_state.enabled.screenreader_installed || + at_startup_state.enabled.magnifier_installed)) { +- warning_label = g_strdup_printf ("%s", _("No Assistive Technology is available on your system. The 'gok' package must be installed in order to get on-screen keyboard support, and the 'orca' package must be installed for screenreading and magnifying capabilities.")); ++ warning_label = g_strdup_printf ("%s", _("No Assistive Technology is available on your system. The 'gok' or 'onboard' package must be installed in order to get on-screen keyboard support, and the 'orca' package must be installed for screenreading and magnifying capabilities.")); + } else if (!at_startup_state.enabled.osk_installed) { +- warning_label = g_strdup_printf ("%s", _("Not all available assistive technologies are installed on your system. The 'gok' package must be installed in order to get on-screen keyboard support.")); ++ warning_label = g_strdup_printf ("%s", _("Not all available assistive technologies are installed on your system. The 'gok' or 'onboard' package must be installed in order to get on-screen keyboard support.")); + } else { + warning_label = g_strdup_printf ("%s", _("Not all available assistive technologies are installed on your system. The 'orca' package must be installed for screenreading and magnifying capabilities.")); + } +@@ -82,8 +98,8 @@ + gtk_image_set_from_file (GTK_IMAGE (WID ("at_enable_image")), + PIXMAPDIR "/at-support.png"); + +- gtk_image_set_from_file (GTK_IMAGE (WID ("at_applications_image")), +- PIXMAPDIR "/at-startup.png"); ++ // gtk_image_set_from_file (GTK_IMAGE (WID ("at_applications_image")), ++ // PIXMAPDIR "/at-startup.png"); + } + + return dialog; +@@ -129,11 +145,12 @@ + if (toggle_button == GTK_TOGGLE_BUTTON (WID ("at_keyboard_toggle"))) { + at_startup_state.enabled.osk = gtk_toggle_button_get_active (toggle_button); + } +- else if (toggle_button == GTK_TOGGLE_BUTTON (WID ("at_magnifier_toggle"))) { +- at_startup_state.enabled.magnifier = gtk_toggle_button_get_active (toggle_button); +- } ++ //else if (toggle_button == GTK_TOGGLE_BUTTON (WID ("at_magnifier_toggle"))) { ++ // at_startup_state.enabled.magnifier = gtk_toggle_button_get_active (toggle_button); ++ //} + else if (toggle_button == GTK_TOGGLE_BUTTON (WID ("at_screenreader_toggle"))) { + at_startup_state.enabled.screenreader = gtk_toggle_button_get_active (toggle_button); ++ at_startup_state.enabled.magnifier = gtk_toggle_button_get_active (toggle_button); + } + + at_startup_state_update (&at_startup_state); +@@ -155,6 +172,71 @@ + } + + static void ++at_password_toggled (GtkToggleButton *toggle_button, ++ GladeXML *dialog) ++{ ++ GConfClient *client = gconf_client_get_default (); ++ gboolean is_enabled = gtk_toggle_button_get_active (toggle_button); ++ ++ gconf_client_set_bool (client, GKSU_NO_GRAB_KEY, ++ is_enabled, ++ NULL); ++ g_object_unref (client); ++} ++ ++ ++ ++static void ++at_osk_start_clicked (GtkButton *button, ++ GladeXML *dialog) ++{ ++ if (at_startup_state.enabled.onboard_installed) { ++ g_spawn_command_line_async("onboard", NULL); ++ } ++ else if (at_startup_state.enabled.gok_installed) { ++ g_spawn_command_line_async("gok", NULL); ++ } ++} ++ ++static void ++at_osk_settings_clicked (GtkButton *button, ++ GladeXML *dialog) ++{ ++ if (at_startup_state.enabled.onboard_installed) { ++ g_spawn_command_line_async("onboard-settings", NULL); ++ } ++ else if (at_startup_state.enabled.gok_installed) { ++ g_spawn_command_line_async("gok -s", NULL); ++ } ++} ++ ++static void ++at_sr_start_clicked (GtkButton *button, ++ GladeXML *dialog) ++{ ++ if (at_startup_state.enabled.orca_installed) { ++ g_spawn_command_line_async("orca -n", NULL); ++ } ++ else if (at_startup_state.enabled.gnopernicus_installed) { ++ g_spawn_command_line_async("gnopernicus", NULL); ++ } ++} ++ ++static void ++at_sr_settings_clicked (GtkButton *button, ++ GladeXML *dialog) ++{ ++ if (at_startup_state.enabled.orca_installed) { ++ g_spawn_command_line_async("orca -s", NULL); ++ } ++ else if (at_startup_state.enabled.gnopernicus_installed) { ++ g_spawn_command_line_async("gnopernicus", NULL); ++ } ++} ++ ++ ++ ++static void + at_startup_update_ui (GConfClient *client, + GladeXML *dialog) + { +@@ -163,9 +245,9 @@ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_keyboard_toggle")), + at_startup_state.enabled.osk); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_screenreader_toggle")), +- at_startup_state.enabled.screenreader); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_magnifier_toggle")), +- at_startup_state.enabled.magnifier); ++ at_startup_state.enabled.screenreader & at_startup_state.enabled.magnifier); ++// gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_magnifier_toggle")), ++// at_startup_state.enabled.magnifier); + } + + static void +@@ -178,6 +260,19 @@ + is_enabled); + + gtk_widget_set_sensitive (WID ("at_applications_frame"), is_enabled); ++ ++ gtk_widget_set_sensitive (WID ("at_keyboard_toggle"), is_enabled); ++} ++ ++static void ++at_password_update (GConfClient *client, ++ GladeXML *dialog) ++{ ++ gboolean is_enabled = gconf_client_get_bool (client, GKSU_NO_GRAB_KEY, NULL); ++ ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_password_toggle")), ++ is_enabled); ++ + } + + static void +@@ -202,6 +297,15 @@ + } + + static void ++at_password_changed (GConfClient *client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ gpointer user_data) ++{ ++ at_password_update (client, user_data); ++} ++ ++static void + setup_dialog (GladeXML *dialog) + { + GConfClient *client; +@@ -224,10 +328,61 @@ + + at_enable_update (client, dialog); + ++ + gconf_client_notify_add (client, ACCESSIBILITY_KEY_DIR, + at_enable_changed, + dialog, NULL, NULL); + ++ //Password grab toggle ++ ++ gconf_client_add_dir (client, GKSU_NO_GRAB_KEY_DIR, ++ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); ++ ++ widget = WID ("at_password_toggle"); ++ ++ g_signal_connect (widget, "toggled", ++ G_CALLBACK (at_password_toggled), ++ dialog); ++ ++ peditor = gconf_peditor_new_boolean (NULL, GKSU_NO_GRAB_KEY, ++ widget, ++ NULL); ++ ++ at_password_update (client, dialog); ++ ++ gconf_client_notify_add (client, GKSU_NO_GRAB_KEY_DIR, ++ at_password_changed, ++ dialog, NULL, NULL); ++ ++ ++ widget = WID ("at_osk_start_button"); ++ ++ g_signal_connect (widget, "clicked", ++ G_CALLBACK (at_osk_start_clicked), ++ dialog); ++ ++ widget = WID ("at_osk_settings_button"); ++ ++ g_signal_connect (widget, "clicked", ++ G_CALLBACK (at_osk_settings_clicked), ++ dialog); ++ ++ widget = WID ("at_sr_start_button"); ++ ++ g_signal_connect (widget, "clicked", ++ G_CALLBACK (at_sr_start_clicked), ++ dialog); ++ ++ widget = WID ("at_sr_settings_button"); ++ ++ g_signal_connect (widget, "clicked", ++ G_CALLBACK (at_sr_settings_clicked), ++ dialog); ++ ++ ++ ++ ++ + gconf_client_add_dir (client, AT_STARTUP_DIR, + GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); + +@@ -248,10 +403,10 @@ + G_CALLBACK (at_startup_toggled), + dialog); + +- widget = WID ("at_magnifier_toggle"); +- g_signal_connect (widget, "toggled", +- G_CALLBACK (at_startup_toggled), +- dialog); ++ //widget = WID ("at_magnifier_toggle"); ++ //g_signal_connect (widget, "toggled", ++ // G_CALLBACK (at_startup_toggled), ++ // dialog); + + widget = WID ("at_screenreader_toggle"); + g_signal_connect (widget, "toggled", --- control-center-2.18.1.orig/debian/patches/81_get_rid_of_orca_main_window.patch +++ control-center-2.18.1/debian/patches/81_get_rid_of_orca_main_window.patch @@ -0,0 +1,21 @@ +diff -Nur control-center-2.17.90/capplets/accessibility/at-properties/main.c control-center-2.17.90.new/capplets/accessibility/at-properties/main.c +--- control-center-2.17.90/capplets/accessibility/at-properties/main.c 2007-02-09 16:41:16.000000000 +0000 ++++ control-center-2.17.90.new/capplets/accessibility/at-properties/main.c 2007-02-09 16:35:24.000000000 +0000 +@@ -213,7 +213,7 @@ + GladeXML *dialog) + { + if (at_startup_state.enabled.orca_installed) { +- g_spawn_command_line_async("orca -n", NULL); ++ g_spawn_command_line_async("orca -n --disable=main-window", NULL); + } + else if (at_startup_state.enabled.gnopernicus_installed) { + g_spawn_command_line_async("gnopernicus", NULL); +@@ -225,7 +225,7 @@ + GladeXML *dialog) + { + if (at_startup_state.enabled.orca_installed) { +- g_spawn_command_line_async("orca -s", NULL); ++ g_spawn_command_line_async("orca -s --disable=main-window", NULL); + } + else if (at_startup_state.enabled.gnopernicus_installed) { + g_spawn_command_line_async("gnopernicus", NULL); --- control-center-2.18.1.orig/debian/patches/19_extra_keybindings.patch +++ control-center-2.18.1/debian/patches/19_extra_keybindings.patch @@ -0,0 +1,112 @@ +diff -Nur control-center-2.15.3/capplets/keybindings/gnome-keybinding-properties.c control-center-2.15.3.new/capplets/keybindings/gnome-keybinding-properties.c +--- control-center-2.15.3/capplets/keybindings/gnome-keybinding-properties.c 2006-04-28 12:36:54.000000000 +0200 ++++ control-center-2.15.3.new/capplets/keybindings/gnome-keybinding-properties.c 2006-07-10 13:02:12.000000000 +0200 +@@ -42,6 +42,7 @@ + { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 }, ++ { "/apps/gnome_settings_daemon/keybindings/calculator", ALWAYS_VISIBLE, 0 }, + { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 }, + { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 }, + { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 }, +@@ -51,6 +52,7 @@ + }; + static const KeyListEntry sounds_key_list[] = + { ++ { "/apps/gnome_settings_daemon/keybindings/music", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/volume_mute", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/volume_down", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/volume_up", ALWAYS_VISIBLE, 0 }, +@@ -512,6 +514,17 @@ + g_free (key_value); + key_entry->description = g_strdup (gconf_schema_get_short_desc (schema)); + ++ if (!strcmp (key_entry->description, "Launch music player")) ++ { ++ g_free (key_entry->description); ++ key_entry->description = g_strdup (_("Launch music player")); ++ } ++ else if (!strcmp (key_entry->description, "Launch calculator")) ++ { ++ g_free (key_entry->description); ++ key_entry->description = g_strdup (_("Launch calculator")); ++ } ++ + if (i == MAX_ELEMENTS_BEFORE_SCROLLING) + { + GtkRequisition rectangle; +diff -Nur control-center-2.15.3/gnome-settings-daemon/actions/acme.h control-center-2.15.3.new/gnome-settings-daemon/actions/acme.h +--- control-center-2.15.3/gnome-settings-daemon/actions/acme.h 2006-04-28 12:35:24.000000000 +0200 ++++ control-center-2.15.3.new/gnome-settings-daemon/actions/acme.h 2006-07-10 13:02:12.000000000 +0200 +@@ -38,6 +38,8 @@ + SCREENSAVER_KEY, + HELP_KEY, + WWW_KEY, ++ MUSIC_KEY, ++ CALCULATOR_KEY, + PLAY_KEY, + PAUSE_KEY, + STOP_KEY, +@@ -69,6 +71,8 @@ + { SCREENSAVER_KEY, GCONF_BINDING_DIR "/screensaver", NULL }, + { HELP_KEY, GCONF_BINDING_DIR "/help", NULL }, + { WWW_KEY, GCONF_BINDING_DIR "/www", NULL }, ++ { MUSIC_KEY, GCONF_BINDING_DIR "/music", NULL }, ++ { CALCULATOR_KEY, GCONF_BINDING_DIR "/calculator", NULL }, + { PLAY_KEY, GCONF_BINDING_DIR "/play", NULL }, + { PAUSE_KEY, GCONF_BINDING_DIR "/pause", NULL }, + { STOP_KEY, GCONF_BINDING_DIR "/stop", NULL }, +diff -Nur control-center-2.15.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.15.3.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c +--- control-center-2.15.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-07-10 13:02:11.000000000 +0200 ++++ control-center-2.15.3.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-07-10 13:02:12.000000000 +0200 +@@ -788,6 +788,12 @@ + + g_free (cmd); + break; ++ case MUSIC_KEY: ++ execute ("rhythmbox", FALSE); ++ break; ++ case CALCULATOR_KEY: ++ execute ("gcalctool", FALSE); ++ break; + case HELP_KEY: + do_help_action (acme); + break; +diff -Nur control-center-2.15.3/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.15.3.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +--- control-center-2.15.3/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-07-10 13:02:11.000000000 +0200 ++++ control-center-2.15.3.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-07-10 13:02:12.000000000 +0200 +@@ -14,6 +14,16 @@ + + + ++ /schemas/apps/gnome_settings_daemon/keybindings/music ++ /apps/gnome_settings_daemon/keybindings/music ++ string ++ 0x76 ++ ++ Launch music player ++ Launch music players's shortcut ++ ++ ++ + /schemas/apps/gnome_settings_daemon/keybindings/volume_mute + /apps/gnome_settings_daemon/keybindings/volume_mute + string +@@ -156,6 +166,17 @@ + + + ++ ++ /schemas/apps/gnome_settings_daemon/keybindings/calculator ++ /apps/gnome_settings_daemon/keybindings/calculator ++ string ++ 0xa1 ++ ++ Launch calculator ++ Launch calculator's shortcut ++ ++ ++ + + + /schemas/apps/gnome_settings_daemon/keybindings/play --- control-center-2.18.1.orig/debian/patches/15_gconf_peditor.patch +++ control-center-2.18.1/debian/patches/15_gconf_peditor.patch @@ -0,0 +1,11 @@ +--- capplets/common/gconf-property-editor.c.orig 2004-10-08 11:43:40.000000000 +0200 ++++ capplets/common/gconf-property-editor.c 2004-10-08 11:44:28.000000000 +0200 +@@ -594,7 +594,7 @@ + if (value != NULL) { + value_wid = peditor->p->conv_to_widget_cb (peditor, value); + entry_current_text = gtk_entry_get_text (GTK_ENTRY (peditor->p->ui_control)); +- if (strcmp (entry_current_text, gconf_value_get_string (value)) != 0) { ++ if ((value->type == GCONF_VALUE_STRING) && strcmp (entry_current_text, gconf_value_get_string (value)) != 0) { + gtk_entry_set_text (GTK_ENTRY (peditor->p->ui_control), gconf_value_get_string (value_wid)); + } + gconf_value_free (value_wid); --- control-center-2.18.1.orig/debian/patches/24_theme_dont_require_metacity.patch +++ control-center-2.18.1/debian/patches/24_theme_dont_require_metacity.patch @@ -0,0 +1,15 @@ +--- capplets/theme-switcher/gnome-theme-manager.c.old 2005-06-25 16:26:41.000000000 +0200 ++++ capplets/theme-switcher/gnome-theme-manager.c 2005-06-25 17:10:47.000000000 +0200 +@@ -1453,8 +1453,11 @@ + window_theme_default_name = get_default_string_from_key (METACITY_THEME_KEY); + icon_theme_default_name = get_default_string_from_key (ICON_THEME_KEY); + ++ if (window_theme_default_name == NULL) ++ { ++ window_theme_default_name = g_strdup ("null"); ++ } + if (gtk_theme_default_name == NULL || +- window_theme_default_name == NULL || + icon_theme_default_name == NULL) + { + GtkWidget *msg_dialog; --- control-center-2.18.1.orig/debian/patches/06_disable_update_mime_at_install.patch +++ control-center-2.18.1/debian/patches/06_disable_update_mime_at_install.patch @@ -0,0 +1,64 @@ +diff -puNr control-center-2.10.1.orig/configure.in control-center-2.10.1/configure.in +--- control-center-2.10.1.orig/configure.in 2005-04-10 20:25:10.000000000 +0000 ++++ control-center-2.10.1/configure.in 2005-04-10 20:26:10.000000000 +0000 +@@ -401,6 +401,20 @@ AC_MSG_RESULT($have_fb) + AM_CONDITIONAL(HAVE_FB, test x"$have_fb" = "xyes") + + dnl ============================================== ++dnl Tell if we should or not update mime database ++dnl at install stage ++dnl ============================================== ++AC_ARG_ENABLE(mime-cache, ++AC_HELP_STRING([--disable-mime-cache],[update or not mime datas during install]), ++[case "${enableval}" in ++ yes) update_cache=true ;; ++ no) update_cache=false ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-mime-cache) ;; ++esac], ++[update_cache=true]) dnl Default value ++AM_CONDITIONAL(UPDATE_MIME_CACHE, test x$update_cache = xtrue) ++ ++dnl ============================================== + dnl Define the main variables + dnl ============================================== + COMMON_CFLAGS="-I\$(top_srcdir)/capplets/common" +diff -puNr control-center-2.10.1.orig/vfs-methods/fontilus/Makefile.am control-center-2.10.1/vfs-methods/fontilus/Makefile.am +--- control-center-2.10.1.orig/vfs-methods/fontilus/Makefile.am 2005-04-10 20:25:10.000000000 +0000 ++++ control-center-2.10.1/vfs-methods/fontilus/Makefile.am 2005-04-10 20:24:59.000000000 +0000 +@@ -49,11 +49,16 @@ else + install-gconf-schemas: + endif + ++if UPDATE_MIME_CACHE + install-desktop-database: install-desktopDATA + update-desktop-database $(DESTDIR)$(desktopdir) + + uninstall-local: + rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache ++else ++install-desktop-database: install-desktopDATA ++uninstall-local: ++endif + + @INTLTOOL_DESKTOP_RULE@ + @INTLTOOL_DIRECTORY_RULE@ +diff -puNr control-center-2.10.1.orig/vfs-methods/themus/Makefile.am control-center-2.10.1/vfs-methods/themus/Makefile.am +--- control-center-2.10.1.orig/vfs-methods/themus/Makefile.am 2005-04-10 20:25:10.000000000 +0000 ++++ control-center-2.10.1/vfs-methods/themus/Makefile.am 2005-04-10 20:24:59.000000000 +0000 +@@ -70,11 +70,16 @@ else + install-gconf-schemas: + endif + ++if UPDATE_MIME_CACHE + install-desktop-database: install-desktopDATA + update-desktop-database $(DESTDIR)$(desktopdir) + + distclean-local: + rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache ++else ++install-desktop-database: install-desktopDATA ++distclean-local: ++endif + + @INTLTOOL_DESKTOP_RULE@ + @INTLTOOL_SCHEMAS_RULE@ --- control-center-2.18.1.orig/debian/patches/10_eggaccelerators.patch +++ control-center-2.18.1/debian/patches/10_eggaccelerators.patch @@ -0,0 +1,16 @@ +diff -Naur control-center-2.6.1/gnome-settings-daemon/eggaccelerators.c control-center-2.6.1-vesuri/gnome-settings-daemon/eggaccelerators.c +--- control-center-2.6.1/gnome-settings-daemon/eggaccelerators.c 2004-04-01 08:45:16.000000000 +0300 ++++ control-center-2.6.1-vesuri/gnome-settings-daemon/eggaccelerators.c 2004-07-01 23:59:49.000000000 +0300 +@@ -352,8 +352,11 @@ + bad_keyval = TRUE; + } + } +- } else if (keycode != NULL) ++ } else if (keycode != NULL) { + *keycode = XKeysymToKeycode (GDK_DISPLAY(), keyval); ++ if (*keycode == 0) ++ bad_keyval = TRUE; ++ } + + accelerator += len; + len -= len; --- control-center-2.18.1.orig/debian/patches/04_path_xtra.patch +++ control-center-2.18.1/debian/patches/04_path_xtra.patch @@ -0,0 +1,12 @@ +diff -Nur control-center-2.6.1.orig/configure.in control-center-2.6.1/configure.in +--- control-center-2.6.1.orig/configure.in 2004-05-29 17:57:08.000000000 +0200 ++++ control-center-2.6.1/configure.in 2004-05-29 17:57:25.000000000 +0200 +@@ -49,7 +49,7 @@ + AC_MSG_ERROR([Your Gettext installation doesn't seem to support ngettext to handle translation of plural forms. Please install GNU Gettext]) + fi; + +-AC_PATH_XTRA ++AC_PATH_XTRA( [X11], [X11/Xlib.h], [XSync ()]) + x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + + AC_CHECK_FUNC(XScreenSaverQueryInfo, [ --- control-center-2.18.1.orig/debian/patches/09_locate_pointer.patch +++ control-center-2.18.1/debian/patches/09_locate_pointer.patch @@ -0,0 +1,17 @@ +--- gnome-settings-daemon/gnome-settings-mouse.c.orig 2004-10-09 20:26:54.000000000 +0200 ++++ gnome-settings-daemon/gnome-settings-mouse.c 2004-10-09 20:38:38.000000000 +0200 +@@ -144,11 +144,11 @@ + XAllowEvents (gdk_x11_get_default_xdisplay (), + ReplayKeyboard, + xev->xkey.time); +- XUngrabKeyboard (gdk_x11_get_default_xdisplay (), +- xev->xkey.time); ++ /* XUngrabKeyboard (gdk_x11_get_default_xdisplay (), ++ xev->xkey.time); */ + } + +- return GDK_FILTER_REMOVE; ++ /* return GDK_FILTER_REMOVE; */ + } + return GDK_FILTER_CONTINUE; + } --- control-center-2.18.1.orig/debian/patches/01_debian_ubuntu.patch +++ control-center-2.18.1/debian/patches/01_debian_ubuntu.patch @@ -0,0 +1,21 @@ +diff -Nur control-center-2.13.5.orig/capplets/default-applications/gnome-default-applications.xml.in control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in +--- control-center-2.13.5.orig/capplets/default-applications/gnome-default-applications.xml.in 2006-01-16 16:13:33.000000000 +0100 ++++ control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in 2006-01-16 23:02:08.000000000 +0100 +@@ -16,7 +16,7 @@ + opera -newwindow %s + + +- <_name>Debian Sensible Browser ++ <_name>Ubuntu Sensible Browser + sensible-browser + sensible-browser %s + +@@ -238,7 +238,7 @@ + + + +- <_name>Debian Terminal Emulator ++ <_name>Ubuntu Terminal Emulator + x-terminal-emulator + x-terminal-emulator + gnome-mime-application-x-executable --- control-center-2.18.1.orig/debian/patches/07_default_keys.patch +++ control-center-2.18.1/debian/patches/07_default_keys.patch @@ -0,0 +1,111 @@ +diff -Nur control-center-2.18.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.18.1.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +--- control-center-2.18.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2007-03-18 18:04:18.000000000 +0100 ++++ control-center-2.18.1.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2007-04-12 12:56:58.000000000 +0200 +@@ -17,7 +17,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/volume_mute + /apps/gnome_settings_daemon/keybindings/volume_mute + string +- ++ 0xa0 + + Volume mute + Volume mute's shortcut +@@ -29,7 +29,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/volume_down + /apps/gnome_settings_daemon/keybindings/volume_down + string +- ++ 0xae + + Volume down + Volume down's shortcut. +@@ -41,7 +41,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/volume_up + /apps/gnome_settings_daemon/keybindings/volume_up + string +- ++ 0xb0 + + Volume up + Volume up's shortcut. +@@ -65,7 +65,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/eject + /apps/gnome_settings_daemon/keybindings/eject + string +- ++ 0xcc + + Eject + Eject's shortcut. +@@ -89,7 +89,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/search + /apps/gnome_settings_daemon/keybindings/search + string +- ++ 0xe5 + + Search + Search's shortcut. +@@ -101,7 +101,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/email + /apps/gnome_settings_daemon/keybindings/email + string +- ++ 0xec + + E-mail + E-mail's shortcut. +@@ -137,7 +137,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/help + /apps/gnome_settings_daemon/keybindings/help + string +- ++ 0xf5 + + Launch help browser + Launch help browser's shortcut. +@@ -149,7 +149,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/www + /apps/gnome_settings_daemon/keybindings/www + string +- ++ 0xb2 + + Launch web browser + Launch web browser's shortcut. +@@ -161,7 +161,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/play + /apps/gnome_settings_daemon/keybindings/play + string +- ++ 0xa2 + + Play (or play/pause) + Play (or play/pause) key's shortcut. +@@ -185,7 +185,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/stop + /apps/gnome_settings_daemon/keybindings/stop + string +- ++ 0xa4 + + Stop playback key + Stop playback key's shortcut. +@@ -197,7 +197,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/previous + /apps/gnome_settings_daemon/keybindings/previous + string +- ++ 0x90 + + Skip to previous track + Previous track key's shortcut. +@@ -209,7 +209,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/next + /apps/gnome_settings_daemon/keybindings/next + string +- ++ 0x99 + + Skip to next track + Next track key's shortcut. --- control-center-2.18.1.orig/debian/patches/21_no_sleep_key.patch +++ control-center-2.18.1/debian/patches/21_no_sleep_key.patch @@ -0,0 +1,66 @@ +diff -Nur control-center-2.14.1/capplets/keybindings/gnome-keybinding-properties.c control-center-2.14.1.new/capplets/keybindings/gnome-keybinding-properties.c +--- control-center-2.14.1/capplets/keybindings/gnome-keybinding-properties.c 2006-05-15 00:13:28.000000000 +0200 ++++ control-center-2.14.1.new/capplets/keybindings/gnome-keybinding-properties.c 2006-05-15 00:15:35.000000000 +0200 +@@ -42,7 +42,6 @@ + { + { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 }, +- { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/home", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 }, +diff -Nur control-center-2.14.1/gnome-settings-daemon/actions/acme.h control-center-2.14.1.new/gnome-settings-daemon/actions/acme.h +--- control-center-2.14.1/gnome-settings-daemon/actions/acme.h 2006-05-15 00:13:27.000000000 +0200 ++++ control-center-2.14.1.new/gnome-settings-daemon/actions/acme.h 2006-05-15 00:15:07.000000000 +0200 +@@ -34,7 +34,6 @@ + HOME_KEY, + SEARCH_KEY, + EMAIL_KEY, +- SLEEP_KEY, + SCREENSAVER_KEY, + HELP_KEY, + WWW_KEY, +@@ -71,7 +70,6 @@ + { HOME_KEY, GCONF_BINDING_DIR "/home", NULL }, + { SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL }, + { EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL }, +- { SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL }, + { SCREENSAVER_KEY, GCONF_BINDING_DIR "/screensaver", NULL }, + { HELP_KEY, GCONF_BINDING_DIR "/help", NULL }, + { WWW_KEY, GCONF_BINDING_DIR "/www", NULL }, +diff -Nur control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.14.1.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c +--- control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-05-15 00:13:28.000000000 +0200 ++++ control-center-2.14.1.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-05-15 00:14:36.000000000 +0200 +@@ -815,9 +815,6 @@ + case EMAIL_KEY: + do_mail_action (acme); + break; +- case SLEEP_KEY: +- do_sleep_action ("apm", "xset dpms force off"); +- break; + case SCREENSAVER_KEY: + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) + execute ("gnome-screensaver-command --lock", FALSE); +diff -Nur control-center-2.14.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.14.1.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +--- control-center-2.14.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-05-15 00:13:27.000000000 +0200 ++++ control-center-2.14.1.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-05-15 00:16:12.000000000 +0200 +@@ -118,19 +118,6 @@ + + + +- +- +- /schemas/apps/gnome_settings_daemon/keybindings/sleep +- /apps/gnome_settings_daemon/keybindings/sleep +- string +- +- +- Sleep +- Sleep's shortcut. +- +- +- +- + + /schemas/apps/gnome_settings_daemon/keybindings/screensaver + /apps/gnome_settings_daemon/keybindings/screensaver --- control-center-2.18.1.orig/debian/Makefile.in +++ control-center-2.18.1/debian/Makefile.in @@ -0,0 +1,958 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# gnome-doc-utils.make - make magic for building documentation +# Copyright (C) 2004-2005 Shaun McCance +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +################################################################################ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/gnome-doc-utils.make ChangeLog +subdir = help +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ABOUTME_LIBS = @ABOUTME_LIBS@ +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AR = @AR@ +AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ +AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ +CAPPLET_LIBS = @CAPPLET_LIBS@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CONFIG_ARCHIVER_INCLUDEDIR = @CONFIG_ARCHIVER_INCLUDEDIR@ +CONFIG_ARCHIVER_LIBDIR = @CONFIG_ARCHIVER_LIBDIR@ +CONFIG_ARCHIVER_LIBS = @CONFIG_ARCHIVER_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DEFAULT_APPLICATIONS_CAPPLET_CFLAGS = @DEFAULT_APPLICATIONS_CAPPLET_CFLAGS@ +DEFAULT_APPLICATIONS_CAPPLET_LIBS = @DEFAULT_APPLICATIONS_CAPPLET_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DISPLAY_CAPPLET_CFLAGS = @DISPLAY_CAPPLET_CFLAGS@ +DISPLAY_CAPPLET_LIBS = @DISPLAY_CAPPLET_LIBS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +FONTILUS = @FONTILUS@ +FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@ +FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@ +FONT_CONTEXT_MENU_CFLAGS = @FONT_CONTEXT_MENU_CFLAGS@ +FONT_CONTEXT_MENU_LIBS = @FONT_CONTEXT_MENU_LIBS@ +FONT_METHOD_CFLAGS = @FONT_METHOD_CFLAGS@ +FONT_METHOD_LIBS = @FONT_METHOD_LIBS@ +FONT_THUMBNAILER_CFLAGS = @FONT_THUMBNAILER_CFLAGS@ +FONT_THUMBNAILER_LIBS = @FONT_THUMBNAILER_LIBS@ +FONT_VIEW_CFLAGS = @FONT_VIEW_CFLAGS@ +FONT_VIEW_LIBS = @FONT_VIEW_LIBS@ +FREETYPE_CONFIG = @FREETYPE_CONFIG@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GDK_PIXBUF_CSOURCE_32 = @GDK_PIXBUF_CSOURCE_32@ +GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@ +GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOMECC_CAPPLETS_CFLAGS = @GNOMECC_CAPPLETS_CFLAGS@ +GNOMECC_CAPPLETS_CLEANFILES = @GNOMECC_CAPPLETS_CLEANFILES@ +GNOMECC_CAPPLETS_EXTRA_DIST = @GNOMECC_CAPPLETS_EXTRA_DIST@ +GNOMECC_CAPPLETS_LIBS = @GNOMECC_CAPPLETS_LIBS@ +GNOMECC_CFLAGS = @GNOMECC_CFLAGS@ +GNOMECC_LIBS = @GNOMECC_LIBS@ +GNOME_CFLAGS = @GNOME_CFLAGS@ +GNOME_DESKTOP_CFLAGS = @GNOME_DESKTOP_CFLAGS@ +GNOME_DESKTOP_LIBS = @GNOME_DESKTOP_LIBS@ +GNOME_LIBS = @GNOME_LIBS@ +GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ +GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ +GREP = @GREP@ +GST_CFLAGS = @GST_CFLAGS@ +GST_LIBS = @GST_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HAL_CFLAGS = @HAL_CFLAGS@ +HAL_LIBS = @HAL_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_ICONV = @INTLTOOL_ICONV@ +INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ +INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +LDFLAGS = @LDFLAGS@ +LIBEBOOK_CFLAGS = @LIBEBOOK_CFLAGS@ +LIBEBOOK_LIBS = @LIBEBOOK_LIBS@ +LIBGNOMEKBDUI_CFLAGS = @LIBGNOMEKBDUI_CFLAGS@ +LIBGNOMEKBDUI_LIBS = @LIBGNOMEKBDUI_LIBS@ +LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS@ +LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ +LIBSLAB_LIBS = @LIBSLAB_LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +METACITY_CFLAGS = @METACITY_CFLAGS@ +METACITY_LIBS = @METACITY_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +OBJEXT = @OBJEXT@ +OLD_CAPPLET_CFLAGS = @OLD_CAPPLET_CFLAGS@ +OLD_CAPPLET_LIBS = @OLD_CAPPLET_LIBS@ +OMF_DIR = @OMF_DIR@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SCREENSAVER_LIBS = @SCREENSAVER_LIBS@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ +SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ +STRIP = @STRIP@ +THEME_METHOD_CFLAGS = @THEME_METHOD_CFLAGS@ +THEME_METHOD_LIBS = @THEME_METHOD_LIBS@ +THEMUS = @THEMUS@ +THEMUS_APPLIER_CFLAGS = @THEMUS_APPLIER_CFLAGS@ +THEMUS_APPLIER_LIBS = @THEMUS_APPLIER_LIBS@ +THEMUS_COMPONENT_CFLAGS = @THEMUS_COMPONENT_CFLAGS@ +THEMUS_COMPONENT_LIBS = @THEMUS_COMPONENT_LIBS@ +THEMUS_THUMBNAILER_CFLAGS = @THEMUS_THUMBNAILER_CFLAGS@ +THEMUS_THUMBNAILER_LIBS = @THEMUS_THUMBNAILER_LIBS@ +TYPING_BREAK = @TYPING_BREAK@ +UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +VFS_CAPPLET_CFLAGS = @VFS_CAPPLET_CFLAGS@ +VFS_CAPPLET_LIBS = @VFS_CAPPLET_LIBS@ +WARN_CFLAGS = @WARN_CFLAGS@ +XCURSOR_CFLAGS = @XCURSOR_CFLAGS@ +XCURSOR_LIBS = @XCURSOR_LIBS@ +XF86MISC_LIBS = @XF86MISC_LIBS@ +XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) +_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) +_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ + $(filter $(LINGUAS),$(DOC_LINGUAS)), \ + $(DOC_LINGUAS)) + + +################################################################################ +db2omf_args = \ + --stringparam db2omf.basename $(DOC_MODULE) \ + --stringparam db2omf.format $(3) \ + --stringparam db2omf.dtd \ + $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ + | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ + --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ + --stringparam db2omf.omf_dir "$(OMF_DIR)" \ + --stringparam db2omf.help_dir "$(HELP_DIR)" \ + --stringparam db2omf.omf_in "`pwd`/$(_DOC_OMF_IN)" \ + --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)" \ + $(_db2omf) $(2) + +_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(srcdir)/$(DOC_MODULE).omf.in)) +_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ + $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) + +_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ + $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) + + +# FIXME +_DOC_OMF_ALL = \ + $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ + $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) + + +################################################################################ +_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) +_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) +_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) +_DOC_C_DOCS = \ + $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ + $(_DOC_C_MODULE) + +_DOC_C_DOCS_NOENT = \ + $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) + +_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ + $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) + + +# FIXME: probably have to shell escape to determine the file names +_DOC_C_HTML = $(foreach f, \ + $(shell xsltproc --xinclude \ + --stringparam db.chunk.basename "$(DOC_MODULE)" \ + $(_chunks) "C/$(DOC_MODULE).xml"), \ + C/$(f).xhtml) + + +############################################################################### +_DOC_POFILES = $(if $(DOC_MODULE), \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) + +_DOC_LC_MODULES = $(if $(DOC_MODULE), \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) + +_DOC_LC_INCLUDES = \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ + $(lc)/$(notdir $(inc)) )) + + +# FIXME: probably have to shell escape to determine the file names +_DOC_LC_HTML = \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ + $(lc)/$(notdir $(doc)) )) + +_DOC_LC_DOCS = \ + $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \ + $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) + +_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ + $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) + +_DOC_SRC_FIGURES = \ + $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ + $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) + +_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot) + +################################################################################ +_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ + $(_DOC_C_HTML) $(_DOC_LC_HTML)) + +_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) +@ENABLE_SK_FALSE@_ENABLE_SK = false + +################################################################################ +@ENABLE_SK_TRUE@_ENABLE_SK = true +_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) +_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) +_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) +_clean_dir = $(if $(DOC_MODULE),clean-doc-dir) +DOC_MODULE = control-center +DOC_ENTITIES = config-accessibility-keyboard.xml config-background.xml config-behavior.xml config-cds.xml config-default-apps.xml config-file-type.xml config-hints.xml config-html.xml config-kbd.xml config-keybindings.xml config-mouse.xml config-screensaver.xml config-sound.xml config-themes.xml +DOC_INCLUDES = +DOC_LINGUAS = en_GB es fr pa sv ru uk zh_CN +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gnome-doc-utils.make $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-local + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-data-local + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool \ + mostlyclean-local + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-local + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distclean-local distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-local + + +DOC_H_FILE ?= + +DOC_H_DOCS ?= + +$(DOC_H_FILE): $(DOC_H_DOCS); + @rm -f $@.tmp; touch $@.tmp; + echo 'const gchar* documentation_credits[] = {' >> $@.tmp + list='$(DOC_H_DOCS)'; for doc in $$list; do \ + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ + if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ + xsltproc --path "$$xmlpath" $(_credits) $$doc; \ + done | sort | uniq \ + | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ + | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp + echo ' NULL' >> $@.tmp + echo '};' >> $@.tmp + echo >> $@.tmp + list='$(DOC_H_DOCS)'; for doc in $$list; do \ + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ + if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ + docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ + echo $$xmlpath; \ + ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ + for id in $$ids; do \ + echo '#define HELP_'`echo $$docid`'_'`echo $$id \ + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ + done; \ + echo >> $@.tmp; \ + done; + cp $@.tmp $@ && rm -f $@.tmp + +.PHONY: dist-doc-header +dist-doc-header: $(DOC_H_FILE) + @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ + echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ + $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; + +doc-dist-hook: $(if $(DOC_H_FILE),dist-doc-header) + +.PHONY: clean-doc-header +clean-local: $(_clean_doc_header) +distclean-local: $(_clean_doc_header) +mostlyclean-local: $(_clean_doc_header) +maintainer-clean-local: $(_clean_doc_header) +clean-doc-header: + rm -f $(DOC_H_FILE) + +all: $(DOC_H_FILE) + +################################################################################ + +DOC_MODULE ?= + +DOC_ENTITIES ?= + +DOC_INCLUDES ?= + +DOC_FIGURES ?= + +DOC_FORMATS ?= docbook + +DOC_LINGUAS ?= + +################################################################################ + +_xml2po ?= `which xml2po` + +_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` +_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` +_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl +_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl +_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl + +_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` +_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` +_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml + +$(_DOC_OMF_DB) : $(_DOC_OMF_IN) +$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml + @test -f "$(_skcontentslist)" || { \ + echo "The file '$(_skcontentslist)' does not exist." >&2; \ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } + xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + +$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) +$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml + @test -f "$(_skcontentslist)" || { \ + echo "The file '$(_skcontentslist)' does not exist" >&2; \ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } + xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + +.PHONY: omf +omf: $(_DOC_OMF_ALL) + +.PHONY: po +po: $(_DOC_POFILES) + +$(_DOC_POFILES): + @if ! test -d $(dir $@); then \ + echo "mkdir $(dir $@)"; \ + mkdir "$(dir $@)"; \ + fi + @if test ! -f $@ -a -f $(srcdir)/$@; then \ + echo "cp $(srcdir)/$@ $@"; \ + cp "$(srcdir)/$@" "$@"; \ + fi; + @docs=; \ + list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ + if test -f $$doc; then \ + docs="$$docs ../$$doc"; \ + else \ + docs="$$docs ../$(srcdir)/$$doc"; \ + fi; \ + done; \ + if ! test -f $@; then \ + echo "(cd $(dir $@) && \ + $(_xml2po) -e $$docs > $(notdir $@).tmp && \ + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ + (cd $(dir $@) && \ + $(_xml2po) -e $$docs > $(notdir $@).tmp && \ + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ + else \ + echo "(cd $(dir $@) && \ + $(_xml2po) -e -u $(notdir $@) $$docs)"; \ + (cd $(dir $@) && \ + $(_xml2po) -e -u $(notdir $@) $$docs); \ + fi + +# FIXME: fix the dependancy +# FIXME: hook xml2po up +$(_DOC_LC_DOCS) : $(_DOC_POFILES) +$(_DOC_LC_DOCS) : $(_DOC_C_DOCS) + if ! test -d $(dir $@); then mkdir $(dir $@); fi + case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";; esac; \ + if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \ + (cd $(dir $@) && \ + $(_xml2po) -e -p \ + "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \ + "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) +.PHONY: pot +pot: $(_DOC_POT) +$(_DOC_POT): $(_DOC_C_DOCS_NOENT) + $(_xml2po) -e -o $@ $^ + +$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) + xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + +all: \ + $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ + $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ + $(_DOC_HTML_ALL) $(_DOC_POFILES) + +.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir + +clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) +clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) +clean-doc-lc: + rm -f $(_DOC_LC_DOCS) + @list='$(_DOC_POFILES)'; for po in $$list; do \ + if ! test "$$po" -ef "$(srcdir)/$$po"; then \ + echo "rm -f $$po"; \ + rm -f "$$po"; \ + fi; \ + done + @for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc/.xml2po.mo"; then \ + echo "rm -f $$lc/.xml2po.mo"; \ + rm -f "$$lc/.xml2po.mo"; \ + fi; \ + done +clean-doc-dir: + @for lc in C $(_DOC_REAL_LINGUAS); do \ + for dir in `find $$lc -depth -type d`; do \ + if ! test $$dir -ef $(srcdir)/$$dir; then \ + echo "rmdir $$dir"; \ + rmdir "$$dir"; \ + fi; \ + done; \ + done + +clean-local: \ + $(_clean_omf) $(_clean_dsk) \ + $(_clean_lc) $(_clean_dir) +distclean-local: \ + $(_clean_omf) $(_clean_dsk) \ + $(_clean_lc) $(_clean_dir) +mostlyclean-local: \ + $(_clean_omf) $(_clean_dsk) \ + $(_clean_lc) $(_clean_dir) +maintainer-clean-local: \ + $(_clean_omf) $(_clean_dsk) \ + $(_clean_lc) $(_clean_dir) + +.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk +doc-dist-hook: \ + $(if $(DOC_MODULE),dist-doc-docs) \ + $(if $(_DOC_C_FIGURES),dist-doc-figs) \ + $(if $(_DOC_OMF_IN),dist-doc-omf) +# $(if $(_DOC_DSK_IN),dist-doc-dsk) + +dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) + @for lc in C $(_DOC_REAL_LINGUAS); do \ + echo " $(mkinstalldirs) $(distdir)/$$lc"; \ + $(mkinstalldirs) "$(distdir)/$$lc"; \ + done + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + +dist-doc-figs: $(_DOC_SRC_FIGURES) + @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ + for fig in $$list; do \ + if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$fig"; then \ + figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$figdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ + $(mkinstalldirs) "$(distdir)/$$figdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ + $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ + fi; \ + done; + +dist-doc-omf: + @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ + echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ + $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" + +dist-doc-dsk: + @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ + echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ + $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" + +.PHONY: check-doc-docs check-doc-omf +check: \ + $(if $(DOC_MODULE),check-doc-docs) \ + $(if $(_DOC_OMF_IN),check-doc-omf) + +check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) + @for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ + done + +check-doc-omf: $(_DOC_OMF_ALL) + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ + echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ + xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ + done + +.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk +install-data-local: \ + $(if $(DOC_MODULE),install-doc-docs) \ + $(if $(_DOC_HTML_ALL),install-doc-html) \ + $(if $(_DOC_C_FIGURES),install-doc-figs) \ + $(if $(_DOC_OMF_IN),install-doc-omf) +# $(if $(_DOC_DSK_IN),install-doc-dsk) + +install-doc-docs: + @for lc in C $(_DOC_REAL_LINGUAS); do \ + echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ + $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \ + done + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ + done + +install-doc-figs: + @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ + for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc/$$fig"; then \ + figfile="$$lc/$$fig"; \ + elif test -f "$(srcdir)/$$lc/$$fig"; then \ + figfile="$(srcdir)/$$lc/$$fig"; \ + elif test -f "C/$$fig"; then \ + figfile="C/$$fig"; \ + else \ + figfile="$(srcdir)/C/$$fig"; \ + fi; \ + figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ + if ! test -d "$$figdir"; then \ + echo "$(mkinstalldirs) $$figdir"; \ + $(mkinstalldirs) "$$figdir"; \ + fi; \ + figbase=`echo $$fig | sed -e 's/^.*\///'`; \ + echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ + $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + done; \ + done + +install-doc-html: + echo install-html + +install-doc-omf: + $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE) + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ + echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \ + done + @if test "x$(_ENABLE_SK)" = "xtrue"; then \ + echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ + scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ + fi; + +install-doc-dsk: + echo install-dsk + +.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk +uninstall-local: \ + $(if $(DOC_MODULE),uninstall-doc-docs) \ + $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ + $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ + $(if $(_DOC_OMF_IN),uninstall-doc-omf) +# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) + +uninstall-doc-docs: + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ + done + +uninstall-doc-figs: + @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ + echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ + done; + +uninstall-doc-omf: + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ + if test "x$(_ENABLE_SK)" == "xtrue"; then \ + echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + fi; \ + echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + done +dist-hook: doc-dist-hook +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: --- control-center-2.18.1.orig/debian/changelog +++ control-center-2.18.1/debian/changelog @@ -0,0 +1,1962 @@ +control-center (1:2.18.1-0ubuntu2) feisty; urgency=low + + * debian/patches/07_default_keys.patch: + - updated keycodes (play, pause, previous, next) (Ubuntu: #37225) + + -- Sebastien Bacher Thu, 12 Apr 2007 12:57:37 +0200 + +control-center (1:2.18.1-0ubuntu1) feisty; urgency=low + + * New upstream version: + sound: + - Initialize threads earlier + - Fix option context translation + - Fix button label alignment (Ubuntu: #88171) + - Ellipsize the device combo box + theme switcher: + - Disable revert button when using theme engine defaults colors + - Don't crash if the color string is mangled + - Close small memory leak + shell: + - Build libslab statically to avoid conflicts with gnome-main-menu + settings daemon: + - Fix multimedia window appearing in a different position when shown for + the first time (Ubuntu: #76919) + * debian/patches/37_use_dynamic_libslab.patch: + - don't use statuc libslab build, we will do that next cycle + * debian/patches/90_workaround_gnome_doc_utils_bug.patch: + - workaround gnome-doc-utils bug, fix the build + * debian/patches/91_from_svn_fix_gstreamer_warning.patch: + - dropped, fixed with the new version + + -- Sebastien Bacher Tue, 10 Apr 2007 14:52:26 +0200 + +control-center (1:2.18.0-0ubuntu3) feisty; urgency=low + + * debian/patches/70_from_bugzilla_extra_titlebar_actions_listed.patch: + - patch from bugzilla, list extra titlebar actions (Ubuntu: #90542) + + -- Sebastien Bacher Thu, 29 Mar 2007 11:36:46 +0200 + +control-center (1:2.18.0-0ubuntu2) feisty; urgency=low + + * debian/patches/91_from_svn_fix_gstreamer_warning.patch: + - patch from SVN, "Initialise threads early, and fix option context + translation", fix gstreamer warning (Ubuntu: #90756) + + -- Sebastien Bacher Mon, 19 Mar 2007 14:46:52 +0100 + +control-center (1:2.18.0-0ubuntu1) feisty; urgency=low + + * New upstream version: + about-me: + - Really fixed #411697 + - Use proper shadow type for the address fields + background: + - Plug leaks + display: + - Fix double free (Ubuntu: #87692) + fontilus: + - Fix linker flags + mouse: + - Add 2 popular cursor sizes to the filter + - Sort "Pointers" list alphabetically + - Fix build with gcc2 + theme-switcher: + - Replace deprecated function + - Remove some bogus old code that caused the current theme to be checked + instead of the new one + - Set the gtk-color-scheme even if it is blank and when + creating the thumbnail + - Search the gtkrc for the color scheme if none was found in the metatheme + file + - Don't try and open NULL filenames + window: + - Add missing libs to linker args + settings daemon: + - Fix ref counting problems + + -- Sebastien Bacher Tue, 13 Mar 2007 02:20:24 +0100 + +control-center (1:2.17.92-0ubuntu1) feisty; urgency=low + + * New upstream version: + about-me: + - Change default dir for the image chooser + - Dont use composite pixbuf to avoid unnecessary clipping + - Prevent child watcher from accessing already released memory + (Ubuntu: #86193) + default applications: + - Really fix DATADIR + - Dont try reading into invalid territory when the user set a custom + command without spaces (Ubuntu: #84715) + fontilus: + - Use GOption argument parsing + keybindings: + - Clear GConf client cache before reloading + keyboard: + - Avoid crashing on NULLs (Ubuntu: #82373) + settings daemon: + - Properly round volumes so that volume-up and -down act symetrically + (Ubuntu: #36302) + - Dont ignore errors when X refuses to update the pointer mapping + - Dont install the same filter twice for the default root window + - Correctly pass the function address when setting up the event filter + - Fix warnings + shell: + - Revert to old menu for 2.18 + theme switcher: + - Update selected fg color from the correct slot (Ubuntu: #86944) + - Fix warnings + - Format guint16 values accordingly + themus: + - Populate the VFS file info fields properly so that Nautilus shows, e.g., + read-only emblems in themes:// + windows: + - Remove some long-dead code + - Dont leak stuff on error + * debian/capplets-data.install: + - updated for a directory change + * debian/patches/90_revert_change_creating_high_cpu_usage.patch: + - dropped, fixed with the new version + * debian/patches/91_fix_default_applications_xml_path.patch: + - dropped, fixed with the new version + + -- Sebastien Bacher Tue, 27 Feb 2007 01:11:36 +0100 + +control-center (1:2.17.91-0ubuntu4) feisty; urgency=low + + * debian/control.in: + - the package is maintained by the Ubuntu Desktop Team + * debian/patches/16_preferred_applications_list_cleanup.patch: + - clean preferred applications list (Ubuntu: #55963) + - don't list Mozilla which is an alternative starting firefox + - don't list W3M, not really a desktop application + - don't list evolution2.2 which is a symlink used for upgrade compatibility + - don't list mozilla alternative as "Mozilla Mail" + * debian/patches/36-compiz-keybindings-support.patch: + - make the window manager actions being listed when using compiz, + patch by Nicolas Bruguier + * debian/rules: + - don't build to a different directory, workaround build problem + + -- Sebastien Bacher Mon, 19 Feb 2007 19:03:04 +0100 + +control-center (1:2.17.91-0ubuntu3) feisty; urgency=low + + * debian/patches/91_fix_default_applications_xml_path.patch: + - fix the applications database location + + -- Sebastien Bacher Wed, 14 Feb 2007 12:34:33 +0100 + +control-center (1:2.17.91-0ubuntu2) feisty; urgency=low + + * debian/patches/90_revert_change_creating_high_cpu_usage.patch: + - revert patch from CVS creating high shell CPU usage + + -- Sebastien Bacher Tue, 13 Feb 2007 15:06:46 +0100 + +control-center (1:2.17.91-0ubuntu1) feisty; urgency=low + + * New upstream version: + common: + - Compilation fixes + - Fixed localedir defines + - Use standard installation paths + - Use capplet name for G_LOG_DOMAIN + - Require GTK+ <= 2.10 + about me: + - Fix build with gcc 2 + - Fix memory leaks + - Fix possible crash + at-properties: + - Fix reference leaks and dont segfault if glade file is not available + default applications: + - Use specific string as app ID in gnome_program_init + - Plug memory leaks + - Fix DATADIR define + keybindings: + - Issue a sensible error message when trying to use unmodified keybindings + (Ubuntu: #82065) + - Removed leftover call to gnome_theme_init + - Support localised key names + - Clean up sorting to not use an imaginary column + - Avoid warnings when clearing at exit + - Added missing GConf key + mouse: + - Dont crash if the glade file is not available + network: + - Plug memory leaks + sound: + - Polypaudio->PulseAudio renaming + - Added a11y label relations for the devices tab + theme switcher: + - Fix compiler warnings + - Fixes on the suffix checks + - Pass correct order of arguments to gnome_vfs_xfer + - Listen for changes in the gtk-color-scheme property of GtkSettings + typing break: + - Use specific string as app ID in gnome_program_init + - Use compositing to display the typing break window when available + ui properties: + - Plug memory leaks + - Change "Editable menu accelerators" to "Editable menu shortcut keys" + as per the style guide + windows: + - Plug memory leaks + fontilus: + - Use GOption argument parsing + - Fixed some leaks + themus: + - Port to GOption + settings daemon: + - Prevent crashes/assertion failures trying to set ridiculously high/low + volumes + - Fixed property names + - Dont install the same window filter twice + - Make sure we have a key event before treating it as such + - Fixed leaks + - Round volume instead of truncating on umute so a simple mute/unmute + doesn't lower the volume (Ubuntu: #81203) + - Make the new volume overlay window follow the icon and color themes + - Eat media player keys if someone is listening on the bus interface + already + - Revert to the old font path if the new one could not be set + (Ubuntu: #2066, #52163, #79566) + shell: + - Prevent capplets from being launched twice + - Use correct GConf prefix + - Added default common tasks + - Respect the exit_on_close flag + - Added a flag controlling display of GenericName's + - Fix typo in usage string + - Respect the --disable-schemas-install configure flag + - Dump remnants of gstreamer-0.8 + - Use custom gnomecc.menu instead of settings.menu + - Dont show Help menu if help is not available + - Disable package management/main-menu items in the context menu + (Ubuntu: #81335) + - Use correct text color when highlighting + - Use smaller icons by default + - Use G_GNUC_FUNCTION instead of non-portable __FUNCTION__ + * debian/capplets-data.install: + - updated the list of files to install + * debian/control.in: + - capplets-data replaces gnome-main-menu + - require GTK 2.10 + * debian/patches/02_xrdb.patch: + - updated + * debian/patches/34_at_properties_onboard_and_new_interface.patch: + - updated + * debian/patches/80_fix_user_directory_cleanup_when_no_autostart.patch: + - dropped, fixed with the new version + * debian/patches/81_get_rid_of_orca_main_window.patch: + - patch by Chris Jones, run orca with the "--disable=main-window" option + (Ubuntu: #84172) + + -- Sebastien Bacher Tue, 13 Feb 2007 10:02:54 +0100 + +control-center (1:2.17.90-0ubuntu4) feisty; urgency=low + + * debian/patches/16_gsd-reaper-no-iopipe.patch: + - dropped patch used since warty to fix the login hanging from some people + when using no sound card (#8678), other distributions don't have that + patch and don't seem to get the bug, maybe it has been fixed. The patch + also creates some problem with the type break feature. We can work + on a fix with upstream or use the patch again before feisty if the login + problem happens again without the patch (Ubuntu: #13180) + + -- Sebastien Bacher Mon, 5 Feb 2007 18:27:29 +0100 + +control-center (1:2.17.90-0ubuntu3) feisty; urgency=low + + * debian/patches/80_fix_user_directory_cleanup_when_no_autostart.patch: + - update, use g_unlink on a filename rather than using + gnome_vfs_xfer_delete_list + + -- Sebastien Bacher Tue, 30 Jan 2007 23:37:03 +0100 + +control-center (1:2.17.90-0ubuntu2) feisty; urgency=low + + * debian/patches/80_fix_user_directory_cleanup_when_no_autostart.patch: + - use xdg autostart dir instead of a gconf key non set by the package, + fix autostart removal cleaning the user directory when the corresponding + gconf key has no value (Ubuntu: #78500) + + -- Sebastien Bacher Tue, 30 Jan 2007 22:34:40 +0100 + +control-center (1:2.17.90-0ubuntu1) feisty; urgency=low + + * New upstream version: + common: + - Removed non-critical g_return_if_fail + - Added support for saving and applying the gtk-color-scheme key + - Replaced non-standard categories with X-GNOME... + - Check for xf86misc lib in addition to header files + about-me: + - Fixed compilation on Solaris + - Made translatable strings more generic + a11y: + - Renamed to "Keyboard Accesiblity" in .desktop file + background: + - Fixed several compile warnings + default applications: + - Moved capplet from System to Personal category + keyboard: + - Don't crash if default group is not set in GConf + keybindings: + - Moved scrolled window calls to their correct place + - Fixed leaks + - Corrected .desktop category entry + mouse: + - Fixed memory leaks + sound: + - Added NULL-check + - Fixed spacing and build the whole dialog from Glade + - Show the sound properties view after adding it to the dialog + - Fixed label alignments bug caused by Glade-3 #396433 + - Set play button insensitive when no sound is selected + (Ubuntu: #32861) + theme switcher: + - Fixed build with gcc 2 + - Removed separate color scheme saving UI + - Added support for gtk-color-scheme key in metatheme info + - Added a revert button to the color schemes tab + typing break: + - Set default icon and application name + windows: + - Fixed leak + shell: + settings daemon: + - Added missing NULL-check + - Removed variable that was never initialized + - Quit application when window is closed (Ubuntu: #78152) + - Set program name to gnome-control-center + * debian/patches/25_window_manager_settings.patch: + - updated + * debian/patches/90_from_svn_fix_no_schemas_sound_properties_crasher.patch: + - dropped, fixed with the new version + * debian/patches/91_from_svn_list_misc_category.patch: + - dropped, fixed with the new version + + -- Sebastien Bacher Tue, 23 Jan 2007 10:16:44 +0100 + +control-center (1:2.17.5-0ubuntu4) feisty; urgency=low + + * debian/control.in: + - require new gnome-menus version + * debian/patches/35_fix_menu_to_use_for_the_shell.patch: + - dropped, not required with the new gnome-menus categorisation + * debian/patches/91_from_svn_list_misc_category.patch: + - patch from SVN, list item without category to misc + + -- Sebastien Bacher Thu, 11 Jan 2007 17:28:52 +0100 + +control-center (1:2.17.5-0ubuntu3) feisty; urgency=low + + * debian/control.in: + - Build-Depends on scrollkeeper + + -- Sebastien Bacher Tue, 9 Jan 2007 23:53:03 +0100 + +control-center (1:2.17.5-0ubuntu2) feisty; urgency=low + + * debian/patches/90_from_svn_fix_no_schemas_sound_properties_crasher.patch: + - fix gnome-sound-properties crashing on startup when the gconf mixer + keys are not correctly set + + -- Sebastien Bacher Tue, 9 Jan 2007 19:57:11 +0100 + +control-center (1:2.17.5-0ubuntu1) feisty; urgency=low + + * New upstream version: + about-me: + - Fix displaying of image selected by the user (Ubuntu: #47170) + background: + - Mark message showing background image size and type for translation + - Switched from popt to GOptionContext + - Fix memory leaks + - Fix crash when changing image name + - Fix ability to change settings after manual change + - Improve management of background thumbnails + - Fix compilation on Solaris + common: + - Fix leaks + - Add support for disabling esound + fonts: + - Make 'Font may be too large' dialog cleare + keybindings: + - Reuse the existing tree model instead of discarding and rebuilding it + - Fix leaks + keyboard: + - Switch from popt to GOptionContext + - Fix typo + mouse: + - Switch from popt to GOptionContext + network: + - Add option to use the same proxy for all protocols + - Add missing mnemonic + sound: + - Mark sound system names translatable + - Do proper dbus/libhal error handling + - Switch from popt to GOptionContext + - Make ESD optional + - Add accelerators to the device tab + - Spelling fixes + - Use GtkAlignment for padding, not GtkHBox+GtkFrame + - Make volume up/down keys affect default channel of the applet + theme-switcher: + - Fix crash on manually changing the icon theme name + - Fix some HIG issues with strings + - Fix leaks + - Set minimun size request on the treeview rather than the entire window + - Fix build with c89 compilers + - Avoid markup in translatable messages + - Enable a message when the current theme does not support colour schemes + - Add custom colour scheme saving UI + - Add MIME type for theme packages and support in the GUI + windows: + - Avoid markup in translatable messages + shell: + - Fix build with c89 compilers + - Use categories for control center applets + settings daemon: + - Add DBus methods for media players to grab/release the keys (Ubuntu: #40747) + - Add support for GConf device and track selection + fontilus: + - Add support for specifying string and font-size to use in the thumbnailer + themus: + - Fix crash when running from command prompt + * debian/patches/13_unlink_out_of_date_thumbs.patch: + - dropped, the new version has fixes for the thumbnailing + * debian/patches/17_menu-changes.patch: + - dropped, deprecated by the new control-center shell and the menus change + * debian/patches/22_bkg_capplet_follow_symlink.patch: + - dropped, the new version has fixes for the thumbnailing + * debian/patches/35_fix_menu_to_use_for_the_shell.patch: + - updated for now, will change again with the next gnome-menus version + + -- Sebastien Bacher Tue, 9 Jan 2007 10:51:48 +0100 + +control-center (1:2.17.4-0ubuntu1) feisty; urgency=low + + * New upstream version: + background: + - Plug a leak + common: + - Pass NULL to gtk_label_new() to do a bit less work + default-application: + - Fix a bunch of leaks from gconf_client_get_string() + - add support for Iceweasel and Icedove + - Fix Thunderbird command line parameter + - add support for Claws Mail (aka Sylpheed-Claws) + display: + - Don't leak the resolution. Pass NULL to gtk_label_new to do less work + localization: + - Plug some leaks. + network: + - Fix a warning about unused result from g_slist_append(). + theme-switcher: + - Plug a few leaks. + - HIG fixes to the color scheme tab, from suggestions in Bug 382517 + - Rename "Theme Details" button to "Customize + gnome-settings-daemon + - add a new media keys window that takes advantage of + compositing when available + * debian/patches/18_use_stock_icons.patch: + - dropped, that code has been rewritten and the patch is not useful + * debian/patches/28_thunderbird-no-compose-flag.patch: + - dropped, fixed with the new version + * debian/patches/29_iceweasel-icedove-preferred-apps.patch: + - dropped, fixed with the new version + + -- Sebastien Bacher Tue, 19 Dec 2006 17:05:47 +0100 + +control-center (1:2.17.3-0ubuntu2) feisty; urgency=low + + * debian/control.in: + - Build-Depends on libxklavier-dev too + + -- Sebastien Bacher Tue, 12 Dec 2006 16:25:30 +0100 + +control-center (1:2.17.3-0ubuntu1) feisty; urgency=low + + * New upstream version: + common: + - Clean up file transfer dialog + keyboard: + - Updated to new libgnomekbd API + shell: + - New control-center shell + theme: + - Fixed crash in D&D of themes (Ubuntu: #73115) + - Open transfer dialog with transient parent set + - Added a colours tab to change gtk-color scheme setting + - Fixed leak + - Cleanup some of the install code + - Allow installing a theme from a directory (Ubuntu: #24296) + typing break: + - Fixed redefinition of GNOMELOCALEDIR + - Removed use of const char * for allocated strings + * debian/capplets-data.install: + - updated, the new version has no icon installed to hicolor + * debian/control.in: + - Build-Depends on librsvg2-dev, libpango1.0-dev, libpanel-applet2-dev, + libgnomekbdui-dev, libgnomekbd-dev + - don't Build-Depends on libxklavier-dev + - list new packages for libslab + * debian/libslab0.install, debian/libslab-dev.install: + - new packages for libslab + * debian/patches/12_sort_entries.patch: + - dropped, deprecated with the new shell + * Sync with Debian + * debian/control.in: + - don't use type-handling. + - libgnome-settings-daemon-dev Conflicts,Replaces,Provides + gnome-control-center-dev, Debian named that package differently + - Suggests xrdb + * debian/index.theme: + - drop the Debian specific Default theme entry, it's confusing + (Ubuntu: #15268). + * debian/patches/01_debian_ubuntu.patch, + debian/patches/07_default_keys.patch, + debian/patches/13_unlink_out_of_date_thumbs.patch, + debian/patches/16_gsd-reaper-no-iopipe.patch, + debian/patches/17_menu-changes.patch: + - ubuntu changes. + * debian/patches/02_xrdb.patch: + - use xrdb + * debian/patches/18_use_stock_icons.patch: + - initial patch by j^ , use stock icons for the volume popup + (Ubuntu: #20302) + * debian/patches/19_extra_keybindings.patch: + - updated + * debian/patches/21_no_sleep_key.patch: + - replace 27_remove_hibernation_and_sleeping..patch, the power function + is useful, only drop the sleep shortcut assignation + * debian/patches/23_menu_files_conflict.patch: + - Debian specific change. + * debian/patches/34_at_properties_onboard_and_new_interface.patch: + - make the osk option active only when at-spi is active, + patch update by Chris Jones (Ubuntu: #65937) + * debian/patches/35_fix_menu_to_use_for_the_shell.patch: + - use settings.menu instead of preferences.menu + * debian/rules: + - run "intool-update -p", the cdbs magic doesn't work because the + build directory is not the same as the source one + + -- Sebastien Bacher Tue, 5 Dec 2006 19:12:44 +0100 + +control-center (1:2.16.2-2) experimental; urgency=low + + * Conflict with gnome-session < 2.16. + + -- Josselin Mouette Mon, 27 Nov 2006 20:55:48 +0100 + +control-center (1:2.16.2-1) experimental; urgency=low + + [ Marco Cabizza ] + * New upstream release: + - gnome-settings-daemon doesn't crash anymore, hooray! (Closes: #372873) + - dropping merged patches 26_ignore_pmu_permissions.patch and 27_bzip2.patch + - adapting 19_extra_keybindings.patch + * Bumping dependencies: libgtk2.0-dev, libxklavier11-dev, libebook-dev + * Build-Depends on hal and dbus + * Splitting off some stuff (gnome-window-settings.pc and its headers) into + libgnome-window-settings-dev, and thus including the dbus .service in + capplets-data + * Updated the watch file + + [ Loic Minier ] + * Fix watch file to track stable releases and use HTTP. + + [ Josselin Mouette ] + * Merge 2.14.2-5. + * rules: call clean-la.mk. + * Build-depend on gnome-pkg-tools 0.7. + * 29_iceweasel-icedove-preferred-apps.patch: remove the tons of + useless translations of iceweasel and icedove by themselves. + + -- Josselin Mouette Sun, 26 Nov 2006 21:38:20 +0100 + +control-center (1:2.14.2-5) unstable; urgency=low + + * Update patch 29_iceweasel-icedove-preferred-apps to change the mixed case + IceWeasel in Iceweasel. + + -- Loic Minier Sat, 25 Nov 2006 13:34:41 +0100 + +control-center (1:2.14.2-4) unstable; urgency=low + + * New patch, 29_iceweasel-icedove-preferred-apps, to offer IceWeasel and + Icedove in the list of preferred applications; thanks Sven Arvidsson; + closes: #393549. + + -- Loic Minier Sat, 25 Nov 2006 11:41:26 +0100 + +control-center (1:2.14.2-3) unstable; urgency=low + + [ Loic Minier ] + * New patch, 28_thunderbird-no-compose-flag, to fix the way browsers invoke + Thunderbird (drop the -compose flag which is added automatically for + mailto: URLs); thanks Manuel Bilderbeek. (Closes: #380284) + * Recommend gnome-user-guide instead of gnome2-user-guide; thanks Luk Claes. + (Closes: #378718) + + [ Marco Cabizza ] + * Set the correct path for bzip2 adding patches/27_bzip2.patch, and + Recommends: bzip2, (Closes: #378141) + + [ Josselin Mouette ] + * Suggest gnome-screensaver first, xscreensaver second. + * Make libgnome-window-settings-dev tolerate binNMUs. + * Depend on gnome-pkg-tools 0.6. + * Use ${gnome:Version} and ${gnome:NextVersion}. + * Call gnome-version.mk in rules. + + -- Josselin Mouette Fri, 1 Sep 2006 21:24:32 +0200 + +control-center (1:2.14.2-2) unstable; urgency=high + + [ Marco Cabizza ] + * debian/control, debian/control.in: + - libgnome-window-settings1 replaces capplets (Closes: #372804) + + [ Sjoerd Simons ] + * debian/patches/26_ignore_pmu_permissions.patch + - Added. Ignore errors when we can't open or use the pmu device for + brightness settings. A better fix would be to use hal instead. + (Closes: #373146) + + [ Loic Minier ] + * Fix versioned dependency of capplets-data on gnome-control-center. + * Let libgnome-window-settings1 conflict with capplets too. + * Drop capplets Provides. + + -- Loic Minier Fri, 7 Jul 2006 22:28:58 +0200 + +control-center (1:2.14.2-1) unstable; urgency=low + + * New upstream release + * debian/control, debian/control.in: + - libgnome-window-settings1, libgnome-window-settings-dev Replaces + gnome-control-center << 1:2.14.0-1 (Closes: #370211) + - New maintainer + * compat, libgnome-window-settings1.install, gnome-control-center.install: + - Debhelper compatibility is 5 + - Fixed some missing files errors + + -- Marco Cabizza Sun, 28 May 2006 18:53:48 +0200 + +control-center (1:2.14.1-1) unstable; urgency=low + + [ Marco Cabizza ] + * New upstream release. + - fixed the xkb releated bugs (Closes: #348809, #349399, #351798) + - evdev doesn't crash gnome-settings-daemon any more + (Closes: #362107, #362563) + - fixed the gnome-settings-daemon crash at startup (Closes: #347796) + * debian/control, debian/control.in: + - dropped the dependency on xlibs due to its deprecation and since + libxklavier depends on xkb-data (Closes: 342536, #365977) + - standards version is 3.7.2 + - Build-depend on libgtk2.0-dev (>= 2.8.12) and + libgstreamer-plugins-base0.10-dev + * debian/rules: + - append --enable-gstreamer=0.10 to configure + * debian/capplets-data.install: + - added usr/share/desktop-directories to the list + * debian/patches/02_xrdb.patch: + - updated to fit upstream + * debian/patches/08_pmu_fix.patch: + - dropped; already merged upstream + * New packages: + - Move libgnome-window-settings.so.1 in the newly created + libgnome-window-settings1 and add libgnome-window-settings1.shlibs + - Move the libwindow-settings' header files in the newly created + libgnome-window-settings-dev + * debian/patches/25_window_manager_settings.patch: + - rename /usr/lib/window-manager-settings to + /usr/lib/libgnome-window-settings1. + + [ Josselin Mouette ] + * Make the package binNMU-safe. + + Build-depend on dpkg-dev 1.13.19. + + Use ${source:Version}. + + -- Marco Cabizza Sat, 6 May 2006 17:01:39 +0200 + +control-center (1:2.12.3-2) unstable; urgency=medium + + * Build-depend on libxrender-dev, libx11-dev, and libxt-dev explicitely as + these are used in configure.in, fixes FTBFS. + [debian/control, debian/control.in] + * Add missing build-deps on libgconf2-dev, libbonoboui2-dev, libesd0-dev, + libgnomevfs2-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev. + [debian/control, debian/control.in] + * Fix old changelog entries: + - Fix the bug number closed in 1:2.12.1-2. + - Explain Marillat's joke in 1:2.4.0-8. (Closes: #244288) + + -- Loic Minier Tue, 21 Feb 2006 11:38:12 +0100 + +control-center (1:2.12.3-1) unstable; urgency=low + + * New upstream release. + * Recommend evolution-data-server since gnome-about-me seems to require it. + (Closes: #340419) + [debian/control, debian/control.in] + + -- Loic Minier Mon, 20 Feb 2006 18:27:00 +0100 + +control-center (1:2.12.2-2) unstable; urgency=low + + [ Gustavo Noronha Silva ] + * debian/control.in: + - increased debhelper b-dep to >= 4.1.0, because of cdbs + + [ Josselin Mouette ] + * Rebuild to get rid of libgamin0 dependency (closes: #348347). + + -- Josselin Mouette Mon, 16 Jan 2006 20:47:30 +0100 + +control-center (1:2.12.2-1) unstable; urgency=low + + * New upstream release + * debian/control.in: + - removed duplicated build-dep on libgnome-menu-dev, leaving + the bigger one (>= 2.12), thanks to Kurt Roeckx + for pointing out + + -- Gustavo Noronha Silva Sun, 8 Jan 2006 12:02:37 -0200 + +control-center (1:2.12.1-2) UNRELEASED; urgency=low + + * Only install /usr/share/applications/*.desktop, not + /usr/share/applications in capplets-data, and rm -rf + /usr/share/applications/mimeinfo.cache in + binary-post-install/capplets-data:: to be completely safe (the + update-desktop-database can't be deactivated via configure). + (Closes: #346062) + [debian/capplets-data.install, debian/rules] + + -- Loic Minier Sat, 7 Jan 2006 15:30:16 +0100 + +control-center (1:2.12.1-1) experimental; urgency=low + + [ Loic Minier ] + * New upstream releases. + - Update watch file. [debian/watch] + - Don't run scrollkeeper. [debian/rules] + - Bump libgtk2.0-dev build-dep to >= 2.6.0. + [debian/control, debian/control.in] + - Add a libxft-dev build-dep on >= 2.1.2. + [debian/control, debian/control.in] + - Version libgnome-menu-dev build-dep on >= 2.10.1. + [debian/control, debian/control.in] + - Enable about-me capplet. + . Update configure flags. [debian/rules] + . Add libebook1.2-dev build-dep. [debian/control, debian/control.in] + - Suggest gnome-screensaver. [debian/control, debian/control.in] + * Add CDBS' utils. [debian/rules] + * Don't overwrite DEB_CONFIGURE_EXTRA_FLAGS and + DEB_INSTALL_MANPAGES_gnome-control-center. [debian/rules] + + [ Sjoerd Simons ] + * debian/patches/12_sort_entries.patch + - Updated for new upstream + * debian/patches/20_gswitchit_dont_crash_when_no_xkb_config.patch + - Removed. fixed upstream + * debian/patches/22_bkg_capplet_follow_symlink.patch + - Updated for new upstream (from the ubuntu package) + * debian/patches/23_menu_files_conflict.patch + - Update for new upstream + * debian/patches/99_reautogenization.patch + - Removed + * Updated build-depends + * Install gnome-about-me and the nautilus extensions + * Use upstream versions of gnome-font-viewer.desktop and + themus-theme-applier.desktop + + -- Sjoerd Simons Mon, 21 Nov 2005 18:21:32 +0000 + +control-center (1:2.10.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Use again --as-needed. + + [ Marc Dequènes (Duck) ] + * New upstream release. + * Applied patch for gnome-font-viewer 'fonts:///' url capability from + Sam Morris (Closes: #316188). + * Fixed 'Apply theme' contextual entry in 'themes://' (corrected + 'debian/themus-theme-applier.desktop') (Closes #298360). + * Regenerated and merged reautogenization patches. + + -- Marc Dequènes (Duck) Fri, 30 Sep 2005 15:08:27 +0200 + +control-center (1:2.10.1-6) unstable; urgency=medium + + * Urgency medium because of FTBFS on sparc and alpha (binutils issue). + * Remove --as-needed from LD_FLAGS. + + -- Loic Minier Wed, 10 Aug 2005 12:48:11 +0200 + +control-center (1:2.10.1-5) unstable; urgency=high + + * Urgency high because of RC bugfix and because this holds the GNOME 2.10 + transition. + * Add missing build-deps on libxss-dev (Closes: #319971) and + libxinerama-dev. + + -- Loic Minier Tue, 26 Jul 2005 09:52:43 +0200 + +control-center (1:2.10.1-4) unstable; urgency=medium + + * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. + * 24_theme_dont_require_metacity.patch: make gnome-theme-manager work + without metacity being installed (closes: #315730). + * Use type-handling's Provides: feature to avoid hacking the control file. + * Remove the capplets package, which doesn't have a purpose anymore. Move + all package contents back to gnome-control-center. + * Remove most Replaces: and Conflicts:, not useful anymore. + * Standards-version is 3.6.2. + + -- Josselin Mouette Sat, 25 Jun 2005 19:11:37 +0200 + +control-center (1:2.10.1-3) unstable; urgency=low + + * Fix menu files conflict (renaming 'preferences.menu' to 'gnome- + preferences.menu') (causing control-center summary window to be + empty). + * Now building in 'debian/build/' directory (cleaner & avoid non- + idempotency hackerie). + * Updated 'debian/copyright' download URL. + * 'debian/rules' spring-cleaning. + + -- Marc Dequènes (Duck) Wed, 15 Jun 2005 00:47:05 +0200 + +control-center (1:2.10.1-2) unstable; urgency=low + + * Upload to unstable (GNOME Team upload) (Closes: #313217). + * Fixed in 2.10 : + + crashes at startup when loading settings (Closes: #251126). + + installing files from ~/.themes fails (Closes: #166983). + + bad icon themes install path (Closes: #257241). + + installing bad theme fails silently (Closes: #166982). + + incorrect position of volume dialog (Closes: #260277). + + cannot turn off sound events (Closes: #216927). + and probably some more... + * Buildsys not idempotent breaking next build because of missing + schema '.in' file worked around in clean rule (GNOME people should + really learn to test before releasing...). + + -- Marc Dequènes (Duck) Sun, 12 Jun 2005 19:43:28 +0200 + +control-center (1:2.10.1-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - Updated build-dependencies + * debian/patches: + - 01_gnome-default-applications-properties-structs.c.patch: Removed as + Debian's default applications are included upstream + - 03_gsd_actions_makefile.am.patch: Not more needed + - 05_path_xtra-2.patch: Regenerated + - 06_disable_update_mime_at_install.patch: + - 07_disable_update_mime_at_install-2.patch: + Don't call update-desktop-database + - 11_sleepkey.patch: patch taken to seb128's package to use gdm-signal + - 12_sort_entries.patch: Sort entries in each categories + when suspending from keyboard key + - 21_show_xkb_warning_one_time.patch: should not be needed anymore + - 21_show_xkb_warning_one_time.patch: updated + - 17_locate_pointer.patch: + - 23_infinite_loop_theme_manager.patch: + This upstream version has theses patches + + -- Arnaud Patard Sat, 9 Apr 2005 01:00:12 +0200 + +control-center (1:2.8.2-3) unstable; urgency=medium + + * 20_gswitchit_dont_crash_when_no_xkb_config.patch: + + Reverse a wrong test condition. + + Don't check the "options" key (closes: #296434). + + -- Josselin Mouette Thu, 17 Mar 2005 22:28:32 +0100 + +control-center (1:2.8.2-2) unstable; urgency=low + + * debian/control: + - fixes the Build-Depends (Closes: #299753). + + -- Sebastien Bacher Wed, 16 Mar 2005 23:29:27 +0100 + +control-center (1:2.8.2-1) unstable; urgency=low + + * New upstream version: + - Fix theme thumbnailing + - Fix widget expansion in the keyboard preferences + - Handle backspace in multilayout setups correctly + - theme-thumbnailer doesn't require an absolute path + * debian/patches: + - 05_relibtoolised.patch : Removed as no more accurate + - 06_gst-fix.patch: Merged + - 14_gst-mixer-grab.patch : Merged + - 16_disable_text_editor_tab.patch: Merged + - 18_logout.patch: Merged + - 04_path_xtra.patch: Updated to patch only the configure.in file. The + configure update is now in 05_path_xtra.patch-2.patch + - 23_infinite_loop_theme_manager.patch: Forgotten patch in the 2.8.2 + release + * debian/rules: + - Pass --as-needed to LDFLAGS to reduce dependencies and removes + dependency upon libhowl0. (Closes: 298805) + * debian/control.in: + - Depends on libgnomeui >= 2.8.1-3 to be sure to remove the dependency on + the libhowl0 + + -- Arnaud Patard Wed, 9 Mar 2005 23:18:44 +0100 + +control-center (1:2.8.1-4) unstable; urgency=low + + * debian/patches: + - 17_locate_pointer.patch: fix the "locate pointer" when numlock is + activated. + - 18_logout.patch: fix the logout shortcut (Closes: #289009). + - 01_gnome-default-applications-properties-structs.c.patch: Corrected + Thunderbird command (Closes: #278762) + - Updated 08_pmu_fix.patch with patches from Sjoerd Simons and Sven Luther + as a fix for the pmu error message + - 19_extra_keybindings.patch: Add bindings for calculator and music + multimedia keys (Closes: #291917) + - 20_gswitchit_dont_crash_when_no_xkb_config.patch: Patch from kov to + prevent crash when used remotely (Closes: #286220) + - 21_show_xkb_warning_one_time.patch: Adopt a similar behaviour as for the + xmodmap warning (Closes: #287965) + - 22_bkg_capplet_follow_symlink.patch: Resolv symlink to generate the + thumbnails (Closes: #281657) + + -- Arnaud Patard Sun, 6 Feb 2005 19:13:04 +0100 + +control-center (1:2.8.1-3) unstable; urgency=low + + * debian/rules: + - Corrected erroneous line responsible for not including the .desktop + files (Closes: #274401) + * debian/patches: + - Suppressed 'Text Editor' in the "preferred applications" as it's useless + with the new mime type system. + + -- Arnaud Patard Thu, 25 Nov 2004 21:16:04 +0100 + +control-center (1:2.8.1-2) unstable; urgency=low + + * debian/rules,debian/capplets.install: + - Added manually a .desktop for fontilus taken from Gnome's cvs + (Closes: #274401) + - Added manually a .desktop for themes:///. Thanks to Dan Korostelev + + -- Arnaud Patard Wed, 17 Nov 2004 23:44:21 +0100 + +control-center (1:2.8.1-1) experimental; urgency=low + + * New upstream release + - Some tweaking of the available default applications + - Background capplet fixes + - keyboard patchs + - Patch leak in XKB code + - update translations + * Update the package with the modifications from the 2.6 package + * Added Evolution 2.0 to preferred applications (Closes: 279198) + * debian/patches: + - Removed 13_drw_monitor.patch + - Re-added an updated version of 14_gst-mixer-grab.patch as the bug + isn't fixed upstream + + -- Arnaud Patard Tue, 9 Nov 2004 00:24:23 +0100 + +control-center (1:2.8.0-1) experimental; urgency=low + + * GNOME Team Upload with Rtp's permission. + * New upstream release : + + fix french typo (Closes: #238387) (or even closed in 2.6). + + fix german typo (Closes: #267767) + * Removed 07_acme_position.patch and 11_default_app.patch now + applied upstream. + * Removed part of the 12_custom_browser.patch related to the dead + file-types capplet (due to mime system changes). + * Corrected 'patch unexpectedly ends in middle of line' in + 13_drw_monitor.patch. + * Removed 14_gst-mixer-grab.patch recoded upstream. + * Updated URL in 'debian/copyright'. + * Updated watch file. + * 'debian/control.in' : using ${misc:Depends} and updated versions. + * Added 'autotools-dev' to build dependencies to take advantage of the + CDBS automatic 'config.*' management. + * Regenerated relibtoolize patch. + * As not (yet) DD i'm not listed as GNOME Team member, so adding + myself to Uploaders to avoid this upload to be considered a NMU. + + -- Marc Dequènes (Duck) Wed, 15 Sep 2004 04:20:24 +0200 + +control-center (1:2.6.1-13) unstable; urgency=low + + * debian/patches: + - Added a sanity check on the type of gconf value before calling strcmp in + gconf_property_editor (Closes: #272358) + - Check that one is on a powerpc with a pmu before reporting that's + there is no /dev/pmu in 08_pmu_fix.patch (Closes: #273336) + - Updated 01_gnome-default-applications-properties-structs.c.patch to add + FireFox and ThunderBird (Closes: #265882) + - Added a check on self->priv in 14_gst-mixer-grab.patch in order to + provent a crash if something went wrong during initialiastion + (Closes: #269429) + - Updated 09_locate_pointer.patch XUngrabKeyboard call thanks to Sjoerd + Simons (Closes: #275723) + * debian/control{,.in},debian/rules: + - Patch from Robert Millan to build on kfreebsd-gnu (Closes: #272722) + + -- Arnaud Patard Tue, 12 Oct 2004 13:49:27 +0200 + +control-center (1:2.6.1-12) unstable; urgency=low + + * debian/patches: + - Corrected patch 11_default_app.patch so that it checks the pointer value + before calling strlen (Closes: #264288) + - Added a patch that close the mixer devices after 4s of inactivity + (Closes: #255793) + + -- Arnaud Patard Fri, 13 Aug 2004 12:47:09 +0200 + +control-center (1:2.6.1-11) unstable; urgency=low + + * debian/patches: + - Added a patch for fixing the default applications properties capplet + (Closes: #245237) + - Added a patch from http://bugzilla.gnome.org/show_bug.cgi?id=123487 for + handling http,https, unknow urls with the custom browser setting + (Closes: #236297) + - Backported a patch from control-center 2.7 for preventing the typing + break to starts while watching a movie with totem + * debian/control.in: + - Updated the libgnomeui-dev build-depends to get gnutls11 + (Closes: #263609) + + -- Arnaud Patard Thu, 5 Aug 2004 17:46:37 +0200 + +control-center (1:2.6.1-10) unstable; urgency=low + + * debian/patch + - Added a patch so that using the 'locate cursor' mouse option doesn't + disable all multimedia keybinding (Closes: #257581) + - Corrected the patch for the pmu by suppressing the wrong test, as + discussed with upstream (Closes: #258105) + - Added a patch from http://bugzilla.gnome.org/show_bug.cgi?id=145271 to + ensure that all keysims in shortcuts exists in the keymap (Closes: 254745) + * debian + - Corrected some errors in the man page. + + -- Arnaud Patard Mon, 12 Jul 2004 23:32:27 +0200 + +control-center (1:2.6.1-9) unstable; urgency=low + + * debian/patch: + - Corrected the patch so that all modified files are in the diff + (Closes: #257352) + - Modified 06_gst-fix.patch to ensure the usage of the first soundcard on + system with multiple soundcards + + -- Arnaud Patard Sat, 3 Jul 2004 12:50:18 +0200 + +control-center (1:2.6.1-8) unstable; urgency=low + + * debian/capplets-data.install: + - Suppressed the line that was reponsible for copying Xresources two times + (Closes: #252324). + * debian/control.in: + - Added libgstreamer-plugins0.8-dev to build-depends + - Added some gstreamer sound plugin for the volume keybindings + * debian/patch: + - Added a patch from Sjoerd Simons to fix the gstreamer volume code + (Closes: #251831,#253416) + - Added a patch for setting the position of the volume window after + showing it (Closes: #254822) + - Added a patch for cleaning error messages for /dev/pmu from + http://bugzilla.gnome.org/show_bug.cgi?id=132655. It will be merged + in 2.7 (Closes: #252460) + + -- Arnaud Patard Thu, 1 Jul 2004 22:16:30 +0200 + +control-center (1:2.6.1-7) unstable; urgency=high + + * debian/control.in: + + removed libgstreamer-plugins0.8-dev from Build-Depends. + + -- Sebastien Bacher Sat, 19 Jun 2004 15:10:37 +0200 + +control-center (1:2.6.1-6) unstable; urgency=high + + * Rebuilt without gstreamer to try to get control-center in testing fast + to fix nautilus' breakage. + + -- Sebastien Bacher Fri, 18 Jun 2004 01:26:12 +0200 + +control-center (1:2.6.1-5) unstable; urgency=low + + * Rebuilt in a pbuilder, fix the crashe due to linkage with both libxft + (Closes: #254076). + + -- Sebastien Bacher Sat, 12 Jun 2004 23:22:42 +0200 + +control-center (1:2.6.1-4) unstable; urgency=low + + * Gnome Team Upload. + * Added a link to the gnome-settings-daemon in /usr/bin (Closes: #251953). + * debian/control.in: + + Depends on xlibs (Closes: #253287). + + Recommends gnome2-user-guide (Closes: #251992). + + -- Sebastien Bacher Thu, 10 Jun 2004 22:28:02 +0200 + +control-center (1:2.6.1-3) unstable; urgency=low + + * debian/rules : + - As gstreamer 0.8 as reached unstable, reactivate the default option to use + it with the keybindings. + * debian/control.in : + - Added build dependency on libgstreamer-plugins0.8-dev + - Removes dependency on libgnome-keyring-dev since no more needed. + - Added libXrandr-dev as build dependency (Closes: #251429). + * debian/patch : + - Added a patch for resolving conflictings ALSA_CFLAGS problems (Closes: + #249357). + - Added a pathc for using Debian's ac_path_xtra + - Modified the patch for relibtoolizing + + -- Arnaud Patard Sat, 29 May 2004 18:01:45 +0200 + +control-center (1:2.6.1-2) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + + -- Sebastien Bacher Wed, 26 May 2004 17:30:32 +0200 + +control-center (1:2.6.1-1) experimental; urgency=low + + * New upstream release. + - Fix uniqueness test for binding special keys with no name + - Fix theme manager selection when not running metacity + - Match nautilus' interpretation of icons in desktop files + - Add Evolution 1.5 and 1.6 to "Preferred Applications" (Closes: #243973). + * debian/patches: + - Removes patch for keyboards + - Updates patch for libtool + * debian.control: + - Added a dependency on gconf2 for capplets-data (Closes: #243894). + + -- Arnaud Patard Fri, 16 Apr 2004 12:50:54 +0200 + +control-center (1:2.6.0.3-2) experimental; urgency=low + + * debian/patch: + - Added a patch from gnome cvs for fixing issues with multimedia + keybindings (see http://bugs.gnome.org/show_bug.cgi?id=139190). + - Added a patch to regenerate libtool files. + + -- Arnaud Patard Wed, 7 Apr 2004 01:44:10 +0200 + +control-center (1:2.6.0.3-1) experimental; urgency=low + + * New upstream release + - Fix some keyboard problems + (see http://bugzilla.gnome.org/show_bug.cgi?id=138701). + * control.in: + - Added versionning informations on depend for capplets (needed to ensure + having right version of capplets when upgrapding). + + -- Arnaud Patard Sun, 4 Apr 2004 15:39:57 +0200 + +control-center (1:2.6.0.2-1) experimental; urgency=low + + * New Upstream release. + + Disabled GStreamer (as it now depends on it by default and the package + is not yet upgraded) + * control.in: + + Updated dependencies to libnautilus2 2.6.0. + + Added a conflict on acme, since it's now a part of control-center + + Changed the build dependency on libxrender-dev to libxcursor-dev + (Closes #240483) + + -- Arnaud Patard Thu, 1 Apr 2004 00:09:52 +0200 + +control-center (1:2.5.4-1) experimental; urgency=low + + * New maintainer (Closes: #238876) + * New upstream release + - fix implicitly conversion (Closes: #226554). + - support icon themes now (Closes: #215851). + * debian/control.in, debian/rules: + - now, it uses cdbs. + - adapted for the gnome team packaging. + * Modified patch 01_gnome-default-applications-properties-structs.c.patch to + fit with new version. + + -- Arnaud Patard Thu, 25 Mar 2004 00:07:35 +0100 + +control-center (1:2.4.0-9) unstable; urgency=low + + * Debian/control set Maintainer to Debian QA Group + + -- Christian Marillat Sat, 20 Mar 2004 09:34:15 +0100 + +control-center (1:2.4.0-8) unstable; urgency=low + + * You need + * Notes by Loic Minier : the above changelog message was + meant to be some sort of joke, a message split between many source + packages. No actual change besides orphaning was done in this version. + You can read the full story at: + + + -- Christian Marillat Fri, 19 Mar 2004 15:08:21 +0100 + +control-center (1:2.4.0-7) unstable; urgency=low + + * debian/control capplets package need to depends on capplets-data (Closes: #237311) + + -- Christian Marillat Thu, 11 Mar 2004 09:07:06 +0100 + +control-center (1:2.4.0-6) unstable; urgency=low + + * Split the package. The gnome-control-center binary like nautilus is + simply a front-end for capplets, thus move all capplets in a separate + package (capplets) and add a dependency to 'gnome-control-center | + nautilus | gnome-panel' for that package. Also move data files in + capplets-data package. + * Remove /usr/lib/libgnome-window-settings.{a,la,so}, + gnome-window-settings-2.0.pc and include files. These files are not + needed and should not be packaged (Closes: #221283) + + -- Christian Marillat Sun, 29 Feb 2004 17:40:37 +0100 + +control-center (1:2.4.0-5) unstable; urgency=low + + * debian/prerm Unregister schemas file from the database. + * Patch from bugzilla to fix "symlink" in fontilus (Closes: #231639) + + -- Christian Marillat Thu, 12 Feb 2004 14:35:46 +0100 + +control-center (1:2.4.0-4) unstable; urgency=low + + * Move Xresources files in /etc/gnome/config and disable all resources. + + -- Christian Marillat Mon, 27 Oct 2003 15:51:37 +0100 + +control-center (1:2.4.0-3) unstable; urgency=low + + * Update gnome-desktop-data version in Replaces field (Closes: #217284) + + -- Christian Marillat Fri, 24 Oct 2003 18:56:02 +0200 + +control-center (1:2.4.0-2) unstable; urgency=low + + * Suggest xbase-clients for xrdb + * Rebuild to remove liblinc dependency in the -dev package (Closes: #216722) + * Don't package .la files for modules (Closes: #182873) + * Run libtoolize, I don't know but something is broken in the original tarball. + + -- Christian Marillat Tue, 21 Oct 2003 21:56:55 +0200 + +control-center (1:2.4.0-1) unstable; urgency=low + + * New upstream release. + * Conflicts with drwright and fontilus. + * Need to Build-Depends on libnautilus2-dev + * Add gok and gnopernicus in suggests + + -- Christian Marillat Sat, 18 Oct 2003 16:54:45 +0200 + +control-center (1:2.2.2-3) unstable; urgency=low + + * debian/control Should suggests xscreensaver (Closes: #212737) + + -- Christian Marillat Fri, 26 Sep 2003 14:39:18 +0200 + +control-center (1:2.2.2-2) unstable; urgency=low + + * debian/rules fix DEB_BUILD_OPTIONS=noopt (Closes: #199189) + * Don't need to depends on xbase-clients + * Suggests esound-clients (Closes: #205700) + * Create /usr/share/themes/metacity-1 directory to remove warning (Closes: #211182) + * Add hack to remove libtool rpath + * Add libxrender-dev in Builde-Depends + + -- Christian Marillat Sun, 21 Sep 2003 10:17:00 +0200 + +control-center (1:2.2.2-1) unstable; urgency=low + + * New upstream release. + * New patches : + * 02_network-preferences + fix range of proxy port (Closes: #195644) + * 01_gnome-default-applications-properties-structs.c: + add epiphany in ww-browser list (Closes: #192241) + * Add icon for Debian menu + * Fix linkage bug (Closes: #187368) + * debian/control Remove Suggests: xscreensaver-gnome + + -- Christian Marillat Mon, 23 Jun 2003 11:18:45 +0200 + +control-center (1:2.2.1-2) unstable; urgency=low + + * Update section + * Move metacity-properties package in control-center (Closes: #188077) + + -- Christian Marillat Mon, 7 Apr 2003 22:42:55 +0200 + +control-center (1:2.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 14 Mar 2003 15:17:56 +0100 + +control-center (1:2.2.0.1-1) unstable; urgency=low + + * New upstream release. + * Hack the Icon tag in Advanced.directory (Closes: #179593) + + -- Christian Marillat Wed, 5 Feb 2003 09:49:20 +0100 + +control-center (1:2.2.0-2) unstable; urgency=low + + * Add flex and autotools-dev in Build-Depends (Closes: #178702) + * Move the metacity capplet in a new package metacity-properties + + -- Christian Marillat Thu, 30 Jan 2003 18:40:33 +0100 + +control-center (1:2.2.0-1) unstable; urgency=low + + * New upstream release. + * Add a default theme. Thanks to Johannes Rohr + * Drag and drop for theme work (Closes: #166980) + * Themes aren't sorted case-sensitively (Closes: #166981) + * Should fix key gnome binding properties and metacity key bindings (Closes: #172380) + + -- Christian Marillat Thu, 23 Jan 2003 16:32:09 +0100 + +control-center (1:2.0.3.2-3) unstable; urgency=low + + * Remove duplicate advanced-directory.png + + -- Christian Marillat Sat, 18 Jan 2003 11:54:29 +0100 + +control-center (1:2.0.3.2-2) unstable; urgency=low + + * Use sensible-browser as default browser. + * Add replaces with gnome-desktop-data (Closes: #177141, #176977) + + -- Christian Marillat Fri, 17 Jan 2003 16:10:52 +0100 + +control-center (1:2.0.3.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 20 Dec 2002 13:27:59 +0100 + +control-center (1:2.0.3-2) unstable; urgency=low + + * Should depends on scrollkeeper (Closes: #169850) + + -- Christian Marillat Sun, 24 Nov 2002 16:11:14 +0100 + +control-center (1:2.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 24 Nov 2002 15:27:52 +0100 + +control-center (1:2.0.2.91-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 17 Nov 2002 00:52:21 +0100 + +control-center (1:2.0.1.1-5) unstable; urgency=low + + * Upload to unstable + * Call scrollkeeper-update with -q (Closes: #166625) + * New upstream release (Closes: #110004) + * keyboard setup are correctly restored (Closes: #156856) + * Bugs related to the old interface (Closes: #62491, #81299, #131440, #71042) + * No more problem when rescaling an image (Closes: #72602) + * Sould build correctly under mips (Closes: #163604) + * Can center large image (Closes: #68651) + + -- Christian Marillat Mon, 28 Oct 2002 11:46:53 +0100 + +control-center (1:2.0.1.1-4) experimental; urgency=low + + * Upload with the new original tarball + + -- Christian Marillat Sun, 29 Sep 2002 17:22:15 +0200 + +control-center2 (1:2.0.1.1-3) experimental; urgency=low + + * Update package veriosn to 1:2.0.1.1-3 to supersedes the unstable version + which is 1:1.4.0.5-6 + + -- Christian Marillat Sat, 28 Sep 2002 20:07:45 +0200 + +control-center2 (2.0.1.1-2) experimental; urgency=low + + * Update to standards version 3.5.7 + * Upload withtout the 2 suffix + + -- Christian Marillat Sat, 28 Sep 2002 18:05:58 +0200 + +control-center2 (2.0.1.1-1) experimental; urgency=low + + * New upstream release. + * Remove fam from recommends should be in libgnomevfs2-0 package. + + -- Christian Marillat Thu, 22 Aug 2002 15:44:13 +0200 + +control-center2 (2.0.1-2) experimental; urgency=low + + * Build against the latest libgnomevfs2-dev 2.0.2-4 + + -- Christian Marillat Fri, 16 Aug 2002 17:44:03 +0200 + +control-center2 (2.0.1-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 7 Aug 2002 12:33:10 +0200 + +control-center2 (2.0.0-3) experimental; urgency=low + + * Should recommends fame. + + -- Christian Marillat Thu, 25 Jul 2002 15:28:22 +0200 + +control-center2 (2.0.0-2) experimental; urgency=low + + * Add x-terminal-emulator in the list of terminal. + * Build against the latest libzvt + + -- Christian Marillat Sun, 7 Jul 2002 20:44:23 +0200 + +control-center2 (2.0.0-1) experimental; urgency=low + + * New upstream release. + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat Tue, 18 Jun 2002 12:34:40 +0200 + +control-center2 (1.99.10-2) experimental; urgency=low + + * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target. + * Install schemas file in postinst. + * debian/postinst check if schemas files are present before calling + gconftool-2 + * debian/postrm call scrollkeeper-update with -q + * Removed old package in suggests + * Update the menu file with the rigth binary name + + -- Christian Marillat Sun, 9 Jun 2002 20:29:30 +0200 + +control-center2 (1.99.10-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 12 May 2002 14:59:06 +0200 + +control-center2 (1.99.9-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 30 Apr 2002 10:47:01 +0200 + +control-center2 (1.99.7-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 22 Apr 2002 18:17:28 +0200 + +control-center2 (1.99.6-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 14 Apr 2002 17:43:36 +0200 + +control-center2 (1.99.4-3) experimental; urgency=low + + * Need to Depends on gnome-desktop-data + + -- Christian Marillat Wed, 13 Mar 2002 11:17:58 +0100 + +control-center2 (1.99.4-2) experimental; urgency=low + + * Need to Depends on gnome-session2 (Closes: #137961) + + -- Christian Marillat Wed, 13 Mar 2002 11:05:26 +0100 + +control-center2 (1.99.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 11 Mar 2002 14:49:29 +0100 + +control-center2 (1.99.3-2) experimental; urgency=low + + * Remove duplicate session.desktop file. + + -- Christian Marillat Mon, 25 Feb 2002 18:14:07 +0100 + +control-center2 (1.99.3-1) experimental; urgency=low + + * New upstream release + + -- Christian Marillat Fri, 15 Feb 2002 00:35:49 +0100 + +control-center2 (1.99.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 20 Jan 2002 18:08:37 +0100 + +control-center (1:1.5.11-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 17 Dec 2001 17:49:00 +0100 + +control-center (1:1.5.8-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 6 Oct 2001 19:12:41 +0200 + +control-center (1:1.5.4-1) unstable; urgency=low + + * New upstream release. + * debian/*.sgml Use docbook 4.1 + + -- Christian Marillat Mon, 6 Aug 2001 15:30:44 +0200 + +control-center (1:1.4.0.1-11) unstable; urgency=low + + * Update config.sub and config.guess (Closes: #103733, #103903) + * Remove libtool hack. + + -- Christian Marillat Sun, 8 Jul 2001 11:36:30 +0200 + +control-center (1:1.4.0.1-10) unstable; urgency=low + + * Switch to debhelper V3 + * Change the WPrefs location in WindowMaker.desktop (Closes: #101148) + * Change libraries versionning to (>= 1:1.4.0.1-6) instead of the latest + package number. + + -- Christian Marillat Fri, 22 Jun 2001 16:48:15 +0200 + +control-center (1:1.4.0.1-9) unstable; urgency=low + + * Rewrote the callbacks.c patch (not complete) (Closes: #98085) + + -- Christian Marillat Sun, 20 May 2001 09:36:48 +0200 + +control-center (1:1.4.0.1-8) unstable; urgency=low + + * Depends on gnome-bin (Closes: #97677) + * Depends on xbase-clients + + -- Christian Marillat Fri, 18 May 2001 00:06:13 +0200 + +control-center (1:1.4.0.1-7) unstable; urgency=low + + * Patch callbacks.c to reflect change in the new xscreensaver package (3.32-1) + and update the suggests field. Thaks to Roderich Schupp. (Closes: #96542) + + -- Christian Marillat Sun, 6 May 2001 22:34:12 +0200 + +control-center (1:1.4.0.1-6) unstable; urgency=low + + * Build against the latest gnome-libs 1.2.13-5. + + -- Christian Marillat Tue, 24 Apr 2001 12:39:50 +0200 + +control-center (1:1.4.0.1-5) unstable; urgency=low + + * Typo in build depends (Closes: #93267) + * Rewrote Flame.desktop + + -- Christian Marillat Sat, 14 Apr 2001 15:32:28 +0200 + +control-center (1:1.4.0.1-4) unstable; urgency=low + + * Really add docbook-to-man in build-depends (Closes: #93190) + * Replace libungif3g-dev by libungif4-dev in build-depends (Closes: #93197) + + -- Christian Marillat Sat, 7 Apr 2001 12:18:03 +0200 + +control-center (1:1.4.0.1-3) unstable; urgency=low + + * Remove unused Flame.desktop (Closes: #92850) + * Patch po/Makefile.in.in to use DESTDIR + * Add scrollkeeper in depends (Closes: #93007) + + -- Christian Marillat Thu, 5 Apr 2001 18:30:35 +0200 + +control-center (1:1.4.0.1-2) unstable; urgency=low + + * Add docbook-to-man in build-depends (Closes: #92421) + * Don't compress control-center.sgml (Closes: #92603) + * Call scrollkeeper-update in postinst and prerm for gnome-control-center + + -- Christian Marillat Mon, 2 Apr 2001 21:35:15 +0200 + +control-center (1:1.4.0.1-1) unstable; urgency=low + + * New upstream release. + * Write 12 manpages (Closes: #87098) + + -- Christian Marillat Fri, 30 Mar 2001 19:38:51 +0200 + +control-center (1:1.4.0-1) unstable; urgency=low + + * New upstream release. + * debian/control build-depends on libgnome-vfs-dev and xml-i18n-tools + + -- Christian Marillat Mon, 19 Mar 2001 11:10:30 +0100 + +control-center (1:1.2.4-1) unstable; urgency=low + + * New upstream release. + * Add libgdk-pixbuf-dev in build-depends (Closes: #87416) + * debian/menu The session properties capplet is now on the gnome-core + package, remove this menu entry. + + -- Christian Marillat Thu, 8 Mar 2001 00:12:29 +0100 + +control-center (1:1.2.3-1) unstable; urgency=low + + * New upstream release. + * Removed locale and callback patchs included by upstream. + * No more lockup while closing desktop (Closes: #76215) + + -- Christian Marillat Sun, 18 Feb 2001 15:57:25 +0100 + +control-center (1:1.2.2-10) unstable; urgency=low + + * Build against the latest gnome-libs 1.2.11 + + -- Christian Marillat Mon, 5 Feb 2001 14:53:58 +0100 + +control-center (1:1.2.2-9) unstable; urgency=low + + * Remove xpm4g-dev from Build-depends (Closes: #82556) + + -- Christian Marillat Wed, 17 Jan 2001 10:04:01 +0100 + +control-center (1:1.2.2-8) unstable; urgency=low + + * Patch to show the right debian version (Closes: #82391) + + -- Christian Marillat Mon, 15 Jan 2001 15:35:59 +0100 + +control-center (1:1.2.2-7) unstable; urgency=low + + * Remove imlib-progs from depends. Move gnome-core from depends to Suggests. + + -- Christian Marillat Thu, 30 Nov 2000 11:59:04 +0100 + +control-center (1:1.2.2-6) unstable; urgency=low + + * Change fonts attribute in callback.dpatch (Closes: #75320) + * Install symlinks in /usr/share/doc for -dev package. + + -- Christian Marillat Thu, 2 Nov 2000 17:48:11 +0100 + +control-center (1:1.2.2-5) unstable; urgency=low + + * Patch all capplets to add a call to setlocale(LC_ALL, ""). + + -- Christian Marillat Fri, 20 Oct 2000 15:55:34 +0200 + +control-center (1:1.2.2-4) unstable; urgency=low + + * Add a patch to display russian and other 8 byte character correctly + thanks to ChiDeok Hwang + * New version close this old bug (Closes: #58797) + + -- Christian Marillat Wed, 11 Oct 2000 17:54:29 +0200 + +control-center (1:1.2.2-3) unstable; urgency=low + + * Fix bad symlink in gnome-control-center (Closes: #74279) + + -- Christian Marillat Mon, 9 Oct 2000 15:02:57 +0200 + +control-center (1:1.2.2-2) unstable; urgency=low + + * Arrange documentation for dhelp. + + -- Christian Marillat Fri, 6 Oct 2000 17:09:54 +0200 + +control-center (1:1.2.2-1) unstable; urgency=low + + * Return to the 1.2 branch, because 1.3 is ... + * Switch to debhelper V2. + * New/old GUI (Closes: #71043, #71040, #71039, #71038) + + -- Christian Marillat Mon, 25 Sep 2000 17:33:23 +0200 + +control-center (1.3.0-5) unstable; urgency=low + + * Add debhelper in Build-Depends (Closes: #70220) + * Build against libungif4g (Closes: #71236) + + -- Christian Marillat Sun, 10 Sep 2000 00:48:36 +0200 + +control-center (1.3.0-4) unstable; urgency=low + + * Patch configure to install session-properties-capplet. + + -- Christian Marillat Thu, 24 Aug 2000 20:35:38 +0200 + +control-center (1.3.0-3) unstable; urgency=low + + * Install screensaver-properties.desktop in the right place (Closes: #69502). + * Install Documents.directory and Session.directory files. + + -- Christian Marillat Mon, 21 Aug 2000 00:59:43 +0200 + +control-center (1.3.0-2) unstable; urgency=low + + * debian/control Added imlib-progs in the dependencies field (Closes: #69427). + + -- Christian Marillat Sat, 19 Aug 2000 22:31:37 +0200 + +control-center (1.3.0-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 14 Aug 2000 15:32:43 +0200 + +control-center (1.2.1-1) unstable; urgency=low + + * New upstrem release. + * debian/patches Added 2 patches for IceWM.desktop and WindowMaker.desktop + (Closes: #47353, #48099). + * New e-mail address. + * Removed 2 undocumented manpages (bell-properties-capplet.1, e-conf.1). + * Removed property-background patche. + * debian/menu removed entry for bell-properties and put all entrys in + System/Gnome. + + -- Christian Marillat Wed, 2 Aug 2000 09:03:59 +0200 + +control-center (1.2.0-2) unstable; urgency=low + + * Updated the Build-depends field. (Closes: #64904) + + -- Christian Marillat Tue, 30 May 2000 10:15:38 +0200 + +control-center (1.2.0-1) unstable; urgency=low + + * New upstream source (Closes: #64584) + * debian/control removed depends libcapplet0 provided by shlibs:Depends. + * Updated Standards-Version to 3.1.1.1 added Build-depends field. + + -- Christian Marillat Thu, 25 May 2000 19:21:14 +0200 + +control-center (1.0.53-1) unstable; urgency=low + + * New upstream source. + + -- Christian Marillat Fri, 31 Mar 2000 11:32:47 +0200 + +control-center (1.0.51-5) frozen unstable; urgency=low + + * debian/copyright updated to the new directory. + + -- Christian Marillat Wed, 22 Mar 2000 23:17:17 +0100 + +control-center (1.0.51-4) frozen unstable; urgency=low + + * Apply a patch I wrote to fix the RCB. Closes: #51568 + * New maintainer. Christian Marillat is taking the package over. + I'm sponsoring him for the moment ... + * Changed the description. Removed the part about beta software. + Closes: #54979 + * Applied the patch for centering the background picture. + Closes: #54285 + * Added patch-on-the-fly support to debian/rules. + + -- Raphael Hertzog Tue, 21 Mar 2000 20:31:20 +0100 + +control-center (1.0.51-3) frozen unstable; urgency=low + + * NMU. + * Fixes RC bug #56769, WindowMaker wm settings fixed. + + -- Chris McKillop Thu, 3 Feb 2000 07:13:39 -0500 + +control-center (1.0.51-2) frozen unstable; urgency=low + + * Orphaned. + + -- Michael Alan Dorman Thu, 3 Feb 2000 07:13:29 -0500 + +control-center (1.0.51-1) unstable; urgency=low + + * Officially claimed as my own. + * libcapplet has been stripped for a while (closes: bug#31245) + * We've updated... (closes: bug#44136) + * Correct xworm definition for screensaver (closes: bug#51514) + * The libc/libglib issues are resolved now (closes: bug#37535) + * control-center is much more stable, and should work with window-maker (closes: bug#38706) + * gnomecc seems to respect current bg color better (closes: bug#38917) + * Couldn't reproduce this error with current versions (closes: bug#38995) + * Invoking individual capplets seems to work now (closes: bug#39135) + * Screensavers seem to be more stable now (closes: bug#41992) + * URL handler assignments seems to work now (closes: bug#44983) + * Fudged dependency on esd to get rid of versioned depends (closes: bug#52353) + * Totally revamped build process (closes: bug#33848, bug#38344) + * Appears to have been fixed (closes: bug#33736, bug#33472)) + + -- Michael Alan Dorman Mon, 20 Dec 1999 14:19:48 -0500 + +control-center (1.0.51-0.2) unstable; urgency=low + + * Fix from Christian Marillat for wm-properties + + -- Michael Alan Dorman Tue, 19 Oct 1999 14:22:43 -0400 + +control-center (1.0.51-0.1) unstable; urgency=low + + * New upstream version. NMU. + + -- Michael Alan Dorman Sun, 10 Oct 1999 16:48:39 -0400 + +control-center (1.0.50-0.1) unstable; urgency=low + + * New upstream version. NMU + + -- Michael Alan Dorman Thu, 30 Sep 1999 22:24:11 -0400 + +control-center (1.0.5-2) unstable; urgency=low + + * Actually changed maintainer address in debian/control + * Fixed up WindowMaker and IceWM paths for wm-properties + + -- Steve Haslam Thu, 27 May 1999 02:05:10 +0100 + +control-center (1.0.5-1) unstable; urgency=low + + * New maintainer. + * Moved "xscreensaver" to "Suggests:" field. (Bug#32724) + * Called dh_strip when making libcapplet-dev + + -- Steve Haslam Thu, 20 May 1999 03:50:25 +0100 + +control-center (1.0.5-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream version + + -- Steve Haslam Mon, 19 Apr 1999 10:08:13 +0100 + +control-center (1.0.1-0.1) unstable; urgency=low + + * NMU for GNOME-1.0 + + -- Jules Bean Fri, 5 Mar 1999 10:34:56 +0000 + +control-center (0.99.3-3) unstable; urgency=low + + * Patched to remove #define HAVE_REDHAT_SCREENSAVER_RPM. + Also, added Recommends: xscreensaver + Fixes: BUG#32462 + + -- Jim Pick Wed, 27 Jan 1999 21:40:24 -0800 + +control-center (0.99.3-2) unstable; urgency=low + + * Recompiled due to dependencies. + + -- Jim Pick Sun, 24 Jan 1999 01:11:12 -0800 + +control-center (0.99.3-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 21 Jan 1999 21:31:48 -0800 + +gnome-core (0.30-2) frozen unstable; urgency=low + + * Recompiled with new libs. + * Fixed reference to /usr/X11R6 in README.Debian. + * Added warnings (Gnome is ALPHA). + * Patched dialer_applet to use pon/poff. + * Patched drivemount_applet to default to /floppy. + + -- Jim Pick Tue, 24 Nov 1998 10:56:08 -0800 + +gnome-core (0.30-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 24 Sep 1998 21:28:02 -0700 + +gnome-core (0.28.1-1) unstable; urgency=low + + * New upstream release. + * Hopefully fixes panel applet bug. + + -- Jim Pick Wed, 19 Aug 1998 20:12:25 -0700 + +gnome-core (0.28-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 17 Aug 1998 12:59:26 -0700 + +gnome-core (0.27-1) unstable; urgency=low + + * New upstream release. + * Added /usr/doc/gnome + + -- Jim Pick Sat, 15 Aug 1998 14:21:06 -0700 + +gnome-core (0.25-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 6 Aug 1998 22:51:22 -0700 + +gnome-core (0.20-2) unstable; urgency=low + + * Added Debian menu-method for gnome-panel. Fixed Bug #24025 + (Thanks to Ray Dassen for reporting the bug, and Riku Voipio + who wrote the menu method for Gnome 0.12) + + -- Jim Pick Wed, 22 Jul 1998 20:22:00 -0700 + +gnome-core (0.20-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 8 Jun 1998 12:00:08 -0700 + +gnome-core (0.13-1) unstable; urgency=low + + * Initial Release. + + -- Jim Pick Mon, 16 Mar 1998 15:27:43 -0800 + + --- control-center-2.18.1.orig/debian/rules +++ control-center-2.18.1/debian/rules @@ -0,0 +1,35 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk + +#DEB_BUILDDIR = $(CURDIR)/debian/build +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed" +DEB_CONFIGURE_EXTRA_FLAGS += --disable-mime-cache \ + --disable-scrollkeeper \ + --enable-aboutme \ + --enable-gstreamer=0.10 + +DEB_CONFIGURE_LOCALSTATEDIR := /var/lib + +DEB_INSTALL_MANPAGES_gnome-control-center += debian/gnome-control-center.1 + +build/gnome-control-center:: $(DEB_INSTALL_MANPAGES_gnome-control-center) + cd po; intltool-update -p + +%.1: %.sgml + /usr/bin/docbook-to-man $< > $@ + +binary-post-install/capplets-data:: + rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache + +clean:: + rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center) +# rm -rf $(DEB_BUILDDIR) --- control-center-2.18.1.orig/debian/control.in +++ control-center-2.18.1/debian/control.in @@ -0,0 +1,79 @@ +Source: control-center +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Marco Cabizza +Uploaders: Marc Dequènes (Duck) , @GNOME_TEAM@ +Standards-Version: 3.7.2 +Build-Depends: cdbs, gnome-pkg-tools (>= 0.7), dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), libgnomeui-dev (>= 2.8.1-3), intltool, libglade2-dev (>= 2.4.0-1), libgnome-desktop-dev (>= 2.7.92-1), zlib1g-dev, flex,liborbit2-dev (>= 2.10.2-1.1), libmetacity-dev (>= 1:2.8.1-3), libxcursor-dev, libbonobo2-dev (>= 2.6.2-6), libnautilus-extension-dev, libgtk2.0-dev (>= 2.10), libxrandr-dev, docbook-to-man, libgstreamer-plugins-base0.10-dev, autotools-dev, libasound2-dev (>= 1.0.3b-1), libxss-dev, libxinerama-dev, libxft-dev (>= 2.1.2), libxxf86misc-dev, libxkbfile-dev, libebook1.2-dev (>= 1.7.90), desktop-file-utils, gnome-doc-utils (>= 0.3.2), libgnome-menu-dev (>= 2.12.0), libx11-dev, libxrender-dev, libgconf2-dev, libbonoboui2-dev, libesd0-dev, libgnomevfs2-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libxt-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.32), libdbus-glib-1-dev (>= 0.32), librsvg2-dev, libpango1.0-dev, libpanel-applet2-dev, libgnomekbdui-dev, libgnomekbd-dev, libxklavier-dev, scrollkeeper + +Package: gnome-control-center +Architecture: any +Section: gnome +Depends: ${shlibs:Depends}, ${misc:Depends}, capplets-data (>= ${gnome:Version}), capplets-data (<< ${gnome:NextVersion}), libgnome-window-settings1 (= ${binary:Version}), gnome-menus (>= 2.17.5), gnome-desktop-data, gnome-icon-theme (>= 1.2.3-1), desktop-file-utils +Recommends: bzip2, evolution-data-server, gnome-user-guide, gnome-session +Replaces: capplets +Conflicts: capplets, gnome-session (<< 2.16) +Suggests: esound-clients, gnome-screensaver | xscreensaver, xbase-clients, gstreamer0.10-alsa | gstreamer0.10-esd, xrdb +Description: utilities to configure the GNOME desktop + This package contains configuration applets for the GNOME desktop, + allowing to set accessibility configuration, desktop fonts, keyboard + and mouse properties, sound setup, desktop theme and background, user + interface properties, screen resolution, and other GNOME parameters. + . + It also contains a front end to these applets, which can also be + accessed with the GNOME panel or the Nautilus file manager. + +Package: capplets-data +Architecture: all +Section: gnome +Depends: scrollkeeper (>= 0.3.14-5), ${misc:Depends} +Recommends: gnome-control-center (>= ${source:Version}) +Replaces: gnome-main-menu +Description: configuration applets for GNOME 2 - data files + This package contains data files (icons, pixmaps, locales files) needed by + the configuration applets in the gnome-control-center package. + +Package: libgnome-window-settings1 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: gnome-control-center (<< 1:2.14.1-1), capplets +Conflicts: capplets +Description: Utility library for getting window manager settings + This package contains the libwindow-settings library, which is used by + the GNOME window managers. + +Package: libgnome-window-settings-dev +Architecture: all +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, libgnome-window-settings1 (>= ${source:Version}) +Replaces: gnome-control-center (<< 1:2.14.1-1) +Description: Utility library for getting window manager settings (headers) + This package contains the libwindow-settings library header files. + +Package: libgnome-settings-daemon-dev +Architecture: all +Section: libdevel +Depends: ${misc:Depends}, capplets-data, capplets-data (>= ${gnome:Version}), capplets-data (<< ${gnome:NextVersion}) +Conflicts: gnome-control-center-dev +Replaces: gnome-control-center-dev +Provides: gnome-control-center-dev +Description: Utility library for accessing g-s-d over DBUS (headers) + This package contains the header files to use interoperate with + gnome-settings-daemon through a DBus service. + +Package: libslab0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a library with widgets used by the GNOME control-center + This package contains the libslab library, which is used by + the GNOME control center. + +Package: libslab-dev +Architecture: all +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, libslab0 (= ${binary:Version}) +Description: a library with widgets used by the GNOME control-center (headers) + This package contains the libsalb0 library header files. --- control-center-2.18.1.orig/debian/libslab-dev.install +++ control-center-2.18.1/debian/libslab-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/libslab.so +debian/tmp/usr/include/slab +debian/tmp/usr/lib/pkgconfig/libslab.pc --- control-center-2.18.1.orig/debian/control +++ control-center-2.18.1/debian/control @@ -0,0 +1,79 @@ +Source: control-center +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Marco Cabizza +Uploaders: Marc Dequènes (Duck) , Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Kilian Krause , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons +Standards-Version: 3.7.2 +Build-Depends: cdbs, gnome-pkg-tools (>= 0.7), dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), libgnomeui-dev (>= 2.8.1-3), intltool, libglade2-dev (>= 2.4.0-1), libgnome-desktop-dev (>= 2.7.92-1), zlib1g-dev, flex,liborbit2-dev (>= 2.10.2-1.1), libmetacity-dev (>= 1:2.8.1-3), libxcursor-dev, libbonobo2-dev (>= 2.6.2-6), libnautilus-extension-dev, libgtk2.0-dev (>= 2.10), libxrandr-dev, docbook-to-man, libgstreamer-plugins-base0.10-dev, autotools-dev, libasound2-dev (>= 1.0.3b-1), libxss-dev, libxinerama-dev, libxft-dev (>= 2.1.2), libxxf86misc-dev, libxkbfile-dev, libebook1.2-dev (>= 1.7.90), desktop-file-utils, gnome-doc-utils (>= 0.3.2), libgnome-menu-dev (>= 2.12.0), libx11-dev, libxrender-dev, libgconf2-dev, libbonoboui2-dev, libesd0-dev, libgnomevfs2-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libxt-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.32), libdbus-glib-1-dev (>= 0.32), librsvg2-dev, libpango1.0-dev, libpanel-applet2-dev, libgnomekbdui-dev, libgnomekbd-dev, libxklavier-dev, scrollkeeper + +Package: gnome-control-center +Architecture: any +Section: gnome +Depends: ${shlibs:Depends}, ${misc:Depends}, capplets-data (>= ${gnome:Version}), capplets-data (<< ${gnome:NextVersion}), libgnome-window-settings1 (= ${binary:Version}), gnome-menus (>= 2.17.5), gnome-desktop-data, gnome-icon-theme (>= 1.2.3-1), desktop-file-utils +Recommends: bzip2, evolution-data-server, gnome-user-guide, gnome-session +Replaces: capplets +Conflicts: capplets, gnome-session (<< 2.16) +Suggests: esound-clients, gnome-screensaver | xscreensaver, xbase-clients, gstreamer0.10-alsa | gstreamer0.10-esd, xrdb +Description: utilities to configure the GNOME desktop + This package contains configuration applets for the GNOME desktop, + allowing to set accessibility configuration, desktop fonts, keyboard + and mouse properties, sound setup, desktop theme and background, user + interface properties, screen resolution, and other GNOME parameters. + . + It also contains a front end to these applets, which can also be + accessed with the GNOME panel or the Nautilus file manager. + +Package: capplets-data +Architecture: all +Section: gnome +Depends: scrollkeeper (>= 0.3.14-5), ${misc:Depends} +Recommends: gnome-control-center (>= ${source:Version}) +Replaces: gnome-main-menu +Description: configuration applets for GNOME 2 - data files + This package contains data files (icons, pixmaps, locales files) needed by + the configuration applets in the gnome-control-center package. + +Package: libgnome-window-settings1 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: gnome-control-center (<< 1:2.14.1-1), capplets +Conflicts: capplets +Description: Utility library for getting window manager settings + This package contains the libwindow-settings library, which is used by + the GNOME window managers. + +Package: libgnome-window-settings-dev +Architecture: all +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, libgnome-window-settings1 (>= ${source:Version}) +Replaces: gnome-control-center (<< 1:2.14.1-1) +Description: Utility library for getting window manager settings (headers) + This package contains the libwindow-settings library header files. + +Package: libgnome-settings-daemon-dev +Architecture: all +Section: libdevel +Depends: ${misc:Depends}, capplets-data, capplets-data (>= ${gnome:Version}), capplets-data (<< ${gnome:NextVersion}) +Conflicts: gnome-control-center-dev +Replaces: gnome-control-center-dev +Provides: gnome-control-center-dev +Description: Utility library for accessing g-s-d over DBUS (headers) + This package contains the header files to use interoperate with + gnome-settings-daemon through a DBus service. + +Package: libslab0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a library with widgets used by the GNOME control-center + This package contains the libslab library, which is used by + the GNOME control center. + +Package: libslab-dev +Architecture: all +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, libslab0 (= ${binary:Version}) +Description: a library with widgets used by the GNOME control-center (headers) + This package contains the libsalb0 library header files. --- control-center-2.18.1.orig/debian/capplets-data.install +++ control-center-2.18.1/debian/capplets-data.install @@ -0,0 +1,18 @@ +debian/tmp/etc +debian/tmp/usr/share/control-center/xrdb/* etc/gnome/config/ +debian/tmp/usr/share/control-center/glade +debian/tmp/usr/share/control-center/icons +debian/tmp/usr/share/control-center/pixmaps/ +debian/tmp/usr/share/control-center/gnome-default-applications.xml +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/pixmaps/*.png +debian/tmp/usr/share/locale +debian/tmp/usr/share/mime/packages +debian/tmp/usr/share/mime/application +debian/tmp/usr/share/gnome +debian/tmp/etc/gnome-vfs-2.0/modules +debian/tmp/etc/gconf/schemas +debian/tmp/usr/share/applications/*.desktop +debian/tmp/usr/share/omf +debian/tmp/usr/share/desktop-directories +debian/tmp/usr/share/dbus-1 --- control-center-2.18.1.orig/debian/libgnome-window-settings-dev.install +++ control-center-2.18.1/debian/libgnome-window-settings-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/libgnome-window-settings.so +debian/tmp/usr/include/gnome-window-settings-2.0 +debian/tmp/usr/lib/pkgconfig/gnome-window-settings-2.0.pc --- control-center-2.18.1.orig/debian/gnome-control-center.links +++ control-center-2.18.1/debian/gnome-control-center.links @@ -0,0 +1 @@ +usr/lib/control-center/gnome-settings-daemon usr/bin/gnome-settings-daemon --- control-center-2.18.1.orig/debian/compat +++ control-center-2.18.1/debian/compat @@ -0,0 +1 @@ +5 --- control-center-2.18.1.orig/debian/control-center2.xpm +++ control-center-2.18.1/debian/control-center2.xpm @@ -0,0 +1,186 @@ +/* XPM */ +static char *control-center2[] = { +/* columns rows colors chars-per-pixel */ +"32 32 148 2", +" c #000000", +". c #02070C", +"X c #04080A", +"o c #080807", +"O c #0C0C0B", +"+ c #010C16", +"@ c #090C10", +"# c #0C1217", +"$ c #100F0F", +"% c #11100F", +"& c #151514", +"* c #141619", +"= c #17191B", +"- c #191816", +"; c #1B1C1C", +": c #0C263E", +"> c #192023", +", c #1B252D", +"< c #172B3B", +"1 c #192B3C", +"2 c #22211E", +"3 c #232525", +"4 c #242529", +"5 c #21282B", +"6 c #292824", +"7 c #2C2B29", +"8 c #2B2E31", +"9 c #24313F", +"0 c #2D3135", +"q c #2F363B", +"w c #2F393B", +"e c #302E2C", +"r c #34322F", +"t c #333333", +"y c #363B3F", +"u c #3B3A35", +"i c #3A3A39", +"p c #0B2946", +"a c #112C42", +"s c #1E3344", +"d c #1C364C", +"f c #2C3A42", +"g c #343E47", +"h c #2F4658", +"j c #32414B", +"k c #3C4042", +"l c #334453", +"z c #264662", +"x c #304D67", +"c c #395168", +"v c #413D39", +"b c #42413E", +"n c #41484E", +"m c #4A4741", +"M c #4B4945", +"N c #4F4D4A", +"B c #4D565D", +"V c #555146", +"C c #52514F", +"Z c #50585E", +"A c #595754", +"S c #5E5C57", +"D c #585858", +"F c #455767", +"G c #43596A", +"H c #486278", +"J c #5B6869", +"K c #576B76", +"L c #586B79", +"P c #63615D", +"I c #656462", +"U c #6A6760", +"Y c #6B6A65", +"T c #6E6E6C", +"R c #6A737B", +"E c #73716C", +"W c #747370", +"Q c #7E7C74", +"! c #7E7D7A", +"~ c #5D758B", +"^ c #667C8E", +"/ c #637D94", +"( c #6E8395", +") c #6C8499", +"_ c #708597", +"` c #71879B", +"' c #74899A", +"] c #7B8D9D", +"[ c #758DA2", +"{ c #7B93A7", +"} c #86847E", +"| c #858482", +" . c #8A8782", +".. c #8C8A85", +"X. c #8C8C8B", +"o. c #838F9A", +"O. c #80919D", +"+. c #908E86", +"@. c #918F89", +"#. c #94938D", +"$. c #9A968E", +"%. c #999791", +"&. c #9C9A94", +"*. c #8597A6", +"=. c #859AAC", +"-. c #8A99A6", +";. c #899DAF", +":. c #859EB4", +">. c #8DA3B4", +",. c #8FA5B8", +"<. c #99A4AE", +"1. c #97A7B6", +"2. c #90A7B9", +"3. c #9CADBC", +"4. c #A29E97", +"5. c #A5A29B", +"6. c #ACA9A3", +"7. c #B1AFA7", +"8. c #B4B2AB", +"9. c #B9B6AE", +"0. c #BCB9B3", +"q. c #99AEC1", +"w. c #A0B2C2", +"e. c #ACBBC9", +"r. c #BDCBD7", +"t. c #C2BEB2", +"y. c #C6C3BC", +"u. c #CAC6BE", +"i. c #CCC8BE", +"p. c #CCC9C2", +"a. c #D1CDC5", +"s. c #D2CFC8", +"d. c #D4D0C7", +"f. c #D5D2CB", +"g. c #D9D6CD", +"h. c #DCD8CF", +"j. c #D6D5D3", +"k. c #D9D6D1", +"l. c #DDDAD5", +"z. c #DBDCDB", +"x. c #E2DFD7", +"c. c #E1DFDA", +"v. c #E5E2DD", +"b. c #E5E5E2", +"n. c #E9E7E1", +"m. c #EFEEEE", +"M. c #F1F0EC", +"N. c None", +/* pixels */ +"N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N.N.N.N.N.N. N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N.N.N. N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N. I W ; N.N.N.N.N.N.N. X # N.N.N.N.N.N.", +"N.N.N.N. - % ..z.8.U & N.N.N.N.N. X B X.t N.N.N.N.N.", +"N.N.N. O o & I y.s.! O N.N.N. F j.z.8.7 N.N.N.N.", +"N.N. A k.8.- N.N. . F k.x.j.7.g o N.N.N.N.", +" N. O O P l.6.O N.N. k z.b.b.l.E @ N.N.N.N.", +" X.&.* C p.t...O N. D m.b.v.#.* N.N.N.N.N.", +" ! z.%.i I l.x.9.| ; o N. T M.l.&.5 N.N.N.N.N.N.", +" & &.b.j.n.x.t.5.y.0.+.m O i g.0.Q t N.N.N.N.N.N.N.", +" & | z.f.#.m S 0.f.s.p.%.r o 3 0.&.e N.N.N.N.N.N.N.", +" o ; 7 $ o v $.g.g.a.i.#.P W - N.N. N.N.N.N.N.N.", +"N. $ Y p.x.p.a.p.$.u o N.N.N.", +"N.N. o v 5.l.l.p.d.a.+.u o N.N.N.", +"N.N.N. O v Y u.v.h.i.d.u.} ; o ", +"N.N.N.N. o C Q 6 r #.x.v.d.i.d.t.U 2 ", +"N.N.N.N.N.N. N. o y R n V V O $ M 0.n.v.i.i.s.8.Y - ", +"N.N.N.N.N.N.N.N. 3 R *.;.{ F 4 ; E f.n.h.i.i.9.%.2 ", +"N.N.N.N.N.N.N. 8 o.] ) ;./ z + t .x.v.8.v &.Y ", +"N.N.N.N.N.N. 0 ] ) [ 2.=.x p + O M 6.0...p.P ", +"N.N.N.N.N. q *.( ' ;.2.c : 1 N. 2 U 4.Q - ", +"N.N.N.N. t *.) [ :.2.H : l 4 N.N. O o ", +"N.N.N. 3 <.' [ >.2.~ : s k O N.N.N. ", +"N.N.N.o R 1.*.q.q./ a 1 g * N.N.N.N.N.N. ", +"N.N.N.* e.e.r.e.) d a g - N.N.N.N.N.N.N.N.N. ", +"N.N. , e.w.3.` h < j ; N.N.N.N.N.N.N.N.N.N.N. ", +"N.N.N.* ] ' / L g f > N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N. 9 G L J w & N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N. @ > ; O N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N.N. N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N." +}; --- control-center-2.18.1.orig/debian/libgnome-window-settings1.install +++ control-center-2.18.1/debian/libgnome-window-settings1.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libgnome-window-settings.so.* +debian/tmp/usr/lib/libgnome-window-settings1/*.so --- control-center-2.18.1.orig/debian/gnome-control-center.dirs +++ control-center-2.18.1/debian/gnome-control-center.dirs @@ -0,0 +1 @@ +usr/share/themes/metacity-1 --- control-center-2.18.1.orig/debian/watch +++ control-center-2.18.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/gnome/sources/control-center/([\d\.]+)[02468]/control-center-([\d\.]+)\.tar\.gz --- control-center-2.18.1.orig/debian/gnome-control-center.sgml +++ control-center-2.18.1/debian/gnome-control-center.sgml @@ -0,0 +1,313 @@ +Arnaud"> + Patard"> + Mars 22, 2004"> + 1"> + arnaud.patard@rtp-net.org"> + + gnome-control-center"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2004 + &dhusername; + + &dhdate; +
+ + &dhucpackage; + + &dhsection; + + + &dhpackage; + + Desktop properties manager + + + + &dhpackage; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; command. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + &dhpackage; is a front-end to configuration applets (capplets) + that lets you configure your GNOME desktop. You may set things such as the background, + the fonts, or the theme + + + + SEE ALSO + gtk-options (7). + + OPTIONS + + These programs follow the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + Theses options are mainly the standard command line options of gtk. + + + + + + + Show the help message. + + + + + + + Display brief usage message. + + + + + + + Prevent Gnome Control Center from using Nautilus + + + + + + + Enable Gdk debugging flags. + + + + + + + Disable Gdk debugging flags. + + + + + + + X display to use. + + + + + + + X screen to use. + + + + + + + Make X calls synchronous. + + + + + + + Program name as used by the window manager. + + + + + + + Program class as used by the window manager + + + + + + + Enable Gtk debugging flags. + + + + + + + Disable Gtk debugging flags. + + + + + + + Make all warnings fatal + + + + + + + Load an additional Gtk module. + + + + + + + File descriptor to print IOR on + + + + + + + IID to activate + + + + + + + Prevent registering of server with OAF + + + + + + + Disable sound server usage + + + + + + + Enable sound server usage + + + + + + + Host:port on which the sound server to use is running + + + + + + + Show version. + + + + + + + Specify session management ID + + + + + + + Specify prefix of saved configuration + + + + + + + Disable connection to session manager + + + + + + + Don't show crash dialog box. + + + + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + + + +
+ + + + --- control-center-2.18.1.orig/debian/gnome-control-center.menu +++ control-center-2.18.1/debian/gnome-control-center.menu @@ -0,0 +1,4 @@ +?package(gnome-control-center):needs="X11" section="Apps/System/Gnome" \ + hints="Gnome" title="Gnome Control Center" \ + icon="/usr/share/pixmaps/control-center2.xpm" \ + command="/usr/bin/gnome-control-center" --- control-center-2.18.1.orig/debian/gnome-control-center.install +++ control-center-2.18.1/debian/gnome-control-center.install @@ -0,0 +1,25 @@ +debian/tmp/usr/bin/gnome-control-center +debian/control-center2.xpm usr/share/pixmaps +debian/tmp/usr/lib/gnome-vfs-2.0/modules/*.so +debian/tmp/usr/lib/control-center/gnome-settings-daemon +debian/tmp/usr/bin/gnome-about-me +debian/tmp/usr/bin/gnome-accessibility-keyboard-properties +debian/tmp/usr/bin/gnome-at-properties +debian/tmp/usr/bin/gnome-default-applications-properties +debian/tmp/usr/bin/gnome-font-properties +debian/tmp/usr/bin/gnome-background-properties +debian/tmp/usr/bin/gnome-keyboard-properties +debian/tmp/usr/bin/gnome-mouse-properties +debian/tmp/usr/bin/gnome-sound-properties +debian/tmp/usr/bin/gnome-theme-manager +debian/tmp/usr/bin/gnome-ui-properties +debian/tmp/usr/bin/gnome-keybinding-properties +debian/tmp/usr/bin/gnome-network-preferences +debian/tmp/usr/bin/gnome-window-properties +debian/tmp/usr/bin/gnome-display-properties +debian/tmp/usr/bin/gnome-theme-thumbnailer +debian/tmp/usr/bin/themus-theme-applier +debian/tmp/usr/bin/gnome-thumbnail-font +debian/tmp/usr/bin/gnome-font-viewer +debian/tmp/usr/bin/gnome-typing-monitor +debian/tmp/usr/lib/nautilus/extensions-1.0/*.so --- control-center-2.18.1.orig/debian/copyright +++ control-center-2.18.1/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Jim Pick jim@jimpick.com on +Sat, 14 Mar 1998 20:12:23 -0800. + +It was downloaded from ftp://ftp.gnome.org/pub/gnome/sources/control-center/2.10/ + +Copyright: 1998,99,2000 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- control-center-2.18.1.orig/debian/shlibs.local +++ control-center-2.18.1/debian/shlibs.local @@ -0,0 +1 @@ +libgnome-window-settings 1 --- control-center-2.18.1.orig/debian/libgnome-settings-daemon-dev.install +++ control-center-2.18.1/debian/libgnome-settings-daemon-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include/gnome-settings-daemon-2.0/gnome-settings-daemon/*.h +debian/tmp/usr/lib/pkgconfig/gnome-settings-daemon.pc --- control-center-2.18.1.orig/debian/libslab0.install +++ control-center-2.18.1/debian/libslab0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libslab.so.*