- taken from rh6.1 (except DESTDIR)

Changed files:
    enlightenment-conf-DESTDIR.patch -> 1.1
    enlightenment-conf-alpha-notrans.patch -> 1.1
    enlightenment-conf-keybind.patch -> 1.1
    enlightenment-conf-locale.patch -> 1.1
    enlightenment-conf-spelling.patch -> 1.1

diff --git a/enlightenment-conf-DESTDIR.patch b/enlightenment-conf-DESTDIR.patch
new file mode 100644 (file)
index 0000000..7e0f6fe
--- /dev/null
+++ b/enlightenment-conf-DESTDIR.patch
@@ -0,0 +1,41 @@
+diff -Nru enlightenment-conf-0.15.orig/Makefile.am enlightenment-conf-0.15/Makefile.am
+--- enlightenment-conf-0.15.orig/Makefile.am   Wed Jun  7 00:46:02 2000
++++ enlightenment-conf-0.15/Makefile.am        Wed Jun  7 00:47:02 2000
+@@ -54,7 +54,7 @@
+         Enlightenment.desktop
+ 
+ install-data-local:
+-      $(mkinstalldirs) $(sysdir)
++      $(mkinstalldirs) $(DESTDIR)$(sysdir)
+ 
+ ## to automatically rebuild aclocal.m4 if any of the macros in macros/' change
+ #@MAINT@include macros/macros.dep
+diff -Nru enlightenment-conf-0.15.orig/Makefile.in enlightenment-conf-0.15/Makefile.in
+--- enlightenment-conf-0.15.orig/Makefile.in   Wed Jun  7 00:46:02 2000
++++ enlightenment-conf-0.15/Makefile.in        Wed Jun  7 00:46:33 2000
+@@ -555,7 +555,7 @@
+ 
+ 
+ install-data-local:
+-      $(mkinstalldirs) $(sysdir)
++      $(mkinstalldirs) $(DESTDIR)$(sysdir)
+ 
+ #@MAINT@include macros/macros.dep
+ #@MAINT@macros/macros.dep: macros/Makefile.am
+diff -Nru enlightenment-conf-0.15.orig/po/Makefile.in.in enlightenment-conf-0.15/po/Makefile.in.in
+--- enlightenment-conf-0.15.orig/po/Makefile.in.in     Wed Jun  7 00:46:03 2000
++++ enlightenment-conf-0.15/po/Makefile.in.in  Wed Jun  7 00:47:00 2000
+@@ -18,10 +18,10 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-datadir = $(prefix)/@DATADIRNAME@
++datadir = $(DESTDIR)$(prefix)/@DATADIRNAME@
+ localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
+-gettextsrcdir = $(prefix)/share/gettext/po
++gnulocaledir = $(DESTDIR)$(prefix)/share/locale
++gettextsrcdir = $(DESTDIR)$(prefix)/share/gettext/po
+ subdir = po
+ 
+ INSTALL = @INSTALL@

diff --git a/enlightenment-conf-alpha-notrans.patch b/enlightenment-conf-alpha-notrans.patch
new file mode 100644 (file)
index 0000000..eb0df0c
--- /dev/null
+++ b/enlightenment-conf-alpha-notrans.patch
@@ -0,0 +1,15 @@
+--- enlightenment-conf-0.15/e-conf.c.sopwith   Wed Sep  1 15:59:01 1999
++++ enlightenment-conf-0.15/e-conf.c   Wed Sep  1 15:59:44 1999
+@@ -1997,8 +1997,12 @@
+         N_("Windows are moved by drawing a stippled outline of them")},
+       {N_("Semi-Solid"), move_semi_solid_xpm,
+         N_("Windows are moved by drawing a chequered outline of them")},
++#ifndef __alpha__
++/* Translucent moves require shared pixmaps, and we've disabled them
++   on the Alpha because they are broken */
+       {N_("Translucent"), move_translucent_xpm,
+         N_("Windows are moved by drawing a translucent copy of the window")}
++#endif
+     };
+   IconOption          resize_options[] =
+     {

diff --git a/enlightenment-conf-keybind.patch b/enlightenment-conf-keybind.patch
new file mode 100644 (file)
index 0000000..c125088
--- /dev/null
+++ b/enlightenment-conf-keybind.patch
@@ -0,0 +1,20 @@
+--- enlightenment-conf-0.15/e-conf.c.noscrollbar       Fri Mar 12 18:51:57 1999
++++ enlightenment-conf-0.15/e-conf.c   Fri Mar 12 19:26:04 1999
+@@ -740,7 +740,7 @@
+         
+         kb = ptr->data;
+         ptr = ptr->next;
+-        if (strcmp(kb->key, "EDIT ME"))
++        if (strcmp(kb->key, "EDIT"))
+           {
+             if (kb->params)
+               g_snprintf(buf2, sizeof(buf2), "%s %i %i %s\n",
+@@ -4138,7 +4138,7 @@
+   gchar   *line[4];
+   
+   kb = g_malloc(sizeof(Keybind));
+-  kb->key = g_strdup("EDIT ME");
++  kb->key = g_strdup("EDIT");
+   kb->modifier = 0;
+   kb->id = 1;
+   kb->params = NULL;

diff --git a/enlightenment-conf-locale.patch b/enlightenment-conf-locale.patch
new file mode 100644 (file)
index 0000000..8ef7181
--- /dev/null
+++ b/enlightenment-conf-locale.patch
@@ -0,0 +1,23 @@
+--- enlightenment-conf-0.15/e-conf.c.original  Sun Jul 25 22:24:39 1999
++++ enlightenment-conf-0.15/e-conf.c   Sun Jul 25 22:25:11 1999
+@@ -5017,16 +5017,16 @@
+ 
+   if (is_capp)
+     {
+-      bindtextdomain("E-conf", GNOMELOCALEDIR);
+-      textdomain("E-conf");
++      bindtextdomain("enlightenment-conf", GNOMELOCALEDIR);
++      textdomain("enlightenment-conf");
+       gnome_capplet_init("E-conf", "0.15", argc,
+                        argv, NULL, 0, NULL);
+       capplet = capplet_widget_new();
+     }
+   else
+     {
+-      bindtextdomain("E-conf", GNOMELOCALEDIR);
+-      textdomain("E-conf");
++      bindtextdomain("enlightenment-conf", GNOMELOCALEDIR);
++      textdomain("enlightenment-conf");
+       gnome_init("E-conf", "0.15", argc, argv);
+       capplet = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       gtk_window_set_title(GTK_WINDOW(capplet), 

diff --git a/enlightenment-conf-spelling.patch b/enlightenment-conf-spelling.patch
new file mode 100644 (file)
index 0000000..69b0739
--- /dev/null
+++ b/enlightenment-conf-spelling.patch
@@ -0,0 +1,20 @@
+--- enlightenment-conf-0.15/e-conf.c.spelling  Tue May 25 16:53:09 1999
++++ enlightenment-conf-0.15/e-conf.c   Tue May 25 16:53:37 1999
+@@ -1838,7 +1838,7 @@
+   *value = adj->value;
+   label = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(w), "label");
+   g_snprintf(str, sizeof(str),
+-           _("The virutal desktop size will be\n"
++           _("The virtual desktop size will be\n"
+              "%1.0f x %1.0f\n"
+              "screens in size"),
+            e_opt_area_width, e_opt_area_height);
+@@ -1891,7 +1891,7 @@
+   gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
+                    GTK_SIGNAL_FUNC(e_cb_area_range), (gpointer) area);
+   g_snprintf(str, sizeof(str),
+-           _("The virutal desktop size will be\n"
++           _("The virtual desktop size will be\n"
+              "%1.0f x %1.0f\n"
+              "screens in size"),
+            e_opt_area_width, e_opt_area_height);