Skip to content

Commit 7352766

Browse files
committed
Bug#36725056: DEB: Incorrect dependency on client plugins package
1 parent 371021d commit 7352766

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packaging/deb-in/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,14 @@ IF (DEB_PRODUCT STREQUAL "commercial")
9696
SET (DEB_LICENSENAME "Commercial")
9797
SET (DEB_VERSION "+commercial-1")
9898
SET (DEB_SERVERPRODUCT "commercial")
99+
SET (JDBC_RECOMMENDS_AND_SUGGESTS "Recommends: mysql-commercial-client-plugins")
99100
ELSE()
100101
SET (DEB_COPYRIGHT_UPSTREAMNAME "MySQL ${MYSQL_BASE_VERSION}")
101102
SET (DEB_PRODUCTNAME "")
102103
SET (DEB_LICENSENAME "GPL")
103104
SET (DEB_VERSION "-1")
104105
SET (DEB_SERVERPRODUCT "community")
106+
SET (JDBC_RECOMMENDS_AND_SUGGESTS "Suggests: mysql-community-client-plugins")
105107
ENDIF()
106108

107109
# All files are configured and copied to the debian/ directory, which is used

packaging/deb-in/control.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Pre-Depends: ${misc:Pre-Depends}
1313
Multi-Arch: same
1414
Provides: libmysqlcppconn8-2 (= ${binary:Version})
1515
Depends: ${shlibs:Depends}, ${misc:Depends},
16-
mysql-@DEB_SERVERPRODUCT@-client-plugins,
1716
Description: MySQL database connector for C++
1817
A C++ interface for communicating with MySQL servers.
1918

@@ -23,8 +22,7 @@ Section: libs
2322
Pre-Depends: ${misc:Pre-Depends}
2423
Multi-Arch: same
2524
Depends: ${shlibs:Depends}, ${misc:Depends}
26-
Breaks: libmysqlcppconn9v5
27-
ReplaceS: libmysqlcppconn9v5
25+
@JDBC_RECOMMENDS_AND_SUGGESTS@
2826
Description: MySQL Driver for C++ which mimics the JDBC 4.0 API
2927
This MySQL Driver for C++ mimics the JDBC 4.0 API.
3028

0 commit comments

Comments
 (0)