From 6b61b4f0a59a50333f921325de87a1eb9d696995 Mon Sep 17 00:00:00 2001
From: EEA Jenkins <2368628+eea-jenkins@users.noreply.github.com>
Date: Thu, 11 Nov 2021 21:33:52 +0200
Subject: [PATCH 1/3] Back to devel

---
 docs/HISTORY.txt             | 3 +++
 eea/volto/policy/version.txt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 253617f..08e209e 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+1.6-dev0 - (unreleased)
+---------------------------
+
 1.5 - (2021-11-11)
 ---------------------------
 * Change: Removed z3c.jbot as dependency
diff --git a/eea/volto/policy/version.txt b/eea/volto/policy/version.txt
index c239c60..0b9d9ed 100644
--- a/eea/volto/policy/version.txt
+++ b/eea/volto/policy/version.txt
@@ -1 +1 @@
-1.5
+1.6-dev0

From 93f8dfeb6577ec01ac2dff6b46e7aa9cfa041db7 Mon Sep 17 00:00:00 2001
From: Alin Voinea <contact@avoinea.com>
Date: Mon, 22 Nov 2021 17:29:56 +0200
Subject: [PATCH 2/3] Make it work with Plone 6 / pip based installation

---
 docs/HISTORY.txt                | 4 +++-
 eea/volto/policy/configure.zcml | 2 --
 eea/volto/policy/version.txt    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 08e209e..439d004 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -1,8 +1,10 @@
 Changelog
 =========
 
-1.6-dev0 - (unreleased)
+1.6 - (2021-11-22)
 ---------------------------
+* Change: Drop includeDependencies="." in order to work with pip based installation
+  [avoinea refs #139557]
 
 1.5 - (2021-11-11)
 ---------------------------
diff --git a/eea/volto/policy/configure.zcml b/eea/volto/policy/configure.zcml
index 97bac1e..e39de30 100644
--- a/eea/volto/policy/configure.zcml
+++ b/eea/volto/policy/configure.zcml
@@ -9,8 +9,6 @@
   <include file="patches.zcml" />
   <include file="profiles.zcml" />
 
-  <includeDependencies package="." />
-
   <include package=".behaviors" />
   <include package=".vocabularies" />
   <include package=".upgrades" />
diff --git a/eea/volto/policy/version.txt b/eea/volto/policy/version.txt
index 0b9d9ed..810ee4e 100644
--- a/eea/volto/policy/version.txt
+++ b/eea/volto/policy/version.txt
@@ -1 +1 @@
-1.6-dev0
+1.6

From f7eee6a43401a37574b0dce14930c29990ad1152 Mon Sep 17 00:00:00 2001
From: Alin Voinea <contact@avoinea.com>
Date: Mon, 22 Nov 2021 17:47:44 +0200
Subject: [PATCH 3/3] Add missing ZCML dependency

---
 eea/volto/policy/configure.zcml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eea/volto/policy/configure.zcml b/eea/volto/policy/configure.zcml
index e39de30..8e5b093 100644
--- a/eea/volto/policy/configure.zcml
+++ b/eea/volto/policy/configure.zcml
@@ -6,6 +6,8 @@
 
   <i18n:registerTranslations directory="locales" />
 
+  <include package="plone.volto" />
+
   <include file="patches.zcml" />
   <include file="profiles.zcml" />