Fix uninstall-profile to fix test-issues.

CHANGES.rst

@@ -13,7 +13,13 @@ New:
 
 Fixes:
 
-- Enhancement: Split up migration test for modification date and references 
+- Also remove collections upon uninstalling.
+  [pbauer]
+
+- No longer try to install ATContentTypes-types on uninstalling.
+  [pbauer]
+
+- Enhancement: Split up migration test for modification date and references
   in two functions for easier debugging.
   [jensens]
 

plone/app/contenttypes/profiles/uninstall/types.xml

@@ -9,23 +9,6 @@
  <object meta_type="Dexterity FTI" name="Image" remove="True" />
  <object meta_type="Dexterity FTI" name="News Item" remove="True" />
  <object meta_type="Dexterity FTI" name="Event" remove="True" />
-
- <object name="Document"
-    meta_type="Factory-based Type Information with dynamic views"/>
- <object name="Event"
-    meta_type="Factory-based Type Information with dynamic views"/>
- <object name="File"
-    meta_type="Factory-based Type Information with dynamic views"/>
- <object name="Folder"
-    meta_type="Factory-based Type Information with dynamic views"/>
- <object name="Image"
-    meta_type="Factory-based Type Information with dynamic views"/>
- <object name="Link"
-    meta_type="Factory-based Type Information with dynamic views"/>
- <object name="News Item"
-    meta_type="Factory-based Type Information with dynamic views"/>
-
- <object name="Plone Site"
-    meta_type="Factory-based Type Information with dynamic views"/>
+ <object meta_type="Dexterity FTI" name="Collection" remove="True" />
 
 </object>