From 61bd5763d13fae808db7ba59635a5b41f1f9fe31 Mon Sep 17 00:00:00 2001
From: "Jens W. Klein" <jk@kleinundpartner.at>
Date: Thu, 21 Jan 2016 17:59:49 +0100
Subject: [PATCH 1/2] update to latest pytz 2015.7 and DateTime 4.01 while
 using the fixed branch of dexterity

---
 sources.cfg  | 2 +-
 versions.cfg | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sources.cfg b/sources.cfg
index 2629425b10..b2c9d59f8b 100644
--- a/sources.cfg
+++ b/sources.cfg
@@ -94,7 +94,7 @@ plone.browserlayer                  = git ${remotes:plone}/plone.browserlayer.gi
 plone.cachepurging                  = git ${remotes:plone}/plone.cachepurging.git pushurl=${remotes:plone_push}/plone.cachepurging.git branch=master
 plone.caching                       = git ${remotes:plone}/plone.caching.git pushurl=${remotes:plone_push}/plone.caching.git branch=master
 plone.contentrules                  = git ${remotes:plone}/plone.contentrules.git pushurl=${remotes:plone_push}/plone.contentrules.git branch=master
-plone.dexterity                     = git ${remotes:plone}/plone.dexterity.git pushurl=${remotes:plone_push}/plone.dexterity.git branch=master
+plone.dexterity                     = git ${remotes:plone}/plone.dexterity.git pushurl=${remotes:plone_push}/plone.dexterity.git branch=fix-latest-DateTime-and-pytz
 plone.directives.form               = git ${remotes:plone}/plone.directives.form.git pushurl=${remotes:plone_push}/plone.directives.form.git branch=master
 plone.directives.tiles              = git ${remotes:plone}/plone.directives.tiles.git pushurl=${remotes:plone_push}/plone.directives.tiles.git branch=master
 plone.event                         = git ${remotes:plone}/plone.event.git pushurl=${remotes:plone_push}/plone.event.git branch=master
diff --git a/versions.cfg b/versions.cfg
index c66af83573..57924a7c37 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -10,7 +10,7 @@ AccessControl = 3.0.12
 ExtensionClass = 4.1.2
 Acquisition = 4.2.2
 # More memory efficient version, Trac #13101
-DateTime = 3.0.3
+DateTime = 4.0.1
 Products.BTreeFolder2 = 2.14.0
 # Override until ztk is updated
 Sphinx = 1.3.4
@@ -19,7 +19,7 @@ zope.pagetemplate = 3.6.3
 # Support for more complex catalog queries
 Products.ZCatalog = 3.0.2
 # Several tests rely on an old-style pytz release:
-pytz = 2013b
+pytz = 2015.7
 
 
 # Build tools

From 9822681b4a429a7f43d747d66bf9f697293ac3fa Mon Sep 17 00:00:00 2001
From: Johannes Raggam <thetetet@gmail.com>
Date: Thu, 21 Jan 2016 20:49:31 +0100
Subject: [PATCH 2/2] plone.dexterity branch already merged

---
 sources.cfg  | 2 +-
 versions.cfg | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sources.cfg b/sources.cfg
index b2c9d59f8b..2629425b10 100644
--- a/sources.cfg
+++ b/sources.cfg
@@ -94,7 +94,7 @@ plone.browserlayer                  = git ${remotes:plone}/plone.browserlayer.gi
 plone.cachepurging                  = git ${remotes:plone}/plone.cachepurging.git pushurl=${remotes:plone_push}/plone.cachepurging.git branch=master
 plone.caching                       = git ${remotes:plone}/plone.caching.git pushurl=${remotes:plone_push}/plone.caching.git branch=master
 plone.contentrules                  = git ${remotes:plone}/plone.contentrules.git pushurl=${remotes:plone_push}/plone.contentrules.git branch=master
-plone.dexterity                     = git ${remotes:plone}/plone.dexterity.git pushurl=${remotes:plone_push}/plone.dexterity.git branch=fix-latest-DateTime-and-pytz
+plone.dexterity                     = git ${remotes:plone}/plone.dexterity.git pushurl=${remotes:plone_push}/plone.dexterity.git branch=master
 plone.directives.form               = git ${remotes:plone}/plone.directives.form.git pushurl=${remotes:plone_push}/plone.directives.form.git branch=master
 plone.directives.tiles              = git ${remotes:plone}/plone.directives.tiles.git pushurl=${remotes:plone_push}/plone.directives.tiles.git branch=master
 plone.event                         = git ${remotes:plone}/plone.event.git pushurl=${remotes:plone_push}/plone.event.git branch=master
diff --git a/versions.cfg b/versions.cfg
index 57924a7c37..dc65d1d5d3 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -11,6 +11,7 @@ ExtensionClass = 4.1.2
 Acquisition = 4.2.2
 # More memory efficient version, Trac #13101
 DateTime = 4.0.1
+pytz = 2015.7
 Products.BTreeFolder2 = 2.14.0
 # Override until ztk is updated
 Sphinx = 1.3.4
@@ -18,8 +19,6 @@ Sphinx = 1.3.4
 zope.pagetemplate = 3.6.3
 # Support for more complex catalog queries
 Products.ZCatalog = 3.0.2
-# Several tests rely on an old-style pytz release:
-pytz = 2015.7
 
 
 # Build tools