- merged from DEVEL

Changed files:
    control-center-def-apps-capplet.patch -> 1.2
    control-center-fontconfig.patch -> 1.2
    control-center-locale-names.patch -> 1.2

diff --git a/control-center-def-apps-capplet.patch b/control-center-def-apps-capplet.patch
index 28947ac7ca5f48cf13e4f4697230a7e39ab0d5d0..0c2472903de42de3c341d1175d5bb416082ecfc4 100644 (file)
--- a/control-center-def-apps-capplet.patch
+++ b/control-center-def-apps-capplet.patch
@@ -25,7 +25,7 @@ diff -Nuard control-center-2.4.0.orig/capplets/default-applications/gnome-defaul
        for (i = 0; i < G_N_ELEMENTS (possible_browsers); i++ ) {
                if (possible_browsers[i].in_path == FALSE)
                        continue;
--              
+-
 -              if (browser && strcmp (browser, possible_browsers[i].command) == 0 &&
 -                  needs_term == possible_browsers[i].needs_term) {
 +
@@ -51,7 +51,7 @@ diff -Nuard control-center-2.4.0.orig/capplets/default-applications/gnome-defaul
 @@ -427,18 +429,19 @@
                if (possible_mailers[i].in_path == FALSE)
                        continue;
-               
+ 
 -              if (mailer && strcmp (mailer, possible_mailers[i].command) == 0 &&
 -                  needs_term == possible_mailers[i].needs_term) {
 +              if (mailer && (strcmp (mailer, possible_mailers[i].command) == 0)

diff --git a/control-center-fontconfig.patch b/control-center-fontconfig.patch
index 1b6fd64cc35388d9b576fb8e342930b354ed8f1a..261c4586a685d4e9622eea7af2961c343dbb1103 100644 (file)
--- a/control-center-fontconfig.patch
+++ b/control-center-fontconfig.patch
@@ -1,17 +1,15 @@
-diff -urN control-center-2.1.0.1.orig/capplets/font/main.c control-center-2.1.0.1/capplets/font/main.c
---- control-center-2.1.0.1.orig/capplets/font/main.c   Mon Oct  7 00:57:43 2002
-+++ control-center-2.1.0.1/capplets/font/main.c        Mon Oct  7 00:58:35 2002
-@@ -9,6 +9,7 @@
- #include <gconf/gconf-client.h>
+--- control-center-2.5.0/capplets/font/main.c.wiget    2003-10-28 22:56:03.000000000 +0100
++++ control-center-2.5.0/capplets/font/main.c  2003-11-14 12:15:59.479052850 +0100
+@@ -10,6 +10,7 @@
  #include <glade/glade.h>
  #include <stdarg.h>
+ #include <math.h>
 +#include <fontconfig/fontconfig.h>
  
  #ifdef HAVE_XFT2
  #include <gdk/gdkx.h>
-diff -urN control-center-2.1.0.1.orig/control-center/main.c control-center-2.1.0.1/control-center/main.c
---- control-center-2.1.0.1.orig/control-center/main.c  Mon Oct  7 00:57:43 2002
-+++ control-center-2.1.0.1/control-center/main.c       Mon Oct  7 00:58:10 2002
+--- control-center-2.5.0/control-center/main.c.wiget   2002-05-16 18:38:03.000000000 +0200
++++ control-center-2.5.0/control-center/main.c 2003-11-14 12:14:25.849339822 +0100
 @@ -32,6 +32,7 @@
  #include <X11/Xlib.h>
  #include <X11/Xatom.h>

diff --git a/control-center-locale-names.patch b/control-center-locale-names.patch
new file mode 100644 (file)
index 0000000..46a67f5
--- /dev/null
+++ b/control-center-locale-names.patch
@@ -0,0 +1,12 @@
+diff -urN control-center-2.5.4.orig/configure.in control-center-2.5.4/configure.in
+--- control-center-2.5.4.orig/configure.in     2004-03-11 10:16:46.582272424 +0100
++++ control-center-2.5.4/configure.in  2004-03-11 10:16:58.697430640 +0100
+@@ -32,7 +32,7 @@
+ changequote([,])dnl
+ 
+ # Internationalization support
+-ALL_LINGUAS="af am ar az be bg bn ca cs cy da de el en_CA en_GB es et fa fi fr ga gl he hi hr hu id is it ja ko lt lv mk ml mn ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tr uk vi wa zh_CN zh_TW"
++ALL_LINGUAS="af am ar az be bg bn ca cs cy da de el en_CA en_GB es et fa fi fr ga gl he hi hr hu id is it ja ko lt lv mk ml mn ms nb nl nn pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tr uk vi wa zh_CN zh_TW"
+ 
+ GETTEXT_PACKAGE=control-center-2.0
+ AC_SUBST(GETTEXT_PACKAGE)