Sprout from master 2002-10-02 12:26:31 UTC Marcin Krzyżanowski <marcin.krzyzanowski@hakore.com> 'fixed omf file'
Delete:
control-center-ac_am.patch
control-center-am.patch
control-center-bgcolor1.patch
control-center-configure.patch
control-center-fsbgpath.patch
control-center-nosound.patch
control-center-pixbuf_cflags.patch
control-center-theme-switcher-linking.patch
omf.make
xmldocs.make
+++ /dev/null
-diff -Nur control-center-1.99.8/Makefile.am control-center-1.99.8.new/Makefile.am
---- control-center-1.99.8/Makefile.am Thu Apr 11 04:06:40 2002
-+++ control-center-1.99.8.new/Makefile.am Tue Apr 30 03:23:48 2002
-@@ -1,4 +1,4 @@
--SUBDIRS = help po libsounds libbackground gnome-settings-daemon capplets control-center idl schemas
-+SUBDIRS = po libsounds libbackground gnome-settings-daemon capplets control-center idl schemas
-
- #I removed the root-manager for now
- #
-diff -Nur control-center-1.99.8/configure.in control-center-1.99.8.new/configure.in
---- control-center-1.99.8/configure.in Mon Apr 29 21:45:06 2002
-+++ control-center-1.99.8.new/configure.in Tue Apr 30 03:23:38 2002
-@@ -210,6 +210,4 @@
- capplets/accessibility/keyboard/Makefile
- capplets/network/Makefile
- schemas/Makefile
--help/Makefile
--help/C/Makefile
- libsounds/Makefile])
-diff -Nur control-center-1.99.8/schemas/Makefile.am control-center-1.99.8.new/schemas/Makefile.am
---- control-center-1.99.8/schemas/Makefile.am Tue Mar 26 18:22:22 2002
-+++ control-center-1.99.8.new/schemas/Makefile.am Tue Apr 30 03:15:49 2002
-@@ -5,7 +5,4 @@
-
- schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file))
-
--install-data-local: $(schema_installed_data)
-- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data)
--
- EXTRA_DIST=$(schema_DATA)
+++ /dev/null
---- control-center-2.0.0/schemas/Makefile.am.wiget Tue Jun 18 13:15:59 2002
-+++ control-center-2.0.0/schemas/Makefile.am Tue Jun 18 13:21:03 2002
-@@ -6,6 +6,8 @@
- schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file))
-
- install-data-local: $(schema_installed_data)
-- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data)
-+ if [ "x" = "x$(DESTDIR)" ] ; then \
-+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data) ;\
-+ fi
-
- EXTRA_DIST=$(schema_DATA)
+++ /dev/null
---- control-center-1.0.4/capplets/background-properties/property-background.c.bgcolor1 Mon Mar 22 14:05:34 1999
-+++ control-center-1.0.4/capplets/background-properties/property-background.c Mon Mar 22 14:05:47 1999
-@@ -1108,7 +1108,7 @@
- gint r, g, b;
-
- gdk_color_parse
-- (gnome_config_get_string ("/Background/Default/color1=#005060"),
-+ (gnome_config_get_string ("/Background/Default/color1=#356390"),
- &state->bgColor1);
- r = state->bgColor1.red >> 8;
- g = state->bgColor1.green >> 8;
+++ /dev/null
-diff -urN control-center-2.1.0.orig/configure.in control-center-2.1.0/configure.in
---- control-center-2.1.0.orig/configure.in Sat Sep 28 01:28:10 2002
-+++ control-center-2.1.0/configure.in Sat Sep 28 01:29:16 2002
-@@ -253,6 +253,5 @@
- capplets/windows/Makefile
- schemas/Makefile
- libsounds/Makefile
--dnl due to a bug in intltool we need to expand something from the root last
- control-center.spec
- ])
+++ /dev/null
-diff -Nru control-center-1.2.1/capplets/background-properties/property-background.c control-center-1.2.1.new/capplets/background-properties/property-background.c
---- control-center-1.2.1/capplets/background-properties/property-background.c Mon Aug 7 20:02:14 2000
-+++ control-center-1.2.1.new/capplets/background-properties/property-background.c Mon Aug 7 20:10:23 2000
-@@ -590,7 +590,10 @@
- else if (origState.wpFileName)
- gtk_file_selection_set_filename (GTK_FILE_SELECTION (fileSel),
- origState.wpFileName);
--
-+ else if (g_file_exists(GNOME_ICONDIR"/backgrounds"))
-+ gtk_file_selection_set_filename (GTK_FILE_SELECTION (fileSel),
-+ GNOME_ICONDIR"/backgrounds");
-+
- gtk_signal_connect (GTK_OBJECT (fileSel), "delete_event",
- (GtkSignalFunc) delete_browse,
- &fileSel);
+++ /dev/null
---- control-center-1.0.2/capplets/sound-properties/sound-properties.c.nosound Wed Mar 10 18:05:17 1999
-+++ control-center-1.0.2/capplets/sound-properties/sound-properties.c Wed Mar 10 18:06:35 1999
-@@ -131,7 +131,7 @@
- #ifdef HAVE_ESD
- if(token) {
- if(gnome_sound_connection < 0
-- && gnome_config_get_bool("/sound/system/settings/start_esd=true")) {
-+ && gnome_config_get_bool("/sound/system/settings/start_esd=false")) {
- int esdpid;
- static const char *esd_cmdline[] = {"esd", "-nobeeps", NULL};
- char *tmpargv[3];
-@@ -244,7 +244,7 @@
- FALSE, FALSE, 0);
-
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(retval->enable_esd_startup),
-- gnome_config_get_bool("/sound/system/settings/start_esd=true"));
-+ gnome_config_get_bool("/sound/system/settings/start_esd=false"));
-
- retval->enable_sound_events =
- gtk_check_button_new_with_label(_("Sounds for events"));
-@@ -636,7 +636,7 @@
- ui_do_revert(GtkWidget *w, SoundProps *props)
- {
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(props->enable_esd_startup),
-- gnome_config_get_bool("/sound/system/settings/start_esd=true"));
-+ gnome_config_get_bool("/sound/system/settings/start_esd=false"));
-
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(props->enable_sound_events),
- gnome_config_get_bool("/sound/system/settings/event_sounds=true"));
+++ /dev/null
---- control-center-1.4.0.1/capplets/file-types/Makefile.am~ Sat Nov 24 19:31:50 2001
-+++ control-center-1.4.0.1/capplets/file-types/Makefile.am Sat Nov 24 19:59:05 2001
-@@ -10,6 +10,7 @@
- -I$(srcdir)/../../control-center \
- $(GNOME_INCLUDEDIR) \
- $(GTK_CFLAGS) \
-+ $(PIXBUF_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -I$(includedir) \
- $(VFS_CFLAGS) $(WERROR) \
+++ /dev/null
-diff -urN aaa/control-center-2.1.0/capplets/theme-switcher/Makefile.am control-center-2.1.0/capplets/theme-switcher/Makefile.am
---- aaa/control-center-2.1.0/capplets/theme-switcher/Makefile.am Mon Aug 19 21:04:48 2002
-+++ control-center-2.1.0/capplets/theme-switcher/Makefile.am Tue Oct 1 21:09:46 2002
-@@ -2,7 +2,7 @@
-
- gnome_theme_properties_LDADD = \
- $(GNOMECC_CAPPLETS_LIBS) \
-- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings
-+ $(top_builddir)/libwindow-settings/.libs/libgnome-window-settings.so
-
- gnome_theme_properties_SOURCES = \
- theme-switcher.c
-
+++ /dev/null
-#
-# No modifications of this Makefile should be necessary.
-#
-# This file contains the build instructions for installing OMF files. It is
-# generally called from the makefiles for particular formats of documentation.
-#
-# Note that you must configure your package with --localstatedir=/var/lib
-# so that the scrollkeeper-update command below will update the database
-# in the standard scrollkeeper directory.
-#
-# If it is impossible to configure with --localstatedir=/var/lib, then
-# modify the definition of scrollkeeper_localstate_dir so that
-# it points to the correct location. Note that you must still use
-# $(localstatedir) in this or when people build RPMs it will update
-# the real database on their system instead of the one under RPM_BUILD_ROOT.
-#
-# Note: This make file is not incorporated into xmldocs.make because, in
-# general, there will be other documents install besides XML documents
-# and the makefiles for these formats should also include this file.
-#
-# About this file:
-# This file was taken from scrollkeeper_example2, a package illustrating
-# how to install documentation and OMF files for use with ScrollKeeper
-# 0.3.x and 0.4.x. For more information, see:
-# http://scrollkeeper.sourceforge.net/
-# Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-omf_dest_dir=$(datadir)/omf/@PACKAGE@
-scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-
-omf: omf_timestamp
-
-omf_timestamp: $(omffile)
- -for file in $(omffile); do \
- scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- done
- touch omf_timestamp
-
-install-data-hook-omf:
- $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- for file in $(omffile); do \
- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- done
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-
-uninstall-local-omf:
- -for file in $(srcdir)/*.omf; do \
- basefile=`basename $$file`; \
- rm -f $(omf_dest_dir)/$$basefile; \
- done
- -rmdir $(omf_dest_dir)
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+++ /dev/null
-#
-# No modifications of this Makefile should be necessary.
-#
-# To use this template:
-# 1) Define: figdir, docname, lang, omffile, and entities in
-# your Makefile.am file for each document directory,
-# although figdir, omffile, and entities may be empty
-# 2) Make sure the Makefile in (1) also includes
-# "include $(top_srcdir)/xmldocs.make" and
-# "dist-hook: app-dist-hook".
-# 3) Optionally define 'entities' to hold xml entities which
-# you would also like installed
-# 4) Figures must go under $(figdir)/ and be in PNG format
-# 5) You should only have one document per directory
-# 6) Note that the figure directory, $(figdir)/, should not have its
-# own Makefile since this Makefile installs those figures.
-#
-# example Makefile.am:
-# figdir = figures
-# docname = scrollkeeper-manual
-# lang = C
-# omffile=scrollkeeper-manual-C.omf
-# entities = fdl.xml
-# include $(top_srcdir)/xmldocs.make
-# dist-hook: app-dist-hook
-#
-# About this file:
-# This file was taken from scrollkeeper_example2, a package illustrating
-# how to install documentation and OMF files for use with ScrollKeeper
-# 0.3.x and 0.4.x. For more information, see:
-# http://scrollkeeper.sourceforge.net/
-# Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-
-# ************* Begin of section some packagers may need to modify **************
-# This variable (docdir) specifies where the documents should be installed.
-# This default value should work for most packages.
-# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
-# ************** You should not have to edit below this line *******************
-xml_files = $(entities)
-
-EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
-
-include $(top_srcdir)/omf.make
-
-all: omf
-
-$(docname).xml: $(entities)
- -ourdir=`pwd`; \
- cd $(srcdir); \
- cp $(entities) $$ourdir
-
-app-dist-hook:
- if test "$(figdir)"; then \
- $(mkinstalldirs) $(distdir)/$(figdir); \
- for file in $(srcdir)/$(figdir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
- done \
- fi
-
-install-data-local: omf
- $(mkinstalldirs) $(DESTDIR)$(docdir)
- for file in $(xml_files); do \
- cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
- done
- if test "$(figdir)"; then \
- $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
- for file in $(srcdir)/$(figdir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
- done \
- fi
-
-install-data-hook: install-data-hook-omf
-
-uninstall-local: uninstall-local-doc uninstall-local-omf
-
-uninstall-local-doc:
- -if test "$(figdir)"; then \
- for file in $(srcdir)/$(figdir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- rm -f $(docdir)/$(figdir)/$$basefile; \
- done; \
- rmdir $(DESTDIR)$(docdir)/$(figdir); \
- fi
- -for file in $(xml_files); do \
- rm -f $(DESTDIR)$(docdir)/$$file; \
- done
- -rmdir $(DESTDIR)$(docdir)
-
projects / packages / control-center.git / commitdiff