From e58e7b50529d236bb50d808412d1ffef80f2da5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= <otto@mariadb.org>
Date: Sun, 9 Oct 2016 14:42:17 +0300
Subject: [PATCH] MDEV-6284: Rename plugin packages to match new Debian
 convention

---
 debian/control                                | 32 +++++++++----------
 ...install => mariadb-plugin-connect.install} |  0
 ...db-plugin-cracklib-password-check.install} |  0
 ...l => mariadb-plugin-gssapi-client.install} |  0
 ...l => mariadb-plugin-gssapi-server.install} |  0
 ...install => mariadb-plugin-oqgraph.install} |  0
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename debian/{mariadb-connect-engine-10.2.install => mariadb-plugin-connect.install} (100%)
 rename debian/{mariadb-cracklib-password-check-10.2.install => mariadb-plugin-cracklib-password-check.install} (100%)
 rename debian/{mariadb-gssapi-client-10.2.install => mariadb-plugin-gssapi-client.install} (100%)
 rename debian/{mariadb-gssapi-server-10.2.install => mariadb-plugin-gssapi-server.install} (100%)
 rename debian/{mariadb-oqgraph-engine-10.2.install => mariadb-plugin-oqgraph.install} (100%)

diff --git a/debian/control b/debian/control
index ef195a1ad4f..14374182fe3 100644
--- a/debian/control
+++ b/debian/control
@@ -437,43 +437,43 @@ Description: MariaDB database regression test suite - data files
  .
  This package has the architecture independent data files for the test suite.
 
-Package: mariadb-connect-engine-10.2
+Package: mariadb-plugin-connect
 Architecture: any
 Depends: libxml2,
          mariadb-server-10.2,
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: mariadb-connect-engine-10.1, mariadb-connect-engine-10.2
+Replaces: mariadb-connect-engine-10.1, mariadb-connect-engine-10.2
 Description: Connect storage engine for MariaDB
  Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
  connections to ODBC tables and remote MySQL tables, as well as a number of
  other interesting features.
  This package contains the Connect plugin for MariaDB.
 
-Package: mariadb-oqgraph-engine-10.2
+Package: mariadb-plugin-oqgraph
 Architecture: any
 Depends: libjudydebian1, mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-oqgraph-engine-10.1, mariadb-oqgraph-engine-10.2
+Replaces: mariadb-oqgraph-engine-10.1, mariadb-oqgraph-engine-10.2
 Description: OQGraph storage engine for MariaDB
  The OQGraph engine is a computation engine plugin for handling hierarchies
  (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
  This package contains the OQGraph plugin for MariaDB.
 
-Package: mariadb-gssapi-server-10.2
+Package: mariadb-plugin-gssapi-server
+Section: database
 Architecture: any
-Depends: libgssapi-krb5-2,
-         mariadb-server-10.2,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: mariadb-gssapi-server-10.1
-Replaces: mariadb-gssapi-server-10.1
+Depends: libgssapi-krb5-2, mariadb-server-10.2
+Breaks: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
+Replaces: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
 Description: GSSAPI authentication plugin for MariaDB server
 
-Package: mariadb-gssapi-client-10.2
+Package: mariadb-plugin-gssapi-client
+Section: database
 Architecture: any
-Depends: libgssapi-krb5-2,
-         mariadb-client-10.2,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: mariadb-gssapi-client-10.1
-Replaces: mariadb-gssapi-client-10.1
+Depends: libgssapi-krb5-2, mariadb-client-10.2
+Breaks: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
+Replaces: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
 Description: GSSAPI authentication plugin for MariaDB client
diff --git a/debian/mariadb-connect-engine-10.2.install b/debian/mariadb-plugin-connect.install
similarity index 100%
rename from debian/mariadb-connect-engine-10.2.install
rename to debian/mariadb-plugin-connect.install
diff --git a/debian/mariadb-cracklib-password-check-10.2.install b/debian/mariadb-plugin-cracklib-password-check.install
similarity index 100%
rename from debian/mariadb-cracklib-password-check-10.2.install
rename to debian/mariadb-plugin-cracklib-password-check.install
diff --git a/debian/mariadb-gssapi-client-10.2.install b/debian/mariadb-plugin-gssapi-client.install
similarity index 100%
rename from debian/mariadb-gssapi-client-10.2.install
rename to debian/mariadb-plugin-gssapi-client.install
diff --git a/debian/mariadb-gssapi-server-10.2.install b/debian/mariadb-plugin-gssapi-server.install
similarity index 100%
rename from debian/mariadb-gssapi-server-10.2.install
rename to debian/mariadb-plugin-gssapi-server.install
diff --git a/debian/mariadb-oqgraph-engine-10.2.install b/debian/mariadb-plugin-oqgraph.install
similarity index 100%
rename from debian/mariadb-oqgraph-engine-10.2.install
rename to debian/mariadb-plugin-oqgraph.install