From 44f598cb4617842427a43470ecce618104917d68 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Tue, 5 Jul 2022 12:26:05 +0200
Subject: [PATCH 1/4] Fix test for changed label in Products.CMFEditions

---
 plone/app/versioningbehavior/tests/test_functional.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plone/app/versioningbehavior/tests/test_functional.py b/plone/app/versioningbehavior/tests/test_functional.py
index 3c525b4..1fc8bdc 100644
--- a/plone/app/versioningbehavior/tests/test_functional.py
+++ b/plone/app/versioningbehavior/tests/test_functional.py
@@ -73,13 +73,13 @@ def _assert_versions_history_form(self, version_id, obj_id, title, text):
         self.browser.open(
             '%s/%s/versions_history_form?version_id=%s'
             % (self.portal_url, obj_id, version_id))
-        self.assertIn('Working Copy', self.browser.contents)
+        self.assertIn('Current revision', self.browser.contents)
 
         if version_id == 0:
             self.assertIn(
                 '/%s/versions_history_form?version_id=%s' % (obj_id, version_id),
                 self.browser.contents)
-        self.assertIn('Working Copy', self.browser.contents)
+        self.assertIn('Current revision', self.browser.contents)
         self.assertIn('Revert to this revision', self.browser.contents)
         self.assertIn(
             '/%s/@@history?one' % obj_id, self.browser.contents)

From 0e1c87767aff52822ae6c343cd5313ddaea8f95e Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Tue, 5 Jul 2022 12:26:54 +0200
Subject: [PATCH 2/4] changenote

---
 news/64.bugfix | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 news/64.bugfix

diff --git a/news/64.bugfix b/news/64.bugfix
new file mode 100644
index 0000000..46f72d9
--- /dev/null
+++ b/news/64.bugfix
@@ -0,0 +1,2 @@
+Fix test for changed label in `Products.CMFEditions`.
+[petschki]

From b5d0522355e946b004e5fc971a111dc5cbd115a8 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Tue, 5 Jul 2022 13:07:10 +0200
Subject: [PATCH 3/4] bump version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 81e048a..4fca49b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 import os
 
 
-version = '1.4.7.dev0'
+version = '2.0.0.dev0'
 
 tests_require = [
     'plone.app.testing',

From 8d5d97a1000d9e63c8df14c1a8984c2b701f01db Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Tue, 5 Jul 2022 13:07:32 +0200
Subject: [PATCH 4/4] remove deprecated buildout configs

---
 test-plone-4.1.x-dexterity-1.cfg | 39 --------------------------------
 test-plone-4.1.x-dexterity-2.cfg |  4 ----
 test-plone-5.cfg                 | 25 --------------------
 3 files changed, 68 deletions(-)
 delete mode 100644 test-plone-4.1.x-dexterity-1.cfg
 delete mode 100644 test-plone-4.1.x-dexterity-2.cfg
 delete mode 100644 test-plone-5.cfg

diff --git a/test-plone-4.1.x-dexterity-1.cfg b/test-plone-4.1.x-dexterity-1.cfg
deleted file mode 100644
index 50cc5b9..0000000
--- a/test-plone-4.1.x-dexterity-1.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-[buildout]
-extends =
-    http://dist.plone.org/release/4.1-latest/versions.cfg
-    http://good-py.appspot.com/release/dexterity/1.0-next
-find-links =
-    http://dist.plone.org/release/4.1-latest
-
-develop = .
-eggs =
-unzip = true
-versions = versions
-
-parts =
-    zc-recipe-egg
-    test
-
-package-name = plone.app.versioningbehavior
-
-
-# We include this here because collective.xmltestreport depends on zc.recipe.egg,
-# but doesn't list it in its setup.py
-# See http://plone.293351.n2.nabble.com/collective-xmltestreport-small-bug-td5185485.html
-[zc-recipe-egg]
-recipe = zc.recipe.egg
-eggs =
-
-# create xml reports for hudson
-[test]
-recipe = collective.xmltestreport
-eggs =
-    Plone
-    ${buildout:package-name} [tests]
-defaults = ['-s', '${buildout:package-name}', '--xml', '--exit-with-status', '--auto-color', '--auto-progress']
-
-
-[versions]
-plone.app.versioningbehavior =
-# collective.xmltestreport 1.2.3 is not working
-collective.xmltestreport = 1.2
\ No newline at end of file
diff --git a/test-plone-4.1.x-dexterity-2.cfg b/test-plone-4.1.x-dexterity-2.cfg
deleted file mode 100644
index 8fd82aa..0000000
--- a/test-plone-4.1.x-dexterity-2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildout]
-extends =
-    test-plone-4.1.x-dexterity-1.cfg
-    http://good-py.appspot.com/release/dexterity/2.0-next
\ No newline at end of file
diff --git a/test-plone-5.cfg b/test-plone-5.cfg
deleted file mode 100644
index 0a9e518..0000000
--- a/test-plone-5.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[buildout]
-extends =
-    http://dist.plone.org/release/5-latest/versions.cfg
-find-links =
-    http://dist.plone.org/release/5-latest
-
-develop = .
-eggs =
-unzip = true
-versions = versions
-
-parts = test
-package-name = plone.app.versioningbehavior
-
-
-[test]
-recipe = collective.xmltestreport
-eggs =
-    Plone
-    ${buildout:package-name} [tests]
-defaults = ['-s', '${buildout:package-name}', '--xml', '--exit-with-status', '--auto-color', '--auto-progress']
-
-
-[versions]
-plone.app.versioningbehavior =