Browse Source

fix broken (after merge) galera deb packaging

pull/374/head
Sergei Golubchik 12 years ago
parent
commit
427daab74f
  1. 4
      cmake/install_macros.cmake
  2. 8
      debian/dist/Debian/mariadb-galera-server-5.5.files
  3. 2
      debian/dist/Debian/rules
  4. 8
      debian/dist/Ubuntu/mariadb-galera-server-5.5.files
  5. 2
      debian/dist/Ubuntu/rules

4
cmake/install_macros.cmake

@ -174,9 +174,9 @@ FUNCTION(INSTALL_DOCUMENTATION)
ENDIF()
IF(RPM)
SET(destination "${destination}/MariaDB-${group}-${VERSION}")
SET(destination "${destination}/MariaDB-Galera-${group}-${VERSION}")
ELSEIF(DEB)
SET(destination "${destination}/mariadb-${group}-${MAJOR_VERSION}.${MINOR_VERSION}")
SET(destination "${destination}/mariadb-galera-${group}-${MAJOR_VERSION}.${MINOR_VERSION}")
ENDIF()
INSTALL(FILES ${files} DESTINATION ${destination} COMPONENT ${ARG_COMPONENT})

8
debian/dist/Debian/mariadb-galera-server-5.5.files

@ -1,4 +1,3 @@
usr/README-wsrep
usr/sbin/mysqld
usr/lib/mysql/plugin/ha_innodb.so
usr/lib/mysql/plugin/ha_oqgraph.so
@ -43,9 +42,10 @@ 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-5.5/mysqld.sym.gz
usr/share/doc/mariadb-server-5.5/INFO_SRC
usr/share/doc/mariadb-server-5.5/INFO_BIN
usr/share/doc/mariadb-galera-server-5.5/mysqld.sym.gz
usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
usr/share/doc/mariadb-galera-server-5.5/README-wsrep
usr/share/lintian/overrides/mariadb-server-5.5
usr/share/man/man1/msql2mysql.1
usr/share/man/man1/myisamchk.1

2
debian/dist/Debian/rules

@ -177,7 +177,7 @@ 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-5.5/mysqld.sym.gz
nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-galera-server-5.5/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/

8
debian/dist/Ubuntu/mariadb-galera-server-5.5.files

@ -1,4 +1,3 @@
usr/README-wsrep
usr/sbin/mysqld
usr/lib/mysql/plugin/ha_innodb.so
usr/lib/mysql/plugin/ha_oqgraph.so
@ -45,9 +44,10 @@ 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-5.5/mysqld.sym.gz
usr/share/doc/mariadb-server-5.5/INFO_SRC
usr/share/doc/mariadb-server-5.5/INFO_BIN
usr/share/doc/mariadb-galera-server-5.5/mysqld.sym.gz
usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
usr/share/doc/mariadb-galera-server-5.5/README-wsrep
usr/share/lintian/overrides/mariadb-server-5.5
usr/share/man/man1/msql2mysql.1
usr/share/man/man1/myisamchk.1

2
debian/dist/Ubuntu/rules

@ -177,7 +177,7 @@ 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-5.5/mysqld.sym.gz
nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-galera-server-5.5/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/

Loading…
Cancel
Save