Update debian packaging to work in 10.3

* Rename all files to use 10.3 in the filename * Adjust rules to delete extra lines from control file * Adjust control file to have correct Replaces/Breaks list for each package * Add libcurl3-dev as build dependency for mariadb server in debian
MariaDB · Apr 5, 2017 · 75b8fe4 · 75b8fe4
1 parent 3d004de
commit 75b8fe4
Show file tree

Hide file tree

Showing 53 changed files with 593 additions and 551 deletions.
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
@@ -24,8 +24,8 @@ then
   sed -i -e '/Add support for verbose builds/,+2d' debian/rules
 
   # Don't include test suite package on Travis-CI to make the build time shorter
-  sed '/Package: mariadb-test-data/,+26d' -i debian/control
-  sed '/Package: mariadb-test/,+34d' -i debian/control
+  sed '/Package: mariadb-test-data/,+28d' -i debian/control
+  sed '/Package: mariadb-test/,+36d' -i debian/control
 fi
 
 
@@ -67,9 +67,9 @@ then
   sed 's/ --with systemd//' -i debian/rules
   sed '/systemd/d' -i debian/rules
   sed '/\.service/d' -i debian/rules
-  sed '/galera_new_cluster/d' -i debian/mariadb-server-10.2.install
-  sed '/galera_recovery/d' -i debian/mariadb-server-10.2.install
-  sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.2.install
+  sed '/galera_new_cluster/d' -i debian/mariadb-server-10.3.install
+  sed '/galera_recovery/d' -i debian/mariadb-server-10.3.install
+  sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.3.install
 fi
 
 # Convert gcc version to numberical value. Format is Mmmpp where M is Major

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+mariadb-10.3 (10.3.0) unstable; urgency=low
+
+  * Initial release.
+
+ -- Vicențiu Ciorbaru <vicentiu@mariadb.org>  Wed, 5 Apr 2017 21:18:02 +0200
+
 mariadb-10.2 (10.2.0) unstable; urgency=low
 
   * Initial release.

diff --git a/debian/control b/debian/control
@@ -1,4 +1,4 @@
-Source: mariadb-10.2
+Source: mariadb-10.3
 Section: database
 Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
@@ -16,6 +16,7 @@ Build-Depends: bison,
                libjemalloc-dev (>= 3.0.0~) [linux-any],
                libjudy-dev,
                libkrb5-dev,
+               libcurl3-dev,
                libncurses5-dev (>= 5.0-6~),
                libnuma-dev,
                libpam0g-dev,
@@ -171,7 +172,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
  This package includes files needed by all versions of the client library
  (e.g. /etc/mysql/conf.d/mariadb.cnf).
 
-Package: mariadb-client-core-10.2
+Package: mariadb-client-core-10.3
 Architecture: any
 Depends: libmariadb3 (>= ${source:Version}),
          mariadb-common (>= ${source:Version}),
@@ -191,8 +192,8 @@ Conflicts: mariadb-client-10.0,
            mariadb-client-core-5.5,
            mysql-client (<< 5.0.51),
            mysql-client-5.0,
-           mysql-client-5.1 (<< ${source:Version}),
-           mysql-client-5.5 (<< ${source:Version}),
+           mysql-client-5.1,
+           mysql-client-5.5,
            mysql-client-core-5.1,
            mysql-client-core-5.5,
            mysql-client-core-5.6,
@@ -234,11 +235,11 @@ Description: MariaDB database core client binaries
  .
  This package includes the core client files, as used by Akonadi.
 
-Package: mariadb-client-10.2
+Package: mariadb-client-10.3
 Architecture: any
 Depends: debianutils (>=1.6),
          libmariadb3 (>= ${source:Version}),
-         mariadb-client-core-10.2 (>= ${source:Version}),
+         mariadb-client-core-10.3 (>= ${source:Version}),
          mariadb-common,
          ${misc:Depends},
          ${perl:Depends},
@@ -289,7 +290,7 @@ Description: MariaDB database client binaries
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
-Package: mariadb-server-core-10.2
+Package: mariadb-server-core-10.3
 Architecture: any
 Depends: libmariadb3 (>= ${binary:Version}),
          mariadb-common (>= ${source:Version}),
@@ -310,14 +311,17 @@ Conflicts: mariadb-server-core-10.0,
            virtual-mysql-server-core
 Breaks: mariadb-client-10.0,
         mariadb-client-10.1,
-        mariadb-client-10.2 (<< ${source:Version}),
-        mariadb-server-10.2 (<< ${source:Version})
+        mariadb-client-10.2,
+        mariadb-client-10.3 (<< ${source:Version}),
+        mariadb-server-10.3 (<< ${source:Version})
 Replaces: mariadb-client-10.0,
           mariadb-client-10.1,
-          mariadb-client-10.2 (<< ${source:Version}),
-          mariadb-server-10.2 (<< ${source:Version}),
+          mariadb-client-10.2,
+          mariadb-client-10.3 (<< ${source:Version}),
+          mariadb-server-10.3 (<< ${source:Version}),
           mariadb-server-core-10.0,
           mariadb-server-core-10.1,
+          mariadb-server-core-10.2,
           mariadb-server-core-5.1,
           mariadb-server-core-5.2,
           mariadb-server-core-5.3,
@@ -344,7 +348,7 @@ Description: MariaDB database core server files
  .
  This package includes the core server files, as used by Akonadi.
 
-Package: mariadb-server-10.2
+Package: mariadb-server-10.3
 Architecture: any
 Suggests: mailx, mariadb-test, netcat-openbsd, tinyca
 Recommends: libhtml-template-perl
@@ -358,8 +362,8 @@ Depends: bsdutils,
          libdbi-perl,
          lsb-base (>= 3.0-10),
          lsof,
-         mariadb-client-10.2 (>= ${source:Version}),
-         mariadb-server-core-10.2 (>= ${binary:Version}),
+         mariadb-client-10.3 (>= ${source:Version}),
+         mariadb-server-core-10.3 (>= ${binary:Version}),
          passwd,
          perl (>= 5.6),
          psmisc,
@@ -370,12 +374,14 @@ Depends: bsdutils,
 Conflicts: mariadb-server (<< ${source:Version}),
            mariadb-server-10.0,
            mariadb-server-10.1,
+           mariadb-server-10.2,
            mariadb-server-5.1,
            mariadb-server-5.2,
            mariadb-server-5.3,
            mariadb-server-5.5,
            mariadb-tokudb-engine-10.0,
            mariadb-tokudb-engine-10.1,
+           mariadb-tokudb-engine-10.2,
            mariadb-tokudb-engine-5.5,
            mysql-server (<< ${source:Version}),
            mysql-server-4.1,
@@ -390,12 +396,14 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mariadb-server (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
+          mariadb-server-10.2,
           mariadb-server-5.1,
           mariadb-server-5.2,
           mariadb-server-5.3,
           mariadb-server-5.5,
           mariadb-tokudb-engine-10.0,
           mariadb-tokudb-engine-10.1,
+          mariadb-tokudb-engine-10.2,
           mariadb-tokudb-engine-5.5,
           mysql-server (<< ${source:Version}),
           mysql-server-4.1,
@@ -416,10 +424,10 @@ Description: MariaDB database server binaries
 
 Package: mariadb-server
 Architecture: all
-Depends: mariadb-server-10.2 (>= ${source:Version}), ${misc:Depends}
+Depends: mariadb-server-10.3 (>= ${source:Version}), ${misc:Depends}
 Description: MariaDB database server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-server (currently mariadb-server-10.2), as determined by the MariaDB
+ mariadb-server (currently mariadb-server-10.3), as determined by the MariaDB
  maintainers. Install this package if in doubt about which MariaDB
  version you need. That will install the version recommended by the
  package maintainers.
@@ -431,22 +439,26 @@ Description: MariaDB database server (metapackage depending on the latest versio
 
 Package: mariadb-client
 Architecture: all
-Depends: mariadb-client-10.2 (>= ${source:Version}), ${misc:Depends}
+Depends: mariadb-client-10.3 (>= ${source:Version}), ${misc:Depends}
 Description: MariaDB database client (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-client (currently mariadb-client-10.2), as determined by the MariaDB
+ mariadb-client (currently mariadb-client-10.3), as determined by the MariaDB
  maintainers.  Install this package if in doubt about which MariaDB version
  you want, as this is the one considered to be in the best shape.
 
 Package: mariadb-plugin-connect
 Architecture: any
 Depends: libxml2,
-         mariadb-server-10.2,
+         mariadb-server-10.3,
          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
+Breaks: mariadb-connect-engine-10.1,
+        mariadb-connect-engine-10.2,
+        mariadb-connect-engine-10.3
+Replaces: mariadb-connect-engine-10.1,
+          mariadb-connect-engine-10.2,
+          mariadb-connect-engine-10.3
 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
@@ -463,23 +475,29 @@ Description: RocksDB storage engine for MariaDB
 
 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
+Depends: libjudydebian1, mariadb-server-10.3, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-oqgraph-engine-10.1,
+        mariadb-oqgraph-engine-10.2,
+        mariadb-oqgraph-engine-10.3
+Replaces: mariadb-oqgraph-engine-10.1,
+          mariadb-oqgraph-engine-10.2,
+          mariadb-oqgraph-engine-10.3
 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-plugin-tokudb
 Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-server-10.3, ${misc:Depends}, ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
-        mariadb-server-10.2 (<< ${source:Version})
+        mariadb-server-10.2,
+        mariadb-server-10.3 (<< ${source:Version})
 Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
-          mariadb-server-10.2 (<< ${source:Version})
+          mariadb-server-10.2,
+          mariadb-server-10.3 (<< ${source:Version})
 Description: TokuDB storage engine for MariaDB
  The TokuDB storage engine is for use in high-performance and write-intensive
  environments, offering increased compression and better performance based
@@ -488,27 +506,31 @@ Description: TokuDB storage engine for MariaDB
 
 Package: mariadb-plugin-mroonga
 Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-server-10.3, ${misc:Depends}, ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
-        mariadb-server-10.2 (<< ${source:Version})
+        mariadb-server-10.2,
+        mariadb-server-10.3 (<< ${source:Version})
 Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
-          mariadb-server-10.2 (<< ${source:Version})
+          mariadb-server-10.2,
+          mariadb-server-10.3 (<< ${source:Version})
 Description: Mroonga storage engine for MariaDB
  Mroonga (formerly named Groonga Storage Engine) is a storage engine that
  provides fast CJK-ready full text searching using column store.
  This package contains the Mroonga plugin for MariaDB.
 
 Package: mariadb-plugin-spider
 Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-server-10.3, ${misc:Depends}, ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
-        mariadb-server-10.2 (<< ${source:Version})
+        mariadb-server-10.2,
+        mariadb-server-10.3 (<< ${source:Version})
 Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
-          mariadb-server-10.2 (<< ${source:Version})
+          mariadb-server-10.2,
+          mariadb-server-10.3 (<< ${source:Version})
 Description: Spider storage engine for MariaDB
  The Spider storage engine with built-in sharding features. It supports
  partitioning and xa transactions, and allows tables of different MariaDB
@@ -517,13 +539,15 @@ Description: Spider storage engine for MariaDB
 
 Package: mariadb-plugin-cassandra
 Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-server-10.3, ${misc:Depends}, ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
-        mariadb-server-10.2 (<< ${source:Version})
+        mariadb-server-10.2,
+        mariadb-server-10.3 (<< ${source:Version})
 Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
-          mariadb-server-10.2 (<< ${source:Version})
+          mariadb-server-10.2,
+          mariadb-server-10.3 (<< ${source:Version})
 Description: Cassandra storage engine for MariaDB
  The Cassandra Storage Engine allows access to data in a Cassandra cluster from
  MariaDB, combining the best of SQL and no-SQL worlds. Cassandra SE (storage
@@ -535,27 +559,35 @@ Description: Cassandra storage engine for MariaDB
 Package: mariadb-plugin-gssapi-server
 Architecture: any
 Depends: libgssapi-krb5-2,
-         mariadb-server-10.2,
+         mariadb-server-10.3,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
-Replaces: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
+Breaks: mariadb-gssapi-server-10.1,
+        mariadb-gssapi-server-10.2,
+        mariadb-gssapi-server-10.3
+Replaces: mariadb-gssapi-server-10.1,
+          mariadb-gssapi-server-10.2,
+          mariadb-gssapi-server-10.3
 Description: GSSAPI authentication plugin for MariaDB server
 
 Package: mariadb-plugin-gssapi-client
 Architecture: any
 Depends: libgssapi-krb5-2,
-         mariadb-client-10.2,
+         mariadb-client-10.3,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
-Replaces: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
+Breaks: mariadb-gssapi-client-10.1,
+        mariadb-gssapi-client-10.2,
+        mariadb-gssapi-client-10.3
+Replaces: mariadb-gssapi-client-10.1,
+          mariadb-gssapi-client-10.2,
+          mariadb-gssapi-client-10.3
 Description: GSSAPI authentication plugin for MariaDB client
 
 Package: mariadb-plugin-cracklib-password-check
 Architecture: any
 Depends: libcrack2 (>= 2.9.0),
-         mariadb-server-10.2,
+         mariadb-server-10.3,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: CrackLib Password Validation Plugin for MariaDB
@@ -564,14 +596,15 @@ Description: CrackLib Password Validation Plugin for MariaDB
 
 Package: mariadb-test
 Architecture: any
-Depends: mariadb-client-10.2 (= ${binary:Version}),
-         mariadb-server-10.2 (= ${binary:Version}),
+Depends: mariadb-client-10.3 (= ${binary:Version}),
+         mariadb-server-10.3 (= ${binary:Version}),
          mariadb-test-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-5.5,
         mariadb-test-10.0,
         mariadb-test-10.1,
+        mariadb-test-10.2,
         mariadb-test-5.5,
         mysql-testsuite,
         mysql-testsuite-5.5,
@@ -581,6 +614,7 @@ Breaks: mariadb-server-5.5,
 Replaces: mariadb-server-5.5,
           mariadb-test-10.0,
           mariadb-test-10.1,
+          mariadb-test-10.2,
           mariadb-test-5.5,
           mysql-testsuite,
           mysql-testsuite-5.5,
@@ -602,6 +636,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Breaks: mariadb-test-10.0,
         mariadb-test-10.1,
+        mariadb-test-10.2,
         mariadb-test-5.5,
         mariadb-test-data-10.0,
         mysql-testsuite,
@@ -610,6 +645,7 @@ Breaks: mariadb-test-10.0,
         mysql-testsuite-5.7
 Replaces: mariadb-test-10.0,
           mariadb-test-10.1,
+          mariadb-test-10.2,
           mariadb-test-5.5,
           mariadb-test-data-10.0,
           mysql-testsuite,

diff --git a/debian/mariadb-client-10.2.README.Debian → debian/mariadb-client-10.3.README.Debian b/debian/mariadb-client-10.2.README.Debian → debian/mariadb-client-10.3.README.Debian
diff --git a/debian/mariadb-client-10.2.docs → debian/mariadb-client-10.3.docs b/debian/mariadb-client-10.2.docs → debian/mariadb-client-10.3.docs
diff --git a/debian/mariadb-client-10.2.install → debian/mariadb-client-10.3.install b/debian/mariadb-client-10.2.install → debian/mariadb-client-10.3.install
diff --git a/debian/mariadb-client-10.2.links → debian/mariadb-client-10.3.links b/debian/mariadb-client-10.2.links → debian/mariadb-client-10.3.links
diff --git a/debian/mariadb-client-10.2.manpages → debian/mariadb-client-10.3.manpages b/debian/mariadb-client-10.2.manpages → debian/mariadb-client-10.3.manpages
diff --git a/debian/mariadb-client-10.2.menu → debian/mariadb-client-10.3.menu b/debian/mariadb-client-10.2.menu → debian/mariadb-client-10.3.menu
@@ -1,3 +1,3 @@
 # According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
-?package(mariadb-client-10.2):needs="text" section="Applications/Data Management"\
+?package(mariadb-client-10.3):needs="text" section="Applications/Data Management"\
   title="Innotop" command="/usr/bin/innotop"
diff --git a/debian/mariadb-client-core-10.2.install → debian/mariadb-client-core-10.3.install b/debian/mariadb-client-core-10.2.install → debian/mariadb-client-core-10.3.install
diff --git a/debian/mariadb-client-core-10.2.manpages → debian/mariadb-client-core-10.3.manpages b/debian/mariadb-client-core-10.2.manpages → debian/mariadb-client-core-10.3.manpages
diff --git a/debian/mariadb-plugin-tokudb.install b/debian/mariadb-plugin-tokudb.install
@@ -1,4 +1,4 @@
 etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
 usr/bin/tokuftdump
 usr/lib/mysql/plugin/ha_tokudb.so
-usr/share/doc/mariadb-server-10.2/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
+usr/share/doc/mariadb-server-10.3/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
diff --git a/debian/mariadb-server-10.2.README.Debian → debian/mariadb-server-10.3.README.Debian b/debian/mariadb-server-10.2.README.Debian → debian/mariadb-server-10.3.README.Debian
diff --git a/debian/mariadb-server-10.2.config → debian/mariadb-server-10.3.config b/debian/mariadb-server-10.2.config → debian/mariadb-server-10.3.config
diff --git a/debian/mariadb-server-10.2.dirs → debian/mariadb-server-10.3.dirs b/debian/mariadb-server-10.2.dirs → debian/mariadb-server-10.3.dirs