Hi Jonathan and Adam, On Mon, 2017-06-26 at 14:04 +0100, Jonathan Wiltshire wrote:... .... The patch alone is not enough to decide this; please prepare a source debdiff (i.e. between the .dsc files) of your proposed upload relative to stretch. The upload target should be 'stretch', not 'stable'. Please find attached the debdiff. --Cheers, Abou Al Montacir |
diff -Nru fpc-3.0.0+dfsg/debian/changelog fpc-3.0.0+dfsg/debian/changelog --- fpc-3.0.0+dfsg/debian/changelog 2017-02-08 10:53:35.000000000 +0100 +++ fpc-3.0.0+dfsg/debian/changelog 2017-06-10 19:13:48.000000000 +0200 @@ -1,3 +1,10 @@ +fpc (3.0.0+dfsg-11+deb9u1) stretch; urgency=medium + + * Fix "[fp-units-rtl-3.0.0] Incorrect conversion from local time to + UTC". Backported fix from 3.0.2 (Closes: #864148) + + -- Abou Al Montacir <abou.almontacir@sfr.fr> Sat, 10 Jun 2017 19:13:48 +0200 + fpc (3.0.0+dfsg-11) unstable; urgency=medium * Team upload diff -Nru fpc-3.0.0+dfsg/debian/patches/Correct-for-different-meaning-of-TZOffset.patch fpc-3.0.0+dfsg/debian/patches/Correct-for-different-meaning-of-TZOffset.patch --- fpc-3.0.0+dfsg/debian/patches/Correct-for-different-meaning-of-TZOffset.patch 1970-01-01 01:00:00.000000000 +0100 +++ fpc-3.0.0+dfsg/debian/patches/Correct-for-different-meaning-of-TZOffset.patch 2017-06-10 19:13:48.000000000 +0200 @@ -0,0 +1,35 @@ +From 731f6175a3870c396a7ddaae774ea8a859b4512b Mon Sep 17 00:00:00 2001 +From: michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2> +Date: Fri, 21 Aug 2015 10:36:30 +0000 +Subject: [PATCH] * Correct for different meaning of TZOffset + +git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@31356 3ad0048d-3df7-0310-abae-a5850022a9f2 +--- + packages/rtl-objpas/src/inc/dateutil.inc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fpcsrc/packages/rtl-objpas/src/inc/dateutil.inc b/fpcsrc/packages/rtl-objpas/src/inc/dateutil.inc +index c90c83deff..fc7f87a13e 100644 +--- a/fpcsrc/packages/rtl-objpas/src/inc/dateutil.inc ++++ b/fpcsrc/packages/rtl-objpas/src/inc/dateutil.inc +@@ -2532,7 +2532,7 @@ end; + function UniversalTimeToLocal(UT: TDateTime): TDateTime; + + begin +- Result:=UniversalTimeToLocal(UT,GetLocalTimeOffset); ++ Result:=UniversalTimeToLocal(UT,-GetLocalTimeOffset); + end; + + function UniversalTimeToLocal(UT: TDateTime; TZOffset : Integer): TDateTime; +@@ -2549,7 +2549,7 @@ end; + Function LocalTimeToUniversal(LT: TDateTime): TDateTime; + + begin +- Result:=LocalTimeToUniversal(LT,GetLocalTimeOffset); ++ Result:=LocalTimeToUniversal(LT,-GetLocalTimeOffset); + end; + + Function LocalTimeToUniversal(LT: TDateTime;TZOffset: Integer): TDateTime; +-- +2.11.0 + diff -Nru fpc-3.0.0+dfsg/debian/patches/series fpc-3.0.0+dfsg/debian/patches/series --- fpc-3.0.0+dfsg/debian/patches/series 2017-02-06 20:26:00.000000000 +0100 +++ fpc-3.0.0+dfsg/debian/patches/series 2017-06-10 19:13:48.000000000 +0200 @@ -39,3 +39,4 @@ ppdep-fix-else-handling.patch fix-spelling-errors_more.patch armhf-fix-vstr-vld-offset.patch +Correct-for-different-meaning-of-TZOffset.patch
Attachment:
signature.asc
Description: This is a digitally signed message part