Skip to content

Commit

Permalink
Fixes in debian distribution files.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nirbhay Choubey committed Feb 13, 2014
1 parent b0ad00d commit 9564537
Show file tree
Hide file tree
Showing 32 changed files with 269 additions and 568 deletions.
488 changes: 0 additions & 488 deletions Docs/README-wsrep.moved

This file was deleted.

37 changes: 5 additions & 32 deletions debian/dist/Debian/mariadb-galera-server-10.0.files.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
usr/lib/mysql/plugin/auth_pam.so
usr/lib/mysql/plugin/auth_socket.so
usr/sbin/mysqld
usr/lib/mysql/plugin/ha_innodb.so
usr/lib/mysql/plugin/ha_oqgraph.so
usr/lib/mysql/plugin/ha_sequence.so
usr/lib/mysql/plugin/ha_sphinx.so
usr/lib/mysql/plugin/ha_xtradb.so
usr/lib/mysql/plugin/handlersocket.so
usr/lib/mysql/plugin/locales.so
Expand Down Expand Up @@ -48,11 +46,11 @@ usr/bin/wsrep_sst_common
usr/bin/wsrep_sst_mysqldump
usr/bin/wsrep_sst_rsync
usr/bin/wsrep_sst_xtrabackup
usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
usr/share/doc/mariadb-server-10.0/INFO_SRC
usr/share/doc/mariadb-server-10.0/INFO_BIN
usr/share/doc/mariadb-galera-server-10.0/mysqld.sym.gz
usr/share/doc/mariadb-galera-server-10.0/INFO_SRC
usr/share/doc/mariadb-galera-server-10.0/INFO_BIN
usr/share/doc/mariadb-galera-server-10.0/README-wsrep
usr/share/lintian/overrides/mariadb-server-10.0
usr/share/lintian/overrides/mariadb-galera-server-10.0
usr/share/man/man1/msql2mysql.1
usr/share/man/man1/myisamchk.1
usr/share/man/man1/myisam_ftdump.1
Expand All @@ -75,31 +73,6 @@ usr/share/man/man1/resolveip.1
usr/share/man/man1/resolve_stack_dump.1
usr/share/man/man1/innochecksum.1
usr/share/man/man1/mysql_tzinfo_to_sql.1
usr/share/man/man8/mysqld.8
usr/share/mysql/charsets
usr/share/mysql/czech
usr/share/mysql/danish
usr/share/mysql/dutch
usr/share/mysql/english
usr/share/mysql/estonian
usr/share/mysql/french
usr/share/mysql/german
usr/share/mysql/greek
usr/share/mysql/hungarian
usr/share/mysql/italian
usr/share/mysql/japanese
usr/share/mysql/korean
usr/share/mysql/norwegian
usr/share/mysql/norwegian-ny
usr/share/mysql/polish
usr/share/mysql/portuguese
usr/share/mysql/romanian
usr/share/mysql/russian
usr/share/mysql/serbian
usr/share/mysql/slovak
usr/share/mysql/spanish
usr/share/mysql/swedish
usr/share/mysql/ukrainian
usr/share/mysql/debian-start.inc.sh
usr/share/mysql/echo_stderr
usr/share/mysql/errmsg-utf8.txt
Expand Down
20 changes: 5 additions & 15 deletions debian/dist/Ubuntu/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: optional
Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
XSBC-Original-Maintainer: Maria 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.2
Homepage: http://mariadb.org/
Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
Expand Down Expand Up @@ -145,16 +145,10 @@ Package: mariadb-server-core-10.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
Conflicts: mariadb-server-5.1 (<< 5.1.60),
mariadb-server-5.2 (<< 5.2.10),
mariadb-server-5.3 (<< 5.3.3),
mysql-server-5.0,
Conflicts: mysql-server-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
Replaces: mariadb-server-5.1 (<< 5.1.60),
mariadb-server-5.2 (<< 5.2.10),
mariadb-server-5.3 (<< 5.3.3),
mysql-server-5.0,
Replaces: mysql-server-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
Description: MariaDB database core server files
Expand Down Expand Up @@ -188,19 +182,15 @@ Suggests: tinyca, mailx, mariadb-test
Recommends: libhtml-template-perl
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)
Provides: mariadb-server-core, mysql-server-core-5.5, mariadb-galera-server, mysql-server, virtual-mysql-server
Provides: mariadb-galera-server, mariadb-server, mysql-server, virtual-mysql-server
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,
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
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
Replaces: mariadb-galera-server (<< ${source:Version}), mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
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,
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
Description: MariaDB database server with Galera cluster binaries
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
Expand Down
36 changes: 4 additions & 32 deletions debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
usr/lib/mysql/plugin/auth_pam.so
usr/lib/mysql/plugin/auth_socket.so
usr/sbin/mysqld
usr/lib/mysql/plugin/ha_innodb.so
usr/lib/mysql/plugin/ha_oqgraph.so
usr/lib/mysql/plugin/ha_sequence.so
usr/lib/mysql/plugin/ha_xtradb.so
usr/lib/mysql/plugin/handlersocket.so
Expand Down Expand Up @@ -50,11 +47,11 @@ usr/bin/wsrep_sst_common
usr/bin/wsrep_sst_mysqldump
usr/bin/wsrep_sst_rsync
usr/bin/wsrep_sst_xtrabackup
usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
usr/share/doc/mariadb-server-10.0/INFO_SRC
usr/share/doc/mariadb-server-10.0/INFO_BIN
usr/share/doc/mariadb-galera-server-10.0/mysqld.sym.gz
usr/share/doc/mariadb-galera-server-10.0/INFO_SRC
usr/share/doc/mariadb-galera-server-10.0/INFO_BIN
usr/share/doc/mariadb-galera-server-10.0/README-wsrep
usr/share/lintian/overrides/mariadb-server-10.0
usr/share/lintian/overrides/mariadb-galera-server-10.0
usr/share/man/man1/msql2mysql.1
usr/share/man/man1/myisamchk.1
usr/share/man/man1/myisam_ftdump.1
Expand All @@ -77,31 +74,6 @@ usr/share/man/man1/resolveip.1
usr/share/man/man1/resolve_stack_dump.1
usr/share/man/man1/innochecksum.1
usr/share/man/man1/mysql_tzinfo_to_sql.1
usr/share/man/man8/mysqld.8
usr/share/mysql/charsets
usr/share/mysql/czech
usr/share/mysql/danish
usr/share/mysql/dutch
usr/share/mysql/english
usr/share/mysql/estonian
usr/share/mysql/french
usr/share/mysql/german
usr/share/mysql/greek
usr/share/mysql/hungarian
usr/share/mysql/italian
usr/share/mysql/japanese
usr/share/mysql/korean
usr/share/mysql/norwegian
usr/share/mysql/norwegian-ny
usr/share/mysql/polish
usr/share/mysql/portuguese
usr/share/mysql/romanian
usr/share/mysql/russian
usr/share/mysql/serbian
usr/share/mysql/slovak
usr/share/mysql/spanish
usr/share/mysql/swedish
usr/share/mysql/ukrainian
usr/share/mysql/debian-start.inc.sh
usr/share/mysql/echo_stderr
usr/share/mysql/errmsg-utf8.txt
Expand Down
5 changes: 4 additions & 1 deletion debian/dist/Ubuntu/rules
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,11 @@ install: build
$(TMP)/usr/share/mysql/mysql-log-rotate \
$(TMP)/usr/share/mysql/mysql.server \
$(TMP)/usr/share/mysql/binary-configure
nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-galera-server-10.0/mysqld.sym.gz
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.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_BIN $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_BIN
Expand All @@ -190,7 +191,9 @@ install: build

# lintian overrides
mkdir -p $(TMP)/usr/share/lintian/overrides/
cp debian/mysql-common.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-common
cp debian/mariadb-galera-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-10.0
cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.0

# For 5.0 -> 10.0 transition
d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
Expand Down
4 changes: 4 additions & 0 deletions debian/libmariadbclient-dev.README.Maintainer
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
The examples directory includes files that might be needed by some
developers:
- header files not installed by default
- the example file udf_example.c
2 changes: 2 additions & 0 deletions debian/libmariadbclient-dev.dirs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
usr/include/
usr/lib/
1 change: 1 addition & 0 deletions debian/libmariadbclient-dev.examples
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sql/udf_example.c
7 changes: 7 additions & 0 deletions debian/libmariadbclient-dev.files
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
usr/bin/mysql_config
usr/include/mysql
usr/lib/libmysqlclient.a
usr/lib/libmysqlclient_r.a
usr/lib/libmysqlservices.a
usr/share/aclocal/mysql.m4
usr/share/man/man1/mysql_config.1
2 changes: 2 additions & 0 deletions debian/libmariadbclient-dev.links
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
usr/lib/libmysqlclient.so.18 usr/lib/libmysqlclient.so
usr/lib/libmysqlclient_r.so.18 usr/lib/libmysqlclient_r.so
1 change: 1 addition & 0 deletions debian/libmariadbclient18.dirs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/
3 changes: 3 additions & 0 deletions debian/libmariadbclient18.files
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
usr/lib/libmysqlclient*.so.*
usr/lib/mysql/plugin/mysql_clear_password.so
usr/lib/mysql/plugin/dialog.so
12 changes: 12 additions & 0 deletions debian/libmariadbclient18.postinst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash -e

# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.

#DEBHELPER#

exit 0

# vim: ts=4


2 changes: 2 additions & 0 deletions debian/libmariadbd-dev.files
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
usr/lib/mysql/*.a
usr/lib/mysql/*.la
4 changes: 4 additions & 0 deletions debian/mariadb-client-10.0.README.Debian
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FAQ:

Q: My <tab> completition is gone, why?
A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf!
3 changes: 3 additions & 0 deletions debian/mariadb-client-10.0.dirs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
usr/bin/
usr/share/man/man1/
usr/share/perl5/
2 changes: 2 additions & 0 deletions debian/mariadb-client-10.0.docs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
debian/additions/innotop/changelog.innotop
README
31 changes: 31 additions & 0 deletions debian/mariadb-client-10.0.files
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
usr/bin/innochecksum
usr/bin/innotop
usr/bin/mysqlaccess
usr/bin/mysqladmin
usr/bin/mysqlbug
usr/bin/mysqldump
usr/bin/mysqldumpslow
usr/bin/mysql_find_rows
usr/bin/mysql_fix_extensions
usr/bin/mysqlimport
usr/bin/mysqlreport
usr/bin/mysqlshow
usr/bin/mysqlslap
usr/bin/mysql_waitpid
usr/share/lintian/overrides/mariadb-client-10.0
usr/share/man/man1/innotop.1
usr/share/man/man1/mysqlaccess.1
usr/share/man/man1/mysqladmin.1
usr/share/man/man1/mysqlbug.1
usr/share/man/man1/mysqldump.1
usr/share/man/man1/mysqldumpslow.1
usr/share/man/man1/mysql_find_rows.1
usr/share/man/man1/mysql_fix_extensions.1
usr/share/man/man1/mysqlimport.1
usr/share/man/man1/mysqlman.1
usr/share/man/man1/mysqlreport.1
usr/share/man/man1/mysqlshow.1
usr/share/man/man1/mysqlslap.1
usr/share/man/man1/mysql_tableinfo.1
usr/share/man/man1/mysql_waitpid.1
usr/share/man/man8/mysqlmanager.8
3 changes: 3 additions & 0 deletions debian/mariadb-client-10.0.links
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
usr/bin/mysqlcheck usr/bin/mysqlrepair
usr/bin/mysqlcheck usr/bin/mysqlanalyze
usr/bin/mysqlcheck usr/bin/mysqloptimize
3 changes: 3 additions & 0 deletions debian/mariadb-client-10.0.lintian-overrides
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
mariadb-client-5.3: package-has-a-duplicate-relation
mariadb-client-5.3: wrong-name-for-upstream-changelog usr/share/doc/mariadb-client-5.3/changelog.innotop.gz
mariadb-client-5.3: pkg-not-in-package-test innotop
3 changes: 3 additions & 0 deletions debian/mariadb-client-10.0.menu
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
?package(innotop):needs="text" section="Applications/Data Management"\
title="innotop" command="/usr/bin/innotop"
4 changes: 4 additions & 0 deletions debian/mariadb-client-core-10.0.files
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
usr/bin/mysql
usr/bin/mysqlcheck
usr/share/man/man1/mysql.1
usr/share/man/man1/mysqlcheck.1
1 change: 1 addition & 0 deletions debian/mariadb-common.files
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
etc/mysql/conf.d/mariadb.cnf
8 changes: 8 additions & 0 deletions debian/mariadb-common.postrm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash -e

if [ "$1" = "purge" ]; then
rmdir /etc/mysql/conf.d 2>/dev/null || true
rmdir /etc/mysql 2>/dev/null || true
fi

#DEBHELPER#
26 changes: 26 additions & 0 deletions debian/mariadb-server-core-10.0.files
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
usr/sbin/mysqld
usr/share/man/man8/mysqld.8
usr/share/mysql/charsets
usr/share/mysql/czech
usr/share/mysql/danish
usr/share/mysql/dutch
usr/share/mysql/english
usr/share/mysql/estonian
usr/share/mysql/french
usr/share/mysql/german
usr/share/mysql/greek
usr/share/mysql/hungarian
usr/share/mysql/italian
usr/share/mysql/japanese
usr/share/mysql/korean
usr/share/mysql/norwegian
usr/share/mysql/norwegian-ny
usr/share/mysql/polish
usr/share/mysql/portuguese
usr/share/mysql/romanian
usr/share/mysql/russian
usr/share/mysql/serbian
usr/share/mysql/slovak
usr/share/mysql/spanish
usr/share/mysql/swedish
usr/share/mysql/ukrainian
Loading

0 comments on commit 9564537

Please sign in to comment.