rpms/control-center/devel control-center-2.13.4-fedora-apps.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 control-center.spec, 1.106, 1.107 sources, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27745

Modified Files:
	.cvsignore control-center.spec sources 
Added Files:
	control-center-2.13.4-fedora-apps.patch 
Log Message:
2.13.4


control-center-2.13.4-fedora-apps.patch:
 gnome-default-applications-properties-structs.c |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

--- NEW FILE control-center-2.13.4-fedora-apps.patch ---
--- control-center-2.13.4/capplets/default-applications/gnome-default-applications-properties-structs.c.fedora-apps	2006-01-05 00:34:32.000000000 -0500
+++ control-center-2.13.4/capplets/default-applications/gnome-default-applications-properties-structs.c	2006-01-05 00:38:17.000000000 -0500
@@ -9,12 +9,9 @@
 	{ N_("Debian Sensible Browser"),	"sensible-browser",	"sensible-browser %s", FALSE, FALSE },
         { N_("Epiphany"), 		"epiphany",	"epiphany %s",		FALSE, FALSE },
         { N_("Galeon"), 		"galeon",	"galeon %s",		FALSE, FALSE },
-        { N_("Encompass"), 		"encompass",	"encompass %s",		FALSE, FALSE },
-        { N_("Firebird"),       "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
         { N_("Firefox"),  	"firefox",	"firefox %s",	FALSE, FALSE },
-        { N_("Mozilla"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
         { N_("Mozilla"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
-        { N_("Netscape Communicator"), 	"netscape",	"netscape %s",		FALSE, FALSE },
+        { N_("Netscape"), 	"netscape",	"netscape %s",		FALSE, FALSE },
         { N_("Konqueror"), 		"konqueror",	"konqueror %s",		FALSE, FALSE },
 	{ N_("Opera"), 		"opera",	"opera %s",		FALSE, FALSE },
  	{ N_("Opera (open in new tab)"), 		"opera",	"opera -newpage %s",		FALSE, FALSE },
@@ -35,18 +32,13 @@
 	 * there is only one (the first entry in this list) Evolution entry 
 	 * in the list shown to the user
 	 */
-	{ N_("Evolution Mail Reader"),		"evolution-2.4",	"evolution-2.4 %s",	FALSE, FALSE, },
-	{ N_("Evolution Mail Reader"),		"evolution-2.2",	"evolution-2.2 %s",	FALSE, FALSE, },
-	{ N_("Evolution Mail Reader"),		"evolution-2.0",	"evolution-2.0 %s",	FALSE, FALSE, },
-	{ N_("Evolution Mail Reader"),		"evolution-1.6",	"evolution-1.6 %s",	FALSE, FALSE, },
-	{ N_("Evolution Mail Reader"),		"evolution-1.5",	"evolution-1.5 %s",	FALSE, FALSE, },
-        { N_("Evolution Mail Reader"),		"evolution-1.4",	"evolution-1.4 %s",	FALSE, FALSE, },
         { N_("Evolution Mail Reader"),		"evolution",		"evolution %s",		FALSE, FALSE, },
 	{ N_("Balsa"),        			"balsa",		"balsa -m %s",		FALSE, FALSE },
 	{ N_("KMail"),        			"kmail",		"kmail %s",		FALSE, FALSE },
-	{ N_("Thunderbird"), 			"thunderbird",		"thunderbird -mail %s", FALSE, FALSE},
-	{ N_("Thunderbird"), 			"mozilla-thunderbird",	"mozilla-thunderbird -mail %s", FALSE, FALSE},
+	{ N_("Thunderbird Mail"), 			"thunderbird",		"thunderbird -mail %s", FALSE, FALSE},
+        { N_("Sylpheed"),                       "sylpheed",             "sylpheed --compose %s", FALSE, FALSE },
 	{ N_("Mozilla Mail"), 			"mozilla",		"mozilla -mail %s",	FALSE, FALSE},
+        { N_("Opera Mail"),                     "opera",                "opera", FALSE, FALSE },
         { N_("Mutt") , 	  			"mutt",			"mutt %s",		TRUE,  FALSE },
 	{ N_("Sylpheed-Claws") ,                "sylpheed-claws",       "sylpheed-claws --compose %s",  FALSE,  FALSE }
 };
@@ -60,7 +52,9 @@
 static TerminalDescription possible_terminals[] = { 
         { N_("Debian Terminal Emulator"),	"x-terminal-emulator",	"-e", FALSE },
         { N_("GNOME Terminal"),		"gnome-terminal",	"-x", FALSE },
+        { N_("KDE Konsole"),            "konsole",              "-e", FALSE },
         { N_("Standard XTerminal"),	"xterm",		"-e", FALSE },
+        { N_("KTerm"),                  "kterm",                "-e", FALSE },
         { N_("NXterm"),			"nxterm",		"-e", FALSE },
         { N_("RXVT"),			"rxvt",			"-e", FALSE },
         { N_("aterm"),			"aterm",		"-e", FALSE },


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	14 Dec 2005 20:27:41 -0000	1.30
+++ .cvsignore	5 Jan 2006 06:24:34 -0000	1.31
@@ -3,3 +3,4 @@
 control-center-2.12.1.tar.bz2
 control-center-2.13.2.tar.bz2
 control-center-2.13.3.tar.bz2
+control-center-2.13.4.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- control-center.spec	20 Dec 2005 15:37:27 -0000	1.106
+++ control-center.spec	5 Jan 2006 06:24:34 -0000	1.107
@@ -20,14 +20,14 @@
 
 Summary: GNOME Control Center.
 Name: control-center
-Version: 2.13.3
-Release: 2
+Version: 2.13.4
+Release: 1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center-%{version}.tar.bz2
 
-Patch1: control-center-2.12.1-fedora-apps.patch
+Patch1: control-center-2.13.4-fedora-apps.patch
 Patch2: control-center-2.9.4-filesel.patch
 Patch3: control-center-2.10.1-mark-tool-buttons-important.patch
 Patch5: control-center-2.12.0-run-power-manager.patch
@@ -215,6 +215,9 @@
 # (also its headers)
 
 %changelog
+* Wed Jan  4 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.4-1
+- Update to 2.13.4
+
 * Tue Dec 20 2005 Ray Strode <rstrode at redhat.com> - 1:2.13.3-2
 - rebuild 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	14 Dec 2005 20:27:41 -0000	1.33
+++ sources	5 Jan 2006 06:24:34 -0000	1.34
@@ -1 +1 @@
-972f2e962a871c7bacdf6acf5e3a4999  control-center-2.13.3.tar.bz2
+4bd5ee29d4ae59439d7ba31dd77fbcaa  control-center-2.13.4.tar.bz2