Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Resolve file conflict with Breaks/Conflicts. #21

Merged
merged 2 commits into from
Feb 19, 2020
Merged

Resolve file conflict with Breaks/Conflicts. #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9b075b
Resolve file conflict with Breaks/Conflicts.
dobey Feb 19, 2020
98e1701
Use Conflicts/Replaces instead of Breaks/Conflicts.
dobey Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,14 @@ Build-Depends: cmake,
qtdeclarative5-qtquick2-plugin,
qtdeclarative5-test-plugin,
Standards-Version: 3.9.4
Homepage: https://launchpad.net/unity-api
# If you aren't a member of ~unity-team but need to upload
# packaging changes, just go ahead. ~unity-team will notice
# and sync up the code again.
Vcs-Bzr: lp:unity-api
Vcs-Browser: https://code.launchpad.net/unity-api
Homepage: https://github.com/ubports/unity-api

Package: libunity-api1
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends},
Conflicts: libunity-api0
Replaces: libunity-api0
Depends: ${misc:Depends},
${shlibs:Depends},
Description: API for Unity shell integration
Expand Down