- outdated

Changed files:
    control-center-DESTDIR.patch -> 1.1.2.2
    control-center-libxklavier.patch -> 1.1.2.1

diff --git a/control-center-DESTDIR.patch b/control-center-DESTDIR.patch
deleted file mode 100644 (file)
index b84988f..0000000
--- a/control-center-DESTDIR.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nru control-center-2.5.2.orig/capplets/background/Makefile.am control-center-2.5.2/capplets/background/Makefile.am
---- control-center-2.5.2.orig/capplets/background/Makefile.am  2004-01-12 07:33:07.000000000 +0100
-+++ control-center-2.5.2/capplets/background/Makefile.am       2004-01-14 13:52:01.418770456 +0100
-@@ -29,7 +29,7 @@
- @INTLTOOL_DESKTOP_RULE@
- 
- install-data-local:
--      $(mkinstalldirs) $(WALLPAPER_DATADIR)
-+      $(mkinstalldirs) $(DESTDIR)$(WALLPAPER_DATADIR)
- 
- EXTRA_DIST = \
-       $(desktop_in_files)
-diff -Nru control-center-2.5.2.orig/gnome-settings-daemon/Makefile.am control-center-2.5.2/gnome-settings-daemon/Makefile.am
---- control-center-2.5.2.orig/gnome-settings-daemon/Makefile.am        2004-01-14 07:11:42.000000000 +0100
-+++ control-center-2.5.2/gnome-settings-daemon/Makefile.am     2004-01-14 13:37:02.000000000 +0100
-@@ -99,8 +99,8 @@
- serverfile = GNOME_SettingsDaemon.server.in
- serverdir = $(libdir)/bonobo/servers
- install-data-hook :
--      $(mkinstalldirs) $(serverdir)
--      sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $(srcdir)/$(serverfile) > $(serverdir)/$(serverfile:.in=)
-+      $(mkinstalldirs) $(DESTDIR)$(serverdir)
-+      sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $(srcdir)/$(serverfile) > $(DESTDIR)$(serverdir)/$(serverfile:.in=)
- 
- EXTRA_DIST = $(serverfile)
- CLEANFILES = $(BUILT_SOURCES)

diff --git a/control-center-libxklavier.patch b/control-center-libxklavier.patch
deleted file mode 100644 (file)
index ac48f6c..0000000
--- a/control-center-libxklavier.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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",