Skip to content

Commit f7707e1

Browse files
committed
Removing conflict clauses with wsdd from binary packages
1 parent af7d364 commit f7707e1

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1818
- Better user defaults to align with conventions on known platforms
1919

2020
### Changed
21+
- Binary packages no longer declare conflict with `wsdd` (#23)
2122
- Updated 3rd party dependencies
2223
- Made log messages more uniform and informative.
2324
- Replaced single WSDDN_PREFER_SYSTEM CMake setting with per-dependency WSDDN_PREFER_SYSTEM_<UPPERCASE_DEP_NAME> ones

installers/deb/build.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ def calc_sizes():
9999
Architecture: {ARCH}
100100
Installed-Size: {total_size}
101101
Depends: {{shlibs_Depends}}
102-
Conflicts: wsdd
103-
Replaces: wsdd
104102
Maintainer: Eugene Gershnik <gershnik@hotmail.com>
105103
Homepage: https://github.com/gershnik/wsdd-native
106104
Description: WS-Discovery Host Daemon

installers/freebsd/build.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
version: "{VERSION}"
7979
arch: {ARCH}
8080
origin: sysutils/wsddn
81-
conflict: py*-wsdd-*
8281
maintainer: Eugene Gershnik <gershnik@hotmail.com>
8382
www: https://github.com/gershnik/wsdd-native
8483
comment: WS-Discovery Host Daemon

0 commit comments

Comments
 (0)