Skip to content

Commit ff0f419

Browse files
author
Nirbhay Choubey
committed
Debian script fixes.
1 parent 27c0952 commit ff0f419

File tree

6 files changed

+12
-25
lines changed

6 files changed

+12
-25
lines changed

‎debian/dist/Debian/control

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Priority: optional
44
Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
55
XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
66
Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
7-
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
7+
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
88
Standards-Version: 3.8.3
99
Homepage: http://mariadb.org/
1010
Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
@@ -168,12 +168,14 @@ Description: MariaDB database core server files
168168
Package: mariadb-test-10.0
169169
Section: database
170170
Architecture: any
171-
Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version})
171+
Depends: mariadb-galera-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version})
172172
Conflicts: mariadb-test (<< ${source:Version}),
173173
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
174174
mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
175+
Suggests: patch
175176
Replaces: mariadb-test (<< ${source:Version}),
176-
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
177+
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
178+
mariadb-test-5.5
177179
Description: MariaDB database regression test suite
178180
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
179181
server. SQL (Structured Query Language) is the most popular database query
@@ -188,19 +190,15 @@ Suggests: tinyca, mailx, mariadb-test
188190
Recommends: libhtml-template-perl
189191
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
190192
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)
191-
Provides: mariadb-server-core, mysql-server-core-5.5, mariadb-galera-server, mysql-server, virtual-mysql-server
193+
Provides: mariadb-server, mysql-server, virtual-mysql-server, mariadb-galera-server
192194
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
193195
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
194196
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
195-
mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
196-
mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
197197
mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
198198
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
199199
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
200200
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
201201
libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
202-
mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
203-
mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
204202
mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
205203
Description: MariaDB database server with Galera cluster binaries
206204
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database

‎debian/dist/Debian/mariadb-galera-server-10.0.dirs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ usr/sbin
66
usr/share/man/man8
77
usr/share/mysql
88
usr/share/doc/mariadb-galera-server-10.0
9-
usr/support-files
109
var/run/mysqld
1110
var/lib/mysql-upgrade

‎debian/dist/Debian/rules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ build-stamp: configure
8787
cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS)
8888

8989
ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
90-
# Don't know why the following is necessary...
91-
cp unittest/unit.pl $(builddir)/unittest/
92-
cp -r mysql-test/* $(builddir)/mysql-test/
93-
cp -r sql/share/* $(builddir)/sql/share/
94-
cp -r scripts/*sql $(builddir)/scripts/
9590
if [ ! -f testsuite-stamp ] ; then \
9691
cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
9792
fi
@@ -181,7 +176,6 @@ install: build
181176
install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
182177
install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
183178
install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
184-
install -m 0644 Docs/README-wsrep $(TMP)/usr/share/doc/mariadb-galera-server-10.0/README-wsrep
185179

186180
install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_SRC
187181
install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_BIN

‎debian/dist/Ubuntu/control

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,14 @@ Description: MariaDB database core server files
162162
Package: mariadb-test-10.0
163163
Section: database
164164
Architecture: any
165-
Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version})
165+
Depends: mariadb-galera-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version})
166+
Suggests: patch
166167
Conflicts: mariadb-test (<< ${source:Version}),
167168
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
168169
mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
169170
Replaces: mariadb-test (<< ${source:Version}),
170-
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
171+
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
172+
mariadb-test-5.5
171173
Description: MariaDB database regression test suite
172174
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
173175
server. SQL (Structured Query Language) is the most popular database query
@@ -182,12 +184,12 @@ Suggests: tinyca, mailx, mariadb-test
182184
Recommends: libhtml-template-perl
183185
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
184186
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)
185-
Provides: mariadb-galera-server, mariadb-server, mysql-server, virtual-mysql-server
187+
Provides: mariadb-server, mysql-server, virtual-mysql-server, mariadb-galera-server
186188
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
187189
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
188190
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
189191
mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
190-
Replaces: mariadb-galera-server (<< ${source:Version}), mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
192+
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
191193
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
192194
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
193195
libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),

‎debian/dist/Ubuntu/mariadb-galera-server-10.0.dirs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ usr/sbin
66
usr/share/man/man8
77
usr/share/mysql
88
usr/share/doc/mariadb-galera-server-10.0
9-
usr/support-files
109
var/run/mysqld
1110
var/lib/mysql-upgrade

‎debian/dist/Ubuntu/rules

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ build-stamp: configure
8787
cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS)
8888

8989
ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
90-
# Don't know why the following is necessary...
91-
cp unittest/unit.pl $(builddir)/unittest/
92-
cp -r mysql-test/* $(builddir)/mysql-test/
93-
cp -r sql/share/* $(builddir)/sql/share/
94-
cp -r scripts/*sql $(builddir)/scripts/
9590
if [ ! -f testsuite-stamp ] ; then \
9691
cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
9792
fi

0 commit comments

Comments
 (0)