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

raof-guest at users.alioth.debian.org raof-guest at users.alioth.debian.org
Thu Feb 19 03:55:06 UTC 2009


Author: raof-guest
Date: Thu Feb 19 03:55:06 2009
New Revision: 4009

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4009
Log:
Remove ifdef_EDS_2_24_typo patch; fixed upstream.
Update add_missing_conditionals for new upstream version

Modified:
    packages/evolution-sharp/trunk/debian/changelog
    packages/evolution-sharp/trunk/debian/patches/00list
    packages/evolution-sharp/trunk/debian/patches/add_missing_conditionals.dpatch

Modified: packages/evolution-sharp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/changelog?rev=4009&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/changelog (original)
+++ packages/evolution-sharp/trunk/debian/changelog Thu Feb 19 03:55:06 2009
@@ -1,15 +1,14 @@
-evolution-sharp (0.19.1-1) UNRELEASED; urgency=low
+evolution-sharp (0.19.2.1-1) UNRELEASED; urgency=low
 
   [ David Paleino ]
   * 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.
-    + evolution-sharp.pc.dpatch, fix-dllmappings.dpatch,
-      ifdef_EDS_2_24_typo.dpatch: descriptions added.
-    + series: really apply ifdef_EDS_2_24_typo.dpatch
+   + add_missing_conditionals.dpatch added, was using things
+     unconditionally though conditionally defined.
+  + evolution-sharp.pc.dpatch, fix-dllmappings.dpatch:
+      descriptions added.
   * debian/control:
     + Standards-Version bumped to 3.8.0:
       - debian/README.source added

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=4009&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/patches/00list (original)
+++ packages/evolution-sharp/trunk/debian/patches/00list Thu Feb 19 03:55:06 2009
@@ -1,4 +1,3 @@
 evolution-sharp.pc
 fix-dllmappings
-ifdef_EDS_2_24_typo
 add_missing_conditionals

Modified: 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=4009&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/patches/add_missing_conditionals.dpatch (original)
+++ packages/evolution-sharp/trunk/debian/patches/add_missing_conditionals.dpatch Thu Feb 19 03:55:06 2009
@@ -6,9 +6,9 @@
 ## DP: The same applies for Icaltimetype, used in CalRecurrence.cs
 
 @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
+diff -urNad evolution-sharp-0.19.2.1~/evolution/TestCal.cs evolution-sharp-0.19.2.1/evolution/TestCal.cs
+--- evolution-sharp-0.19.2.1~/evolution/TestCal.cs	2009-02-18 07:01:36.000000000 +1100
++++ evolution-sharp-0.19.2.1/evolution/TestCal.cs	2009-02-19 13:34:04.155745675 +1100
 @@ -60,6 +60,7 @@
  					Console.WriteLine ("language: \"{0}\"", att.language);
  					Console.WriteLine ("-----------");
@@ -26,40 +26,47 @@
  		}
  
  		
-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;
--		
-+
+diff -urNad evolution-sharp-0.19.2.1~/evolution/src/CalRecurrence.cs evolution-sharp-0.19.2.1/evolution/src/CalRecurrence.cs
+--- evolution-sharp-0.19.2.1~/evolution/src/CalRecurrence.cs	2009-02-18 07:01:36.000000000 +1100
++++ evolution-sharp-0.19.2.1/evolution/src/CalRecurrence.cs	2009-02-19 13:35:36.664265193 +1100
+@@ -17,7 +17,7 @@
+ 		//
+ 		// Please do not change the order/values of the items.
+ 		//
+-
++		
+ 		SECONDLY=0,
+ 		MINUTELY=1,
+ 		HOURLY=2,
+@@ -58,7 +58,9 @@
+ 
+ 		public FrequencyType Frequency;
+ 		
 +#if USE_EDS_2_24
  		Icaltimetype until;
 +#endif
- 		public int count;
+ 		public int Count;
  		
- 		public short interval;
-@@ -108,7 +110,9 @@
+ 		public short Interval;
+@@ -111,7 +113,9 @@
  			//week_start_day = -1;
- 			interval = 1;
- 			week_start_day = WeekDayType.NO_WEEKDAY;
+ 			Interval = 1;
+ 			WeekStartDay = 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);
+ 			BySecond = GetInitializedArray (61);
+ 			ByMinute = GetInitializedArray (61);
+ 			ByHour = GetInitializedArray (25);
+@@ -123,6 +127,7 @@
+ 			BySetPos = GetInitializedArray (367);
  		}
  
 +#if USE_EDS_2_24
  		public DateTime Until 
  		{
  			get
-@@ -131,6 +136,7 @@
+@@ -134,6 +139,7 @@
  				until.SetDateTime = value;
  			}
  		}




More information about the Pkg-cli-libs-commits mailing list