Commit graph

46 commits

Author SHA1 Message Date
Otto Kekäläinen
1965f03c80 Deb: Rename libmariadbclient-dev to libmariadb-dev
This change was accidentally omitted from commit 2bcc16c17b
2016-11-27 22:25:17 +01:00
Otto Kekäläinen
b5b68b6bb8 MDEV-10126: replace deprecated iproute dependency with iproute2
Fall back to old iproute on Debian Wheezy and Ubuntu Precise that
don't have iproute2 available.
2016-11-26 22:25:40 +01:00
Otto Kekäläinen
e06e455eea Deb: make server core package breaks/replaces earlier client packages
This is required, as the innochecksum binary has moved package.
Without this change the following error would be emitted:

  Unpacking mariadb-server-core-10.2 (10.2.3+maria~jessie) over (10.2.2+maria-1~jessie) ...
  dpkg: error processing archive /var/cache/apt/archives/mariadb-server-core-10.2_10.2.3+maria~jessie_amd64.deb (--unpack):
    trying to overwrite '/usr/bin/innochecksum', which is also in package mariadb-client-10.2 10.2.2+maria-1~jessie
2016-11-25 08:50:58 +01:00
Otto Kekäläinen
d49cffa124 Deb: provide the libmysqlclient shim packages that exist in Debian/Ubuntu
This way all 3rd party apps configured to build against any MySQL or
MariaDB version will pick up the libmariadb3-dev package instead.
2016-11-20 10:51:39 +02:00
Otto Kekäläinen
2bcc16c17b Deb: rename client library packages to reflect its contents
The new library name libmariadb3 matches the libmariadb.so.3 filename.
Packages that want to build against MariaDB Connector C have as
build-dependency libmariadb-dev and as run-time dependency libmariadb3.

Make the package provide libmariadbclient18 for backwards compatibility,
though compatibility is not always assured. There library did change
to a whole new generation after all, even though ABI compatibility has
been a design goal.

Also do the equivalent change for the -dev package. Packages that
explicitly want to use the MariaDB Connector C should mark it as
their build-depends.

Also provide an empty libmariadbclient18 metapackage to facilitate
upgrades from old MariaDB installs, just like there is an empty
libmysqlclient18 package. Create more of these in the future as needed.
2016-11-20 10:49:12 +02:00
Otto Kekäläinen
54bd67a4ed Deb: provide the default-mysql-* packages that exist in Debian/Ubuntu
Since Debian 9 (Stretch) and Ubuntu 16.10 (Yakkety) the following
packages have existed:
* virtual-mysql-client
* virtual-mysql-client-core
* virtual-mysql-server
* virtual-mysql-server-core
* virtual-libmysqlclient-dev

They are metapackages that in Debian depend on MariaDB and in
Ubuntu currently on MySQL. We need to provide them and point
them to MariaDB so that systems that have the mariadb.org
repositories enabled automatically get everything MariaDB
and not MySQL.

This change makes the packaging provide the four first ones,
and later commits will fix the client library issues.
2016-11-20 10:49:12 +02:00
Otto Kekäläinen
45049864b4 Deb: install libmysqld.so and libmysqld.so.19 in correct packages
The versioned so-file belongs to the run-time package and the unversioned
symlink shall be in the development package.
2016-11-18 22:12:50 +02:00
Daniel Black
7072ca1f58 MDEV-5725: mysqld embedded libraries into libmariadbd19 Deb package
libmariadbd19 was intended to be added as the package that
included the libmysqld shared library. This was missing
from the debian control file.

The libmariadbd-dev package requires libmariadbd19 to provide
the shared library.

The shared libraries for embedded mysql will go into the libmariadbd18
package rather than the libmariadbd-dev development package.

/usr/bin/mariadb_config is a executable that assists embedded developers
to use the correctly correct header and library files during their
development.

Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
2016-11-17 12:37:21 +02:00
Otto Kekäläinen
f2219c8d3f Deb: add gdb as a build dependency for stack traces on test suite failures
If mysqld crashed during the test suite run and gdb is available,
a stack trace will be printed automatically.
2016-11-10 18:26:46 +02:00
Otto Kekäläinen
c912d05fab MDEV-6284: Install systemd files (almost) the Debian way
The control file contents must be correct from the start and cannot
be modified at build time by CMake. Also all static Debian package
analyzers will fail to see all manipulations by CMake later on.

It is best to do all manipulations like these in autobake-deb.sh.
2016-10-29 03:50:11 +03:00
Otto Kekäläinen
7f570bef1e Deb: fix commit 1369696 and change autobake strategy to Debian Sid first 2016-10-27 18:42:17 +03:00
Otto Kekäläinen
affa6e3d6d MDEV-6284: Break/replace MySQL 5.7 packages to allow upgrade
Also sort control file slightly to be easier to compare to downstream
control file and include gdb for automatic backtraces if the test suite
fails.

Delete duplicate man page installation.

Make mariadb-test breaks/replaces mariadb-server-5.5
as /usr/lib/mysql/plugin/adt_null.so changed package.
2016-10-27 18:42:17 +03:00
Otto Kekäläinen
8c32d95920 MDEV-6284: Activate quilt patches again: test table expection needed
Buildbot tries to create database 'test' so we need to have these
Debian-only exceptions enabled and patch our own source at build time.
2016-10-27 18:42:17 +03:00
Otto Kekäläinen
235db2c77b MDEV-6284: wrap-and-sort 2016-10-27 18:42:16 +03:00
Otto Kekäläinen
b2dffcbfea MDEV-6284: Fix issues detected by Lintian 2016-10-27 18:42:16 +03:00
Otto Kekäläinen
1877a8cdb4 MDEV-6284: Remove CMakeLists.txt hack that mangled the server install file
For Debian the rules file is the main makefile and assuming that a upstream
makefile will mangle the Debian packaging files creates false alerts
from static analysis tools and other problems.
2016-10-27 18:42:16 +03:00
Otto Kekäläinen
d495bf4280 MDEV-6284: Spliy Mroonga, Spider and TokuDB into their own packages
Also each package has it's own maintainer scripts to install and
uninstall them.
2016-10-27 18:42:16 +03:00
Otto Kekäläinen
e58e7b5052 MDEV-6284: Rename plugin packages to match new Debian convention 2016-10-27 18:42:16 +03:00
Otto Kekäläinen
0a1dbe8426 MDEV-6284: Split mariadb-test-data out of mariadb-test 2016-10-27 18:42:16 +03:00
Otto Kekäläinen
1494a96bf4 MDEV-6284: Make mariadb-test package versionless
There is no need for a separate mariadb-test metapackage and a versioned
mariadb-test-* package. Simply make it versionless and make it depend on
the client and server packages that stem from same source version.
2016-10-27 18:42:16 +03:00
Otto Kekäläinen
73f1c655ad MDEV-6284: Import most of downstream Debian packaging
These changes update the contents and behaviour of current packages
to match the current packaging in Debian official repos.

Keep mtr test scope small.

Updating maintainer scripts also required regenerating the translations.

Rules based on modern dh_* buildtools.

Update control file with new Debian conventions:
- Provide virtual-mysql-* virtual packages
- Recommends perl modules instead of Depends
2016-10-27 18:42:16 +03:00
Jan Lindström
f35f61b5a9 Merge branch '10.2-numa' of https://github.com/grooverdan/mariadb-server into grooverdan-10.2-numa 2016-10-24 09:07:49 +03:00
Otto Kekäläinen
1369696b8a Deb: Re-factor conditional build dependency checking and injecting
Now we check if a dependency is available and not just if older versions
are available. Also use correct name of libcrack2 to actually detect it.

Use sed to inject dependency at the end of the dependency list.
Otherwise keep the control line clean and parseable by Debian tools.
2016-10-07 15:32:59 +03:00
Otto Kekäläinen
44dd9a534a Deb: wrap-and-sort 2016-10-07 15:32:56 +03:00
Otto Kekäläinen
0a97008334 Deb: Fix various shortcomings in the control file
- All build-depends should be in one place.
- Library packages should depend on their main package using strict version.
- Most packages should depend on the misc variable, so that debhelper
  can fill in it with various calculated dependencies automatically.
- All packages using dynamic libraries should depend on the shlibs variable
  to include shared libraries as dependencies automatically.
- Essential tools like bsdutils, grep and tar shall not be defined in vain.
2016-10-07 15:32:53 +03:00
Daniel Black
8b59eab7a3 MDEV-10829: add libnuma-dev to debian packaging
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
2016-09-23 09:05:01 +10:00
Sergei Golubchik
932646b1ff Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
Sergei Golubchik
414a417e91 MDEV-10032 Connect engine not installable on Xenial
s/unixODBC/unixodbc/
2016-06-28 12:54:01 +02:00
Vladislav Vaintroub
b79944950e attempt to fix debian build (gssapi plugins require 10.1 client or server instead of 10.2 2016-05-14 15:37:14 +00:00
Nirbhay Choubey
7abb570756 MDEV-6211: MariaDB-Galera-server uses 'socat', but 'socat' is not in the dependency list
Xtrabackup-based SST method uses socat. Move it from
Suggests to Depends list.
2016-05-05 09:19:39 -04:00
Sergei Golubchik
f67a2211ec Merge branch '10.1' into 10.2 2016-03-23 22:36:46 +01:00
Sergey Vojtovich
4aac51db9a MDEV-9587 - Debian packaging for GSSAPI plugin 2016-03-18 11:03:38 +04:00
Sergei Golubchik
679aa122bf fix debian packaging for 10.2 2015-11-23 16:02:56 +01:00
Sergey Vojtovich
6346d1de2f MDEV-427/MDEV-5713 Add systemd script with notify functionality
After review/QA fixes.
2015-10-12 17:51:49 +02:00
Daniel Black
20c2ae39db MDEV-427/MDEV-5713 Add systemd script with notify functionality 2015-10-12 17:51:49 +02:00
Otto Kekäläinen
b9fee60871 Revert "Make galera-3 a Recommends instead of Depends in Debian packaging"
This reverts commit 6bd94cf542.

Without galera as a compulsory dependency, test suite will not pass
due to failing:

wsrep.pool_of_threads wsrep.binlog_format wsrep.mdev_6832 wsrep.mdev_7798
2015-09-03 19:09:08 +03:00
Otto Kekäläinen
c104e90eaa Unify virtual-* package definitions with official Debian packaging
Plus minor other fixes to debian/control file, wrap-and-sort,
versioned mariadb-common dependency etc. All changes based on
comparison with mariadb-10.0 packaging in official Debian
repositories.
2015-09-02 04:26:50 +03:00
Otto Kekäläinen
7b344bf940 Add MariaDB 10.0 stanzas next to MariaDB 5.5 in debian/control file
This should make the provides/breaks/replaces/conflicts lines
work properly when upgrading from mariadb-10.0 to mariadb-10.1
2015-09-01 23:56:19 +03:00
Otto Kekäläinen
cc08c134f7 Add MySQL 5.6 stanzas next to MySQL 5.5 in debian/control file
This should make the provides/breaks/replaces/conflicts lines
work properly when upgrading from mysql-5.6 to mariadb-packages.
2015-09-01 23:01:43 +03:00
Otto Kekäläinen
6bd94cf542 Make galera-3 a Recommends instead of Depends in Debian packaging
Having galera-3 as a Depends stops installation of proceeding
on systems where package galera-3 is not available. The server
can run fine withouth galera enabled, therefore a more slack
relationship is more appropriate.
2015-08-30 22:59:27 +03:00
Otto Kekäläinen
f425c71aba Merge documentation parts in debian/control from downstream 2015-07-22 14:58:43 +03:00
Otto Kekäläinen
220b4f2fc2 Merge (most) build dependencies in debian/control with downstream
* dpatch cannot be removed yet, as packaging standard isn't updated
 * we don't want to remove libssl at all, as in upstream we rather
   use system provided OpenSSL than bundled, non-system updated and
   less commonly trusted YaSSL
 * keep versioned dependencies, they might prove helpful when building
   for multiple distros and releases
2015-07-22 13:15:36 +03:00
Otto Kekäläinen
16be184123 Extend debian/control build dependencies to max
For tracking purposes this step is committed first before
the unnecessary dependencies are trimmed away.

libpcre3-dev (>= 2:8.35-3.2~) is however omitted (compared to
downstream Debian packaging) as it is not available in precise
and we don't want to break builds on precise yet.
2015-07-22 11:59:40 +03:00
Otto Kekäläinen
6809fdb741 Update autobake.sh to match control file location. Drop lucid and squeeze support. 2015-07-22 10:28:39 +03:00
Otto Kekäläinen
af9509d0d8 debian/*: wrap and sort for cleaner diffs 2015-07-21 23:24:05 +03:00
Otto Kekäläinen
82e64fde07 Remove debian/dist/* and have just one version
Use the slightly better Ubuntu version in both Ubuntu and
Debian and latest versions of Debian don't have problems
with AppArmor files included in packaging.
2015-07-21 23:21:50 +03:00
Renamed from debian/dist/Ubuntu/control (Browse further)