diff -Nru manila-ui-2.16.0/debian/changelog manila-ui-2.16.0/debian/changelog --- manila-ui-2.16.0/debian/changelog 2018-08-10 17:25:33.000000000 +0000 +++ manila-ui-2.16.0/debian/changelog 2018-08-30 19:22:28.000000000 +0000 @@ -1,3 +1,9 @@ +manila-ui (2.16.0-0ubuntu2) cosmic; urgency=medium + + * d/control: Drop python(3)-manila-ui conflicts on each other. + + -- Corey Bryant Thu, 30 Aug 2018 15:22:28 -0400 + manila-ui (2.16.0-0ubuntu1) cosmic; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru manila-ui-2.16.0/debian/control manila-ui-2.16.0/debian/control --- manila-ui-2.16.0/debian/control 2018-08-10 17:25:33.000000000 +0000 +++ manila-ui-2.16.0/debian/control 2018-08-30 19:22:28.000000000 +0000 @@ -86,8 +86,6 @@ python-six (>= 1.10.0), ${misc:Depends}, ${python:Depends}, -Conflicts: - python3-manila-ui, Description: OpenStack shared file system as a service - Python 2.7 Dashboard plugin Manila is an OpenStack project to provide Shared Filesystems as a service. It provides coordinated access to shared or distributed file systems. While @@ -116,8 +114,6 @@ python3-six (>= 1.10.0), ${misc:Depends}, ${python3:Depends}, -Conflicts: - python-manila-ui, Description: OpenStack shared file system as a service - Python 3.x Dashboard plugin Manila is an OpenStack project to provide Shared Filesystems as a service. It provides coordinated access to shared or distributed file systems. While