[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Freeze exception request for twitux



I would like to upload an update for twitux. The upload would close
#499690 and #483903.

The diffstat to the current version is

 README.source                                 |   57 ++++++++++++++++++++++++++
 changelog                                     |   10 ++++
 control                                       |    4 -
 patches/series                                |    1 
 patches/twitux-locale-lc_time-parser-fix.diff |   42 +++++++++++++++++++

The README.source file is just a copy of quilt's, added to comply with
the new policy requirements. Excluding that, the following is the actual
patch:

(Please cc: me on replies)

--------------------------------------------------------------------------------
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..8646078
diff --git a/debian/changelog b/debian/changelog
index 01323b2..669fc85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+twitux (0.61-3) unstable; urgency=low
+
+  * Add Hiroshi Miura's patch to fix date parsing in non-C locales.
+    (Closes: #499690).
+  * Add dbus-x11 dependency (Closes: #483903).
+  * Bump standards-version to 3.8.0
+    - Copy quilt's README.source documenting the patch system.
+
+ -- Luis Rodrigo Gallardo Cruz <rodrigo@debian.org>  Tue, 07 Oct 2008 14:27:26 -0700
+
 twitux (0.61-2) unstable; urgency=low
 
   * Add Dependency on gnome-keyring (Closes: #474779).
diff --git a/debian/control b/debian/control
index d4cb789..c10d9d3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,12 @@ Build-Depends: debhelper (>= 5), autotools-dev, libsexy-dev,
  libsoup2.4-dev, libnotify-dev, libxml-parser-perl, quilt,
  libglade2-dev, iso-codes, libaspell-dev,
  libgnome-keyring-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://live.gnome.org/DanielMorales/Twitux
 
 Package: twitux
 Architecture: any
-Depends: gnome-keyring, ${shlibs:Depends}, ${misc:Depends}
+Depends: gnome-keyring, dbus-x11, ${shlibs:Depends}, ${misc:Depends}
 Description: a Twitter client for GNOME
  twitux is a lightweight client for the twitter messaging service,
  featuring timeline auto updating, a tray area icon and notification
diff --git a/debian/patches/series b/debian/patches/series
index ced095b..68cc7f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+twitux-locale-lc_time-parser-fix.diff
 fix-desktop-file
diff --git a/debian/patches/twitux-locale-lc_time-parser-fix.diff b/debian/patches/twitux-locale-lc_time-parser-fix.diff
new file mode 100644
index 0000000..0be21df
--- /dev/null
+++ b/debian/patches/twitux-locale-lc_time-parser-fix.diff
@@ -0,0 +1,42 @@
+From: "Hiroshi Miura" <miurahr@acm.org>
+
+twitux can not parse when run on the other locale than C/POSIX.
+Attached patch modify to setlocale LC_TIME before parsing date field of
+message as C and to bring it back after parsing.
+Version 0.62 fixes this problem, which prepares locale independent
+function strtotime().
+A idea to create yet-another function is not better than control locale
+proper way.
+
+Closes: #499690
+
+Index: twitux/src/twitux-parser.c
+===================================================================
+--- twitux.orig/src/twitux-parser.c
++++ twitux/src/twitux-parser.c
+@@ -413,19 +413,22 @@
+ 	int			 seconds_local;
+ 	int			 seconds_post;
+ 	int 		 diff;
++	char		*oldenv;
+ 	time_t		 t = time(NULL);
+ 
+ 	tzset ();
+ 	ta = gmtime (&t);
+ 	ta->tm_isdst = -1;
+ 	seconds_local = mktime (ta);
+-
++	
++	oldenv=setlocale(LC_TIME, "C");
+ 	strptime (datetime, "%a %b %d %T +0000 %Y", &post);
+ 	post.tm_isdst = -1;
+ 	seconds_post =  mktime (&post);
++	setlocale(LC_TIME, oldenv);
+ 
+-	diff = seconds_local-seconds_post;
+-
++	diff = difftime (seconds_local, seconds_post);
++	
+ 	if (diff < 0) {
+ 		return g_strdup (_("1 second ago"));
+ 	}
--------------------------------------------------------------------------------


Reply to: