diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2014-02-19 23:08:01 -0800 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2014-02-19 23:08:01 -0800 |
| commit | 34209fcd38101b76ea5d96ee9354a7e84e8262d7 (patch) | |
| tree | d6fe3eda57e8df4be123a3c7ad86e20f29c5558e /debian | |
| parent | d56c20b2f88a3a504bf9841054f49def7f20dee8 (diff) | |
Add Conflicts: libunity-core-6.0-8 to facilitate smooth upgrades.
(bzr r3669.1.1)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 38e2c619b..b48027c3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +unity (7.1.2+14.04.20140218.1-0ubuntu2) UNRELEASED; urgency=medium + + * Add Conflicts: libunity-core-6.0-8 to facilitate smooth upgrades. + + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 19 Feb 2014 23:07:39 -0800 + unity (7.1.2+14.04.20140218.1-0ubuntu1) trusty; urgency=low [ Marco Trevisan (Treviño) ] diff --git a/debian/control b/debian/control index 114863fe5..0aee2df07 100644 --- a/debian/control +++ b/debian/control @@ -129,8 +129,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, unity-services (= ${binary:Version}), -Conflicts: unity-common, libunity-core-6.0-6, libunity-core-6.0-7 -Replaces: unity-common, libunity-core-6.0-6, libunity-core-6.0-7 +Conflicts: unity-common, libunity-core-6.0-6, libunity-core-6.0-7, libunity-core-6.0-8 +Replaces: unity-common, libunity-core-6.0-6, libunity-core-6.0-7, libunity-core-6.0-8 Provides: unity-common, unity-common-7.0 Description: Core library for the Unity interface. Unity is a desktop experience that sings. Designed by Canonical and the Ayatana |