[Pkg-cli-libs-commits] r3983 - in /packages/evolution-sharp/trunk/debian: changelog patches/00list patches/add_missing_conditionals.dpatch

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

Author: hanska-guest
Date: Sat Feb  7 21:41:05 2009
New Revision: 3983

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3983
Log:
* debian/patches/:
  + add_missing_conditionals.dpatch added, was using things
    unconditionally though conditionally defined.
  + series: really apply ifdef_EDS_2_24_typo.dpatch

Added:
    packages/evolution-sharp/trunk/debian/patches/add_missing_conditionals.dpatch   (with props)
Modified:
    packages/evolution-sharp/trunk/debian/changelog
    packages/evolution-sharp/trunk/debian/patches/00list

Modified: packages/evolution-sharp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/changelog?rev=3983&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/changelog (original)
+++ packages/evolution-sharp/trunk/debian/changelog Sat Feb  7 21:41:05 2009
@@ -4,6 +4,10 @@
   * New upstream version
   * debian/copyright:
     + fixed typo in FSF address (Closes: #490261)
+  * debian/patches/:
+    + add_missing_conditionals.dpatch added, was using things
+      unconditionally though conditionally defined.
+    + series: really apply ifdef_EDS_2_24_typo.dpatch
 
   [ Christopher James Halse Rogers ]
   * debian/control:
@@ -28,7 +32,7 @@
   * debian/links:
     + Point evolution-sharp.pc to new evolution-sharp-5.0.pc
 
- -- David Paleino <d.paleino at gmail.com>  Sat, 07 Feb 2009 21:39:49 +0100
+ -- David Paleino <d.paleino at gmail.com>  Sat, 07 Feb 2009 22:38:20 +0100
 
 evolution-sharp (0.17.1-2) unstable; urgency=low
 

Modified: packages/evolution-sharp/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/patches/00list?rev=3983&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/patches/00list (original)
+++ packages/evolution-sharp/trunk/debian/patches/00list Sat Feb  7 21:41:05 2009
@@ -1,2 +1,4 @@
 evolution-sharp.pc
 fix-dllmappings
+ifdef_EDS_2_24_typo
+add_missing_conditionals

Added: packages/evolution-sharp/trunk/debian/patches/add_missing_conditionals.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/patches/add_missing_conditionals.dpatch?rev=3983&op=file
==============================================================================
--- packages/evolution-sharp/trunk/debian/patches/add_missing_conditionals.dpatch (added)
+++ packages/evolution-sharp/trunk/debian/patches/add_missing_conditionals.dpatch Sat Feb  7 21:41:05 2009
@@ -1,0 +1,69 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## add_missing_conditionals.patch.dpatch by David Paleino <d.paleino at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: CalComponent.RRules is defined only when compiling against evolution-data-server 2.24
+## DP: The same applies for Icaltimetype, used in CalRecurrence.cs
+
+ at DPATCH@
+diff -urNad evolution-sharp-0.19.1~/evolution/TestCal.cs evolution-sharp-0.19.1/evolution/TestCal.cs
+--- evolution-sharp-0.19.1~/evolution/TestCal.cs	2009-01-13 19:20:34.000000000 +0100
++++ evolution-sharp-0.19.1/evolution/TestCal.cs	2009-02-07 22:33:40.000000000 +0100
+@@ -60,6 +60,7 @@
+ 					Console.WriteLine ("language: \"{0}\"", att.language);
+ 					Console.WriteLine ("-----------");
+ 				}
++#if USE_EDS_2_24
+ 				if (comp.RRules == null) {
+ 					Console.WriteLine ("No recurrence data found");
+ 					return;
+@@ -84,7 +85,7 @@
+ 					Console.WriteLine ("--- Recurrence Data ends ---");
+ 					Console.WriteLine ("Recur string: \"{0}\"", recur.ToString());
+ 				}
+-
++#endif
+ 		}
+ 
+ 		
+diff -urNad evolution-sharp-0.19.1~/evolution/src/CalRecurrence.cs evolution-sharp-0.19.1/evolution/src/CalRecurrence.cs
+--- evolution-sharp-0.19.1~/evolution/src/CalRecurrence.cs	2009-01-13 19:20:34.000000000 +0100
++++ evolution-sharp-0.19.1/evolution/src/CalRecurrence.cs	2009-02-07 22:34:31.000000000 +0100
+@@ -54,8 +54,10 @@
+ 	[StructLayout(LayoutKind.Sequential)]
+ 	public class CalRecurrence {
+ 		public FrequencyType freq;
+-		
++
++#if USE_EDS_2_24
+ 		Icaltimetype until;
++#endif
+ 		public int count;
+ 		
+ 		public short interval;
+@@ -108,7 +110,9 @@
+ 			//week_start_day = -1;
+ 			interval = 1;
+ 			week_start_day = WeekDayType.NO_WEEKDAY;
++#if USE_EDS_2_24
+ 			until = new Icaltimetype ();
++#endif
+ 			bySecond = GetInitializedArray (61);
+ 			byMinute = GetInitializedArray (61);
+ 			byHour = GetInitializedArray (25);
+@@ -120,6 +124,7 @@
+ 			bySetPos = GetInitializedArray (367);
+ 		}
+ 
++#if USE_EDS_2_24
+ 		public DateTime Until 
+ 		{
+ 			get
+@@ -131,6 +136,7 @@
+ 				until.SetDateTime = value;
+ 			}
+ 		}
++#endif
+ 		
+ 		public static CalRecurrence Zero = new CalRecurrence ();
+ 

Propchange: packages/evolution-sharp/trunk/debian/patches/add_missing_conditionals.dpatch
------------------------------------------------------------------------------
    svn:executable = *