Skip to content

M
mariadb
Commit ff0f4197 authored by Nirbhay Choubey's avatar Nirbhay Choubey
Browse files
Options

Debian script fixes.

parent 27c09524
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 25 deletions
debian/dist/Debian/control
View file @ ff0f4197
...@@ -4,7 +4,7 @@ Priority: optional ...@@ -4,7 +4,7 @@ Priority: optional
Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net> Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net> XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net> Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev
Standards-Version: 3.8.3 Standards-Version: 3.8.3
Homepage: http://mariadb.org/ Homepage: http://mariadb.org/
Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
...@@ -168,12 +168,14 @@ Description: MariaDB database core server files ...@@ -168,12 +168,14 @@ Description: MariaDB database core server files
Package: mariadb-test-10.0 Package: mariadb-test-10.0
Section: database Section: database
Architecture: any Architecture: any
Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version}) Depends: mariadb-galera-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version})
Conflicts: mariadb-test (<< ${source:Version}), Conflicts: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
Suggests: patch
Replaces: mariadb-test (<< ${source:Version}), Replaces: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
mariadb-test-5.5
Description: MariaDB database regression test suite Description: MariaDB database regression test suite
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query server. SQL (Structured Query Language) is the most popular database query
...@@ -188,19 +190,15 @@ Suggests: tinyca, mailx, mariadb-test ...@@ -188,19 +190,15 @@ Suggests: tinyca, mailx, mariadb-test
Recommends: libhtml-template-perl Recommends: libhtml-template-perl
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}), galera (>=25.2) Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}), galera (>=25.2)
Provides: mariadb-server-core, mysql-server-core-5.5, mariadb-galera-server, mysql-server, virtual-mysql-server Provides: mariadb-server, mysql-server, virtual-mysql-server, mariadb-galera-server
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}), Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}), Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0), libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
Description: MariaDB database server with Galera cluster binaries Description: MariaDB database server with Galera cluster binaries
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
......
debian/dist/Debian/mariadb-galera-server-10.0.dirs
View file @ ff0f4197
...@@ -6,6 +6,5 @@ usr/sbin ...@@ -6,6 +6,5 @@ usr/sbin
usr/share/man/man8 usr/share/man/man8
usr/share/mysql usr/share/mysql
usr/share/doc/mariadb-galera-server-10.0 usr/share/doc/mariadb-galera-server-10.0
usr/support-files
var/run/mysqld var/run/mysqld
var/lib/mysql-upgrade var/lib/mysql-upgrade
debian/dist/Debian/rules
View file @ ff0f4197
...@@ -87,11 +87,6 @@ build-stamp: configure ...@@ -87,11 +87,6 @@ build-stamp: configure
cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS) cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS)
ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),) ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
# Don't know why the following is necessary...
cp unittest/unit.pl $(builddir)/unittest/
cp -r mysql-test/* $(builddir)/mysql-test/
cp -r sql/share/* $(builddir)/sql/share/
cp -r scripts/*sql $(builddir)/scripts/
if [ ! -f testsuite-stamp ] ; then \ if [ ! -f testsuite-stamp ] ; then \
cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \ cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
fi fi
...@@ -181,7 +176,6 @@ install: build ...@@ -181,7 +176,6 @@ install: build
install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/ install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/ install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/ install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
install -m 0644 Docs/README-wsrep $(TMP)/usr/share/doc/mariadb-galera-server-10.0/README-wsrep
install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_SRC install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_SRC
install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_BIN install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_BIN
......
debian/dist/Ubuntu/control
View file @ ff0f4197
...@@ -162,12 +162,14 @@ Description: MariaDB database core server files ...@@ -162,12 +162,14 @@ Description: MariaDB database core server files
Package: mariadb-test-10.0 Package: mariadb-test-10.0
Section: database Section: database
Architecture: any Architecture: any
Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version}) Depends: mariadb-galera-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version})
Suggests: patch
Conflicts: mariadb-test (<< ${source:Version}), Conflicts: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
Replaces: mariadb-test (<< ${source:Version}), Replaces: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
mariadb-test-5.5
Description: MariaDB database regression test suite Description: MariaDB database regression test suite
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query server. SQL (Structured Query Language) is the most popular database query
...@@ -182,12 +184,12 @@ Suggests: tinyca, mailx, mariadb-test ...@@ -182,12 +184,12 @@ Suggests: tinyca, mailx, mariadb-test
Recommends: libhtml-template-perl Recommends: libhtml-template-perl
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}), galera (>=25.2) Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}), galera (>=25.2)
Provides: mariadb-galera-server, mariadb-server, mysql-server, virtual-mysql-server Provides: mariadb-server, mysql-server, virtual-mysql-server, mariadb-galera-server
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}), Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
Replaces: mariadb-galera-server (<< ${source:Version}), mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0), libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
......
debian/dist/Ubuntu/mariadb-galera-server-10.0.dirs
View file @ ff0f4197
...@@ -6,6 +6,5 @@ usr/sbin ...@@ -6,6 +6,5 @@ usr/sbin
usr/share/man/man8 usr/share/man/man8
usr/share/mysql usr/share/mysql
usr/share/doc/mariadb-galera-server-10.0 usr/share/doc/mariadb-galera-server-10.0
usr/support-files
var/run/mysqld var/run/mysqld
var/lib/mysql-upgrade var/lib/mysql-upgrade
debian/dist/Ubuntu/rules
View file @ ff0f4197
...@@ -87,11 +87,6 @@ build-stamp: configure ...@@ -87,11 +87,6 @@ build-stamp: configure
cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS) cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS)
ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),) ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
# Don't know why the following is necessary...
cp unittest/unit.pl $(builddir)/unittest/
cp -r mysql-test/* $(builddir)/mysql-test/
cp -r sql/share/* $(builddir)/sql/share/
cp -r scripts/*sql $(builddir)/scripts/
if [ ! -f testsuite-stamp ] ; then \ if [ ! -f testsuite-stamp ] ; then \
cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \ cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7