rev 6200 - in kde-extras/taskjuggler: tags tags/2.3.1-4/debian tags/2.3.1-4/debian/patches trunk/debian trunk/debian/patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-05-15 16:38:59 +0000 (Tue, 15 May 2007)
New Revision: 6200

Added:
   kde-extras/taskjuggler/tags/2.3.1-4/
   kde-extras/taskjuggler/tags/2.3.1-4/debian/patches/13_glibc2.5_tzset.diff
   kde-extras/taskjuggler/trunk/debian/patches/13_glibc2.5_tzset.diff
Modified:
   kde-extras/taskjuggler/tags/2.3.1-4/debian/changelog
   kde-extras/taskjuggler/trunk/debian/changelog
Log:
tags taskjuggler-2.3.1-4. fixes FTBFS #422400

Copied: kde-extras/taskjuggler/tags/2.3.1-4 (from rev 6167, kde-extras/taskjuggler/trunk)

Modified: kde-extras/taskjuggler/tags/2.3.1-4/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog	2007-05-13 23:44:06 UTC (rev 6167)
+++ kde-extras/taskjuggler/tags/2.3.1-4/debian/changelog	2007-05-15 16:38:59 UTC (rev 6200)
@@ -1,8 +1,10 @@
-taskjuggler (2.3.1-4) UNRELEASED; urgency=low
+taskjuggler (2.3.1-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Add workaround for new behaviour of tzset function in glibc 2.5.
+    Thanks to Pierre Habouzit, Aurelien Jarno and Chris Schlaeger.
+    (Closes: #422400)
 
- -- Mark Purcell <msp at debian.org>  Thu, 29 Mar 2007 22:49:52 +0100
+ -- Fathi Boudra <fboudra at free.fr>  Tue, 15 May 2007 18:14:06 +0200
 
 taskjuggler (2.3.1-3) unstable; urgency=low
 

Added: kde-extras/taskjuggler/tags/2.3.1-4/debian/patches/13_glibc2.5_tzset.diff
===================================================================
--- kde-extras/taskjuggler/tags/2.3.1-4/debian/patches/13_glibc2.5_tzset.diff	                        (rev 0)
+++ kde-extras/taskjuggler/tags/2.3.1-4/debian/patches/13_glibc2.5_tzset.diff	2007-05-15 16:38:59 UTC (rev 6200)
@@ -0,0 +1,25 @@
+diff -Nur taskjuggler-2.3.1/taskjuggler/Utility.cpp taskjuggler-2.3.1.new/taskjuggler/Utility.cpp
+--- taskjuggler-2.3.1/taskjuggler/Utility.cpp	2007-01-31 20:21:32.000000000 +0100
++++ taskjuggler-2.3.1.new/taskjuggler/Utility.cpp	2007-05-15 18:10:22.000000000 +0200
+@@ -164,14 +164,16 @@
+         qFatal("Ran out of space in environment section while "
+                "setting timezone.");
+ 
+-    /* To valide the tZone value we call tzset(). It will convert the zone
++    /* To validate the tZone value we call tzset(). It will convert the zone
+      * into a three-letter acronym in case the tZone value is good. If not, it
+-     * will just copy the wrong value to tzname[0]. So, we need to validate
+-     * tZone names that are already 3 letter acronyms first. timezone2tz can
+-     * do this for us. */
++     * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back
++     * to UTC. */
+     tzset();
+-    if (timezone2tz(tZone) == 0 && strcmp(tZone, tzname[0]) == 0)
++    if (timezone2tz(tZone) == 0 &&
++        (strcmp(tzname[0], tZone) == 0 ||
++         (strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0)))
+     {
++        qDebug("1: %s, 2: %s", tzname[0], tzname[1]);
+         UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone);
+         return false;
+     }

Modified: kde-extras/taskjuggler/trunk/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog	2007-05-15 15:00:20 UTC (rev 6199)
+++ kde-extras/taskjuggler/trunk/debian/changelog	2007-05-15 16:38:59 UTC (rev 6200)
@@ -1,8 +1,10 @@
-taskjuggler (2.3.1-4) UNRELEASED; urgency=low
+taskjuggler (2.3.1-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Add workaround for new behaviour of tzset function in glibc 2.5.
+    Thanks to Pierre Habouzit, Aurelien Jarno and Chris Schlaeger.
+    (Closes: #422400)
 
- -- Mark Purcell <msp at debian.org>  Thu, 29 Mar 2007 22:49:52 +0100
+ -- Fathi Boudra <fboudra at free.fr>  Tue, 15 May 2007 18:14:06 +0200
 
 taskjuggler (2.3.1-3) unstable; urgency=low
 

Added: kde-extras/taskjuggler/trunk/debian/patches/13_glibc2.5_tzset.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/13_glibc2.5_tzset.diff	                        (rev 0)
+++ kde-extras/taskjuggler/trunk/debian/patches/13_glibc2.5_tzset.diff	2007-05-15 16:38:59 UTC (rev 6200)
@@ -0,0 +1,25 @@
+diff -Nur taskjuggler-2.3.1/taskjuggler/Utility.cpp taskjuggler-2.3.1.new/taskjuggler/Utility.cpp
+--- taskjuggler-2.3.1/taskjuggler/Utility.cpp	2007-01-31 20:21:32.000000000 +0100
++++ taskjuggler-2.3.1.new/taskjuggler/Utility.cpp	2007-05-15 18:10:22.000000000 +0200
+@@ -164,14 +164,16 @@
+         qFatal("Ran out of space in environment section while "
+                "setting timezone.");
+ 
+-    /* To valide the tZone value we call tzset(). It will convert the zone
++    /* To validate the tZone value we call tzset(). It will convert the zone
+      * into a three-letter acronym in case the tZone value is good. If not, it
+-     * will just copy the wrong value to tzname[0]. So, we need to validate
+-     * tZone names that are already 3 letter acronyms first. timezone2tz can
+-     * do this for us. */
++     * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back
++     * to UTC. */
+     tzset();
+-    if (timezone2tz(tZone) == 0 && strcmp(tZone, tzname[0]) == 0)
++    if (timezone2tz(tZone) == 0 &&
++        (strcmp(tzname[0], tZone) == 0 ||
++         (strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0)))
+     {
++        qDebug("1: %s, 2: %s", tzname[0], tzname[1]);
+         UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone);
+         return false;
+     }