packaging/debian/CMakeLists.txt

 - Set 'NOT_PRODUCT_SUFFIX' to be able to conflict between
   community and commercial package installs

packaging/debian/control.in
 - Added "Conflicts:" between community and commercial package installs
 - Changed "Depends:" to use mysql-connector-odbc@PRODUCT_SUFFIX@
 - Corrected placement of @PRODUCT_SUFFIX@

Author: kboortz

packaging/debian/CMakeLists.txt

@@ -59,9 +59,11 @@ option(COMMUNITY_BUILD "Set to true if this is a community build" ON)
 
 if(NOT COMMUNITY_BUILD)
   set(PRODUCT_SUFFIX "-commercial")
+  set(NOT_PRODUCT_SUFFIX "")
   set(VERSION "${CONNECTOR_VERSION}+commercial-${DEBIAN_REVISION}")
 else()
   set(PRODUCT_SUFFIX "")
+  set(NOT_PRODUCT_SUFFIX "-commercial")
   set(VERSION "${CONNECTOR_VERSION}-${DEBIAN_REVISION}")
 endif()
 

packaging/debian/control.in

@@ -17,6 +17,7 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: libodbc1 | libiodbc2
+Conflicts: mysql-connector-odbc@NOT_PRODUCT_SUFFIX@
 Breaks: libiodbc2 (<< 3.52.7-2~),
         odbcinst1debian2 (<< 2.2.14p2-3),
         unixodbc (<< 2.2.14p2-3)
@@ -26,25 +27,27 @@ Description: MySQL ODBC driver
  understood by a variety of database tools that cannot talk to MySQL
  databases directly.
 
-Package: mysql-connector-odbc-test@PRODUCT_SUFFIX@
+Package: mysql-connector-odbc@PRODUCT_SUFFIX@-test
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: mysql-connector-odbc (= ${binary:Version}),
+Depends: mysql-connector-odbc@PRODUCT_SUFFIX@ (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: mysql-connector-odbc@NOT_PRODUCT_SUFFIX@-test
 Description: MySQL ODBC driver test files
  This package installs a tool "dltest" and some executables to
  test the MySQL ODBC driver.
 
-Package: mysql-connector-odbc-setup@PRODUCT_SUFFIX@
+Package: mysql-connector-odbc@PRODUCT_SUFFIX@-setup
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: libgtk2.0-0 (>= 2.20.1),
-         mysql-connector-odbc (= ${binary:Version}),
+         mysql-connector-odbc@PRODUCT_SUFFIX@ (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: mysql-connector-odbc@NOT_PRODUCT_SUFFIX@-setup
 Description: MySQL ODBC driver setup GUI
  This package allows you use a graphical interface to specify
  This package is the setup library for the MySQL ODBC package, it