2012-10-19 [paul] 3.8.1cvs102

	* AUTHORS
	* src/crash.c
	* src/gtk/authors.h
		fix bug 2760, 'display correct libc version in crash dialog
		when uclibc is used'.
		fixes build with uclibc. patch by Natanael Copa.

diff --git a/AUTHORS b/AUTHORS
index e98c131a3ae5b4b35696876fec37804790517efd..edffd3f8e16a73077d7d6eb53820cd6379fe5ed0 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,7 +2,6 @@ Claws Mail (http://www.claws-mail.org)
 
        Holger Berndt           <berndth@users.sf.net>
        Tristan Chabredier      <wwp@claws-mail.org>
-       Hoa viet Dinh           <dinh.viet.hoa@free.fr>
        Andrej Kacian           <andrej@kacian.sk> 
        Darko Koruga            <darko@users.sourceforge.net>
        Colin Leroy             <colin@colino.net>
@@ -11,6 +10,7 @@ Claws Mail (http://www.claws-mail.org)
        Salvatore De Paolis     <iwkse@claws-mail.org>
  
        Ex Team Members
+       Hoa viet Dinh           <dinh.viet.hoa@free.fr>
        Keith Edmunds           <keith@midnighthax.com> 
        Match Grun              <match@dimensional.com>
        Melvin Hadasht          <melvin.hadasht@free.fr>
@@ -290,3 +290,4 @@ contributors (in addition to the above; based on Changelog)
        Michael Shell
        Andreas Rönnquist
        Sean Buckheister
+       Natanael Copa

diff --git a/ChangeLog b/ChangeLog
index 8e90be6d5f3eaa76239954ff21e437ccd07d061a..d1310b8fe779cac742a4920dbc441bbc3bf74921 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-19 [paul]      3.8.1cvs102
+
+       * AUTHORS
+       * src/crash.c
+       * src/gtk/authors.h
+               fix bug 2760, 'display correct libc version in crash dialog 
+               when uclibc is used'.
+               fixes build with uclibc. patch by Natanael Copa.
+
 2012-10-18 [mones]     3.8.1cvs101
 
        * claws-mail.desktop

diff --git a/PATCHSETS b/PATCHSETS
index 6c05092533246884f10bdc9ba81ec5978cd076c4..74dd7ac8c41af919efc142c5e2f161830533b4d0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4476,3 +4476,4 @@
 ( cvs diff -u -r 1.4.2.44 -r 1.4.2.45 src/common/ssl_certificate.c;  ) > 3.8.1cvs99.patchset
 ( cvs diff -u -r 1.4.2.45 -r 1.4.2.46 src/common/ssl_certificate.c;  ) > 3.8.1cvs100.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 claws-mail.desktop;  ) > 3.8.1cvs101.patchset
+( cvs diff -u -r 1.100.2.84 -r 1.100.2.85 AUTHORS;  cvs diff -u -r 1.23.2.39 -r 1.23.2.40 src/crash.c;  cvs diff -u -r 1.1.2.80 -r 1.1.2.81 src/gtk/authors.h;  ) > 3.8.1cvs102.patchset

diff --git a/configure.ac b/configure.ac
index 482ec110b56479878a46c7bf13552ab9ac2a2af9..ff8b8e56447176af42fb2f42e8900b53c4fbf0db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=101
+EXTRA_VERSION=102
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/crash.c b/src/crash.c
index 8697ca510f05d81875f0076d8f84cbd6345f70cd..5f3eaa9924d5b401d66c107169b931443ce76f4a 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -42,7 +42,7 @@
 #      include <sys/utsname.h>
 #endif
 
-#if defined(__GNU_LIBRARY__)
+#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__)
 #      include <gnu/libc-version.h>
 #endif
 
@@ -443,7 +443,9 @@ static const gchar *get_compiled_in_features(void)
  */
 static const gchar *get_lib_version(void)
 {
-#if defined(__GNU_LIBRARY__)
+#if defined(__UCLIBC__)
+       return g_strdup_printf("uClibc %i.%i.%i", __UCLIBC_MAJOR__, __UCLIBC_MINOR__, __UCLIBC_SUBLEVEL__);
+#elif defined(__GNU_LIBRARY__)
        return g_strdup_printf("GNU libc %s", gnu_get_libc_version());
 #else
        return g_strdup(_("Unknown"));

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index d5fe3948d704a246418efe9513bac82fd7964f8a..5594f981629d71c64f5c05571136218df0da8d93 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -100,6 +100,7 @@ static char *CONTRIBS_LIST[] = {
 "Tsu-Fan Cheng",
 "Manrat Chobchuen",
 "Rich Coe",
+"Natanael Copa",
 "Jonathan Corbet",
 "Christian Cornelssen",
 "George Danchev",