This commit was manufactured by cvs2git to create branch 'DEVEL'.

Cherrypick from master 2004-01-29 23:18:02 UTC grzegol <grzegol@pld-linux.org> '- fix building with libxklavier-0.97':
    control-center-ac_am.patch -> 1.1
    control-center-am17.patch -> 1.2
    control-center-libxklavier.patch -> 1.1
    control-center-link.patch -> 1.1
    control-center-pixmaps-dirs.patch -> 1.1
    control-center-themus-glade.patch -> 1.2
    omf.make -> 1.1
Cherrypick from master 2002-05-23 15:32:46 UTC Artur Frysiak <artur@frysiak.net> 'this files are missing in gnome-utils tarball':
    xmldocs.make -> 1.1
Cherrypick from master 2002-06-21 12:56:29 UTC Artur Frysiak <artur@frysiak.net> 'for 2.0.0':
    control-center-am.patch -> 1.1

diff --git a/control-center-ac_am.patch b/control-center-ac_am.patch
new file mode 100644 (file)
index 0000000..e99569e
--- /dev/null
+++ b/control-center-ac_am.patch
@@ -0,0 +1,30 @@
+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)

diff --git a/control-center-am.patch b/control-center-am.patch
new file mode 100644 (file)
index 0000000..9c88cac
--- /dev/null
+++ b/control-center-am.patch
@@ -0,0 +1,12 @@
+--- 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)

diff --git a/control-center-am17.patch b/control-center-am17.patch
new file mode 100644 (file)
index 0000000..3dd1396
--- /dev/null
+++ b/control-center-am17.patch
@@ -0,0 +1,9 @@
+diff -urN control-center-2.3.5.orig/gnome-settings-daemon/Makefile.am control-center-2.3.5/gnome-settings-daemon/Makefile.am
+--- control-center-2.3.5.orig/gnome-settings-daemon/Makefile.am        Tue Aug 12 06:23:31 2003
++++ control-center-2.3.5/gnome-settings-daemon/Makefile.am     Tue Aug 12 06:24:58 2003
+@@ -89,4 +89,4 @@
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+ EXTRA_DIST =                                          \
+-      $(server_in_files)                              \
++      $(server_in_files)                              

diff --git a/control-center-libxklavier.patch b/control-center-libxklavier.patch
new file mode 100644 (file)
index 0000000..ac48f6c
--- /dev/null
+++ b/control-center-libxklavier.patch
@@ -0,0 +1,29 @@
+diff -urN aa/control-center-2.5.2/libgswitchit/gswitchit_config.c control-center-2.5.2/libgswitchit/gswitchit_config.c
+--- aa/control-center-2.5.2/libgswitchit/gswitchit_config.c    2004-01-12 20:30:47.000000000 +0100
++++ control-center-2.5.2/libgswitchit/gswitchit_config.c       2004-01-29 23:46:29.523783336 +0100
+@@ -362,7 +362,6 @@
+                                  gboolean activate,
+                                  const char *psFileName)
+ {
+-      XkbDescModifierFunc fun = NULL;
+       gboolean rv = FALSE;
+ 
+       XklConfigRec data;
+@@ -371,7 +370,7 @@
+       _GSwitchItXkbConfigCopyToXklConfig (xkbConfig, &data);
+ 
+       if (activate) {
+-              rv = XklConfigActivate (&data, fun, NULL);
++              rv = XklConfigActivate (&data, NULL);
+       } else {
+               char *home = getenv ("HOME");
+               char xkmFileName[PATH_MAX];
+@@ -379,7 +378,7 @@
+               int status;
+               g_snprintf (xkmFileName, sizeof (xkmFileName),
+                           "%s/.gnome_private/xkbpreview.xkm", home);
+-              rv = XklConfigWriteXKMFile (xkmFileName, &data, fun, NULL);
++              rv = XklConfigWriteXKMFile (xkmFileName, &data, NULL);
+               if (rv) {
+                       g_snprintf (cmd, sizeof (cmd),
+                                   "xkbprint -full -color %s %s",

diff --git a/control-center-link.patch b/control-center-link.patch
new file mode 100644 (file)
index 0000000..c441b31
--- /dev/null
+++ b/control-center-link.patch
@@ -0,0 +1,12 @@
+diff -urN aaa/control-center-2.3.4/gnome-settings-daemon/Makefile.am control-center-2.3.4/gnome-settings-daemon/Makefile.am
+--- aaa/control-center-2.3.4/gnome-settings-daemon/Makefile.am 2003-06-29 21:39:32.000000000 +0200
++++ control-center-2.3.4/gnome-settings-daemon/Makefile.am     2003-08-01 01:32:46.000000000 +0200
+@@ -52,7 +52,7 @@
+       $(GNOME_SETTINGS_DAEMON_LIBS)                                   \
+       $(top_builddir)/libbackground/libbackground.la                  \
+       $(top_builddir)/libsounds/libsounds.a                           \
+-      -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings   \
++      $(top_builddir)/libwindow-settings/libgnome-window-settings.la  \
+       $(XF86MISC_LIBS)
+ 
+ #AccessX_files = \

diff --git a/control-center-pixmaps-dirs.patch b/control-center-pixmaps-dirs.patch
new file mode 100644 (file)
index 0000000..3abd3d8
--- /dev/null
+++ b/control-center-pixmaps-dirs.patch
@@ -0,0 +1,281 @@
+diff -Nuard control-center-2.4.0.orig/capplets/accessibility/at-properties/Makefile.am control-center-2.4.0/capplets/accessibility/at-properties/Makefile.am
+--- control-center-2.4.0.orig/capplets/accessibility/at-properties/Makefile.am 2003-06-25 19:37:32.000000000 +0200
++++ control-center-2.4.0/capplets/accessibility/at-properties/Makefile.am      2003-11-09 01:23:35.000000000 +0100
+@@ -9,16 +9,12 @@
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-iconsdir   = $(GNOMECC_ICONS_DIR)
+-icons_DATA = at-enable-capplet.png
+-
+ desktopdir = $(GNOMECC_DESKTOP_DIR)
+ Desktop_in_files = at-properties.desktop.in
+ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+ 
+ pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+ pixmap_DATA =                                 \
+-      at-enable-capplet.png                   \
+       at-startup.png                          \
+       at-support.png
+ 
+@@ -33,4 +29,4 @@
+            -DGLADEDIR=\""$(gladedir)"\" \
+            -DPIXMAPDIR=\""$(pixmapdir)"\"
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(icons_DATA) $(glade_DATA) $(pixmap_DATA) $(Desktop_in_files)
++EXTRA_DIST = $(glade_DATA) $(pixmap_DATA) $(Desktop_in_files)
+diff -Nuard control-center-2.4.0.orig/capplets/accessibility/keyboard/Makefile.am control-center-2.4.0/capplets/accessibility/keyboard/Makefile.am
+--- control-center-2.4.0.orig/capplets/accessibility/keyboard/Makefile.am      2002-06-18 20:55:04.000000000 +0200
++++ control-center-2.4.0/capplets/accessibility/keyboard/Makefile.am   2003-11-09 00:42:04.000000000 +0100
+@@ -26,8 +26,8 @@
+ Gladedir   = $(GNOMECC_GLADE_DIR)
+ Glade_DATA = gnome-accessibility-keyboard-properties.glade
+ 
+-iconsdir   = $(GNOMECC_ICONS_DIR)
+-icons_DATA = accessibility-keyboard-capplet.png
++#iconsdir   = $(GNOMECC_ICONS_DIR)
++#icons_DATA = accessibility-keyboard-capplet.png
+ 
+ desktop_iconsdir = $(datadir)/pixmaps
+ desktop_icons_DATA = accessibility-keyboard-capplet.png
+@@ -38,5 +38,5 @@
+ 
+ INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA)
++EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA)
+ 
+diff -Nuard control-center-2.4.0.orig/capplets/background/Makefile.am control-center-2.4.0/capplets/background/Makefile.am
+--- control-center-2.4.0.orig/capplets/background/Makefile.am  2002-04-02 02:27:40.000000000 +0200
++++ control-center-2.4.0/capplets/background/Makefile.am       2003-11-09 00:41:28.000000000 +0100
+@@ -8,8 +8,8 @@
+ Gladedir   = $(GNOMECC_GLADE_DIR)
+ Glade_DATA = background-properties.glade
+ 
+-iconsdir   = $(GNOMECC_ICONS_DIR)
+-icons_DATA = background-capplet.png
++#iconsdir   = $(GNOMECC_ICONS_DIR)
++#icons_DATA = background-capplet.png
+ 
+ desktop_iconsdir = $(datadir)/pixmaps
+ desktop_icons_DATA = background-capplet.png
+@@ -20,5 +20,5 @@
+ 
+ INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) -I$(top_srcdir)/libbackground
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
++EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
+ 
+diff -Nuard control-center-2.4.0.orig/capplets/default-applications/Makefile.am control-center-2.4.0/capplets/default-applications/Makefile.am
+--- control-center-2.4.0.orig/capplets/default-applications/Makefile.am        2002-04-10 08:07:58.000000000 +0200
++++ control-center-2.4.0/capplets/default-applications/Makefile.am     2003-11-09 00:24:30.000000000 +0100
+@@ -6,8 +6,8 @@
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-iconsdir   = $(GNOMECC_ICONS_DIR)
+-icons_DATA = default-applications-capplet.png
++#iconsdir   = $(GNOMECC_ICONS_DIR)
++#icons_DATA = default-applications-capplet.png
+ 
+ desktop_iconsdir = $(datadir)/pixmaps
+ desktop_icons_DATA = default-applications-capplet.png
+@@ -21,4 +21,4 @@
+ 
+ INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) gnome-default-applications-properties-structs.c
++EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) gnome-default-applications-properties-structs.c
+diff -Nuard control-center-2.4.0.orig/capplets/desktop-links/Makefile.am control-center-2.4.0/capplets/desktop-links/Makefile.am
+--- control-center-2.4.0.orig/capplets/desktop-links/Makefile.am       2002-12-06 11:53:21.000000000 +0100
++++ control-center-2.4.0/capplets/desktop-links/Makefile.am    2003-11-09 01:29:07.000000000 +0100
+@@ -3,14 +3,13 @@
+ 
+ ## Pixmaps
+ 
+-pixmaps_pre = $(capplets:=-capplet.png)
+-pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
+-pixmapsdir = $(GNOMECC_ICONS_DIR)
+-
+ ##
+ ##  Desktop files
+ ##
+ 
++desktop_iconsdir = $(datadir)/pixmaps
++desktop_icons_DATA = accessibility-directory.png
++
+ desktop_files = $(capplets:=.desktop)
+ desktop_in_files = $(desktop_files:.desktop=.desktop.in)
+ desktop_in_in_files = $(desktop_files:.desktop=.desktop.in.in)
+@@ -19,10 +18,10 @@
+ desktopfiles_DATA = $(desktop_files)
+ 
+ CLEANFILES = $(desktop_files) $(desktop_in_files)
+-EXTRA_DIST = $(desktop_in_in_files) $(groups_in_in_files) $(pixmaps_DATA)
++EXTRA_DIST = $(desktop_in_in_files) $(groups_in_in_files)
+ 
+ %.desktop.in: $(srcdir)/%.desktop.in.in
+-          sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/# < $< > $@
++          sed s#Icon=#Icon=# < $< > $@
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+@@ -46,6 +45,6 @@
+ Gnomecc_DATA = $(groups_files)
+ 
+ %.directory.in: $(srcdir)/%.directory.in.in
+-          sed s#Icon=#Icon=$(pixmapsdir)/# < $< > $@
++          sed s#Icon=#Icon=# < $< > $@
+ 
+ @INTLTOOL_DIRECTORY_RULE@
+diff -Nuard control-center-2.4.0.orig/capplets/display/Makefile.am control-center-2.4.0/capplets/display/Makefile.am
+--- control-center-2.4.0.orig/capplets/display/Makefile.am     2003-04-23 17:01:16.000000000 +0200
++++ control-center-2.4.0/capplets/display/Makefile.am  2003-11-09 00:28:11.000000000 +0100
+@@ -7,8 +7,8 @@
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-iconsdir   = $(GNOMECC_ICONS_DIR)
+-icons_DATA = display-capplet.png
++#iconsdir   = $(GNOMECC_ICONS_DIR)
++#icons_DATA = display-capplet.png
+ 
+ desktop_iconsdir = $(datadir)/pixmaps
+ desktop_icons_DATA = display-capplet.png
+@@ -23,4 +23,4 @@
+            -DPIXMAPDIR=\""$(pixmapdir)"\"
+ 
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(Desktop_in_files) $(icons_DATA)
++EXTRA_DIST = $(Desktop_in_files)
+diff -Nuard control-center-2.4.0.orig/capplets/font/Makefile.am control-center-2.4.0/capplets/font/Makefile.am
+--- control-center-2.4.0.orig/capplets/font/Makefile.am        2002-07-24 19:36:30.000000000 +0200
++++ control-center-2.4.0/capplets/font/Makefile.am     2003-11-09 00:29:04.000000000 +0100
+@@ -7,8 +7,8 @@
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-iconsdir   = $(GNOMECC_ICONS_DIR)
+-icons_DATA = font-capplet.png
++#iconsdir   = $(GNOMECC_ICONS_DIR)
++#icons_DATA = font-capplet.png
+ 
+ pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+ pixmap_DATA =                                 \
+@@ -32,4 +32,4 @@
+            -DGLADEDIR=\""$(gladedir)"\" \
+            -DPIXMAPDIR=\""$(pixmapdir)"\"
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(Desktop_in_files) $(icons_DATA) $(glade_DATA) $(pixmap_DATA)
++EXTRA_DIST = $(Desktop_in_files) $(glade_DATA) $(pixmap_DATA)
+diff -Nuard control-center-2.4.0.orig/capplets/keybindings/Makefile.am control-center-2.4.0/capplets/keybindings/Makefile.am
+--- control-center-2.4.0.orig/capplets/keybindings/Makefile.am 2002-08-13 20:14:39.000000000 +0200
++++ control-center-2.4.0/capplets/keybindings/Makefile.am      2003-11-09 00:43:28.000000000 +0100
+@@ -14,8 +14,8 @@
+ Gladedir   = $(GNOMECC_GLADE_DIR)
+ Glade_DATA = gnome-keybinding-properties.glade
+ 
+-pixmapsdir = $(datadir)/pixmaps
+-pixmaps_DATA = keyboard-shortcut.png
++desktop_iconsdir = $(datadir)/pixmaps
++desktop_icons_DATA = keyboard-shortcut.png
+ 
+ desktopdir = $(GNOMECC_DESKTOP_DIR)
+ Desktop_in_files = keybinding.desktop.in
+@@ -23,5 +23,5 @@
+ 
+ INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmaps_DATA)
++EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
+ 
+diff -Nuard control-center-2.4.0.orig/capplets/keyboard/Makefile.am control-center-2.4.0/capplets/keyboard/Makefile.am
+--- control-center-2.4.0.orig/capplets/keyboard/Makefile.am    2002-04-10 08:08:02.000000000 +0200
++++ control-center-2.4.0/capplets/keyboard/Makefile.am 2003-11-09 00:45:04.000000000 +0100
+@@ -11,14 +11,13 @@
+ Glade_DATA = gnome-keyboard-properties.glade
+ 
+ iconsdir   = $(GNOMECC_PIXMAPS_DIR)
+-icons_DATA = keyboard-capplet.png     \
+-      keyboard-repeat.png             \
++icons_DATA = keyboard-repeat.png              \
+       keyboard-cursor.png             \
+       keyboard-volume.png             \
+       keyboard-bell.png
+ 
+-pixmapsdir = $(datadir)/pixmaps
+-pixmaps_DATA = keyboard-capplet.png
++desktop_iconsdir = $(datadir)/pixmaps
++desktop_icons_DATA = keyboard-capplet.png
+ 
+ desktopdir = $(GNOMECC_DESKTOP_DIR)
+ Desktop_in_files = keyboard.desktop.in
+diff -Nuard control-center-2.4.0.orig/capplets/mouse/Makefile.am control-center-2.4.0/capplets/mouse/Makefile.am
+--- control-center-2.4.0.orig/capplets/mouse/Makefile.am       2003-01-08 08:04:42.000000000 +0100
++++ control-center-2.4.0/capplets/mouse/Makefile.am    2003-11-09 00:45:23.000000000 +0100
+@@ -27,9 +27,6 @@
+ Gladedir   = $(GNOMECC_GLADE_DIR)
+ Glade_DATA = gnome-mouse-properties.glade
+ 
+-iconsdir   = $(GNOMECC_ICONS_DIR)
+-icons_DATA = mouse-capplet.png
+-
+ desktop_iconsdir = $(datadir)/pixmaps
+ desktop_icons_DATA = mouse-capplet.png
+ 
+@@ -39,4 +36,4 @@
+ 
+ INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
++EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
+diff -Nuard control-center-2.4.0.orig/capplets/ui-properties/Makefile.am control-center-2.4.0/capplets/ui-properties/Makefile.am
+--- control-center-2.4.0.orig/capplets/ui-properties/Makefile.am       2002-04-10 08:08:05.000000000 +0200
++++ control-center-2.4.0/capplets/ui-properties/Makefile.am    2003-11-09 00:46:57.000000000 +0100
+@@ -6,9 +6,6 @@
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-iconsdir   = $(GNOMECC_ICONS_DIR)
+-icons_DATA = behavior-capplet.png
+-
+ desktop_iconsdir = $(datadir)/pixmaps
+ desktop_icons_DATA = behavior-capplet.png
+ 
+@@ -19,4 +16,4 @@
+ Glade_DATA = gnome-ui-properties.glade
+ INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
++EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
+diff -Nuard control-center-2.4.0.orig/capplets/windows/Makefile.am control-center-2.4.0/capplets/windows/Makefile.am
+--- control-center-2.4.0.orig/capplets/windows/Makefile.am     2002-10-29 07:19:51.000000000 +0100
++++ control-center-2.4.0/capplets/windows/Makefile.am  2003-11-09 00:38:50.000000000 +0100
+@@ -14,9 +14,6 @@
+ gladedir   = $(GNOMECC_GLADE_DIR)
+ glade_DATA = gnome-window-properties.glade
+ 
+-iconsdir   = $(GNOMECC_ICONS_DIR)
+-icons_DATA = window-capplet.png
+-
+ desktop_iconsdir = $(datadir)/pixmaps
+ desktop_icons_DATA = window-capplet.png
+ 
+@@ -31,5 +28,5 @@
+            -DPIXMAPDIR=\""$(pixmapdir)"\"
+ 
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA)
++EXTRA_DIST = $(glade_DATA) $(Desktop_in_files) $(pixmap_DATA)
+ 
+diff -Nuard control-center-2.4.0.orig/control-center/Makefile.am control-center-2.4.0/control-center/Makefile.am
+--- control-center-2.4.0.orig/control-center/Makefile.am       2003-05-07 20:55:08.000000000 +0200
++++ control-center-2.4.0/control-center/Makefile.am    2003-11-08 23:49:14.000000000 +0100
+@@ -15,7 +15,6 @@
+ 
+ INCLUDES =                                                    \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+-      -DSETTINGS_DIR=\""$(GNOMECC_DESKTOP_DIR)"\"             \
+       -DGNOMECC_ICONS_DIR=\""$(GNOMECC_ICONS_DIR)"\"          \
+       -DPIXMAP_DIR=\""$(datadir)/pixmaps"\"                   \
+       -DART_DIR=\""$(splashdir)"\"                            \

diff --git a/control-center-themus-glade.patch b/control-center-themus-glade.patch
new file mode 100644 (file)
index 0000000..74950e0
--- /dev/null
+++ b/control-center-themus-glade.patch
@@ -0,0 +1,41 @@
+diff -Nuard control-center-2.4.0.orig/vfs-methods/themus/Makefile.am control-center-2.4.0/vfs-methods/themus/Makefile.am
+--- control-center-2.4.0.orig/vfs-methods/themus/Makefile.am   2003-08-28 01:01:56.000000000 +0200
++++ control-center-2.4.0/vfs-methods/themus/Makefile.am        2003-11-11 01:55:19.000000000 +0100
+@@ -2,6 +2,7 @@
+   $(THEMUS_THUMBNAILER_CFLAGS) \
+   $(THEMUS_COMPONENT_CFLAGS) \
+   -I$(top_srcdir)/capplets/common \
++  -DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \
+   -DDIRECTORY_DIR=\"$(vfsdirectorydir)\" \
+   -DDATA_DIR=\"$(datadir)/themus\"
+ 
+@@ -39,7 +40,8 @@
+       themus-properties-view.h \
+       themus-properties-main.c
+ 
+-pkgdata_DATA = apply-font.glade
++Gladedir   = $(GNOMECC_GLADE_DIR)
++Glade_DATA = apply-font.glade
+ 
+ @INTLTOOL_DIRECTORY_RULE@
+ 
+@@ -78,6 +80,7 @@
+ @INTLTOOL_SCHEMAS_RULE@
+ 
+ EXTRA_DIST = \
++  $(Glade_DATA) \
+   apply-font.glade \
+   theme-method.directory.in \
+   theme-method.conf \
+diff -Nuard control-center-2.4.0.orig/vfs-methods/themus/themus-theme-applier.c control-center-2.4.0/vfs-methods/themus/themus-theme-applier.c
+--- control-center-2.4.0.orig/vfs-methods/themus/themus-theme-applier.c        2003-07-24 23:06:38.000000000 +0200
++++ control-center-2.4.0/vfs-methods/themus/themus-theme-applier.c     2003-11-11 01:56:31.000000000 +0100
+@@ -69,7 +69,7 @@
+               if (theme->application_font)
+               {
+                       glade_init ();
+-                      font_xml = glade_xml_new (DATA_DIR "/apply-font.glade",
++                      font_xml = glade_xml_new (GNOMECC_GLADE_DIR "/apply-font.glade",
+                                                               NULL, NULL);
+                       if (font_xml)
+                       {

diff --git a/omf.make b/omf.make
new file mode 100644 (file)
index 0000000..3261e00
--- /dev/null
+++ b/omf.make
@@ -0,0 +1,53 @@
+# 
+# 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)

diff --git a/xmldocs.make b/xmldocs.make
new file mode 100644 (file)
index 0000000..9f78af7
--- /dev/null
+++ b/xmldocs.make
@@ -0,0 +1,95 @@
+#
+# 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) $(docname).xml
+
+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)
+