Skip to content

Commit

Permalink
Deb: Re-remove unnecessary version suffixes from package names
Browse files Browse the repository at this point in the history
There is no point in having version suffixes in plugin packages. They
will via their control file anyway depend on the correct server or client
version. Having version suffices has no benefit and it just complicates
upgrades when a new major version name package needs to replace all
possible previous version.

This issue was overlooked when merging commit
844a575 from 10.2 into 10.3, so it
needs to be manually fixed now.
  • Loading branch information
ottok authored and cvicentiu committed Jan 16, 2018
1 parent 9719fb4 commit 503fcfb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion debian/autobake-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,12 @@ if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]] || [[ $TRAVIS ]]
then
sed '/Package: mariadb-plugin-rocksdb/,+13d' -i debian/control
fi

# AWS SDK requires c++11 -capable compiler
# Minimal supported versions are g++ 4.8 and clang 3.3.
if [[ $GCCVERSION -lt 40800 ]] || [[ $TRAVIS ]]
then
sed '/Package: mariadb-plugin-aws-key-management-10.3/,+15d' -i debian/control
sed '/Package: mariadb-plugin-aws-key-management/,+14d' -i debian/control
fi

# Mroonga, TokuDB never built on Travis CI anyway, see build flags above
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ Description: CrackLib Password Validation Plugin for MariaDB
This password validation plugin uses cracklib to allow only
sufficiently secure (as defined by cracklib) user passwords in MariaDB.

Package: mariadb-plugin-aws-key-management-10.3
Package: mariadb-plugin-aws-key-management
Section: database
Architecture: any
Breaks: mariadb-aws-key-management-10.1,
Expand Down

0 comments on commit 503fcfb

Please sign in to comment.