[Pkg-gnupg-commit] r234 - in /gpa/trunk/debian: changelog patches/625513_fix_expiration_date.patch patches/series

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Sat Jun 23 14:20:05 2012
New Revision: 234

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=234
Log:
* debian/patches/625513_fix_expiration_date.patch: Added.
  - Fix bases for the month (closes: #625513).
* debian/patches/series: Adjusted.

Added:
    gpa/trunk/debian/patches/625513_fix_expiration_date.patch
Modified:
    gpa/trunk/debian/changelog
    gpa/trunk/debian/patches/series

Modified: gpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/changelog?rev=234&op=diff
==============================================================================
--- gpa/trunk/debian/changelog (original)
+++ gpa/trunk/debian/changelog Sat Jun 23 14:20:05 2012
@@ -15,6 +15,8 @@
     - Includes patch to fix #628305, #634930.
   * debian/patches/448765_grammar_fixes.patch: Added.
     - Fix grammar issues (closes: #448765).
+  * debian/patches/625513_fix_expiration_date.patch: Added.
+    - Fix bases for the month (closes: #625513).
   * debian/patches/series: Added.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 06 Dec 2009 13:26:07 +0100

Added: gpa/trunk/debian/patches/625513_fix_expiration_date.patch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/patches/625513_fix_expiration_date.patch?rev=234&op=file
==============================================================================
--- gpa/trunk/debian/patches/625513_fix_expiration_date.patch (added)
+++ gpa/trunk/debian/patches/625513_fix_expiration_date.patch Sat Jun 23 14:20:05 2012
@@ -1,0 +1,48 @@
+Author: Werner Koch <wk at gnupg.org>
+Reviewed-By: Daniel Leidert <daniel.leidert at wgdd.de>
+Origin: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpa.git;a=commitdiff;h=30752eb0
+Description: g_date and gtk_calendar use different bases for the month.
+ g_date uses 1..12 whereas gtk_calendar uses the Unix standard of 0..11.
+ * src/gpadatebutton.c (update_widgets): Fix month base.
+   (day_selected_cb): Ditto. Fixes Debian#625513.
+Bug-Debian: http://bugs.debian.org/625513
+Forwarded: not-needed
+
+--- a/src/gpadatebutton.c
++++ b/src/gpadatebutton.c
+@@ -52,7 +52,7 @@
+   GtkWidget *label;
+ 
+   guint current_year;
+-  guint current_month;
++  guint current_month;  /* 1..12 ! */
+   guint current_day;
+ 
+   int ignore_next_selection;
+@@ -80,15 +80,15 @@
+   if (!self->current_day && !self->current_month && !self->current_year)
+     *buf = 0;
+   else
+-    snprintf (buf, sizeof buf, "%04d-%02d-%02d", 
+-              self->current_year, self->current_month+1, self->current_day);
++    snprintf (buf, sizeof buf, "%04d-%02d-%02d",
++              self->current_year, self->current_month, self->current_day);
+   
+   gtk_label_set_text (GTK_LABEL (self->label), 
+                       *buf? buf : "(not set)");
+   if (self->calendar && *buf)
+     {
+       gtk_calendar_select_month (GTK_CALENDAR (self->calendar),
+-                                 self->current_month, self->current_year);
++                                 self->current_month-1, self->current_year);
+       gtk_calendar_select_day (GTK_CALENDAR (self->calendar),
+                                self->current_day);
+     }
+@@ -121,6 +121,7 @@
+                          &self->current_year,
+                          &self->current_month,
+                          &self->current_day);
++  self->current_month++;
+   update_widgets (self);
+ 
+   g_signal_emit_by_name (self, "date-set");

Modified: gpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/patches/series?rev=234&op=diff
==============================================================================
--- gpa/trunk/debian/patches/series (original)
+++ gpa/trunk/debian/patches/series Sat Jun 23 14:20:05 2012
@@ -1,2 +1,3 @@
+625513_fix_expiration_date.patch
 448765_grammar_fixes.patch
 628305_build_with_libassuan_v2.patch