null+****@clear*****
null+****@clear*****
2012年 1月 30日 (月) 02:45:02 JST
Kouhei Sutou 2012-01-30 02:45:02 +0900 (Mon, 30 Jan 2012)
New Revision: 3ab01a5738e6fce2cd84ba9ced37135536fc8f39
Log:
[debian] remove compatible pacakge for 1.11 or ealier.
Removed files:
packages/debian/mysql-server-mroonga-compatible.install
packages/debian/mysql-server-mroonga-compatible.postinst
packages/debian/mysql-server-mroonga-compatible.postrm
Modified files:
packages/debian/control
Modified: packages/debian/control (+1 -25)
===================================================================
--- packages/debian/control 2012-01-30 02:44:04 +0900 (3e810ec)
+++ packages/debian/control 2012-01-30 02:45:02 +0900 (f9ea2ba)
@@ -16,7 +16,6 @@ Section: database
Architecture: any
Replaces: mysql-server-groonga (<< 1.10-1)
Breaks: mysql-server-groonga (<< 1.10-1)
-Conflicts: mysql-server-mroonga-compatible
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -29,30 +28,7 @@ Description: A fast fulltext searchable storage engine for MySQL.
.
This package provides a MySQL storage engine as a shared library.
This provides "mroonga" storage engine. It means you can use
- "ENGINE = mroonga" in "CREATE TABLE". You can use
- "ENGINE = groonga" in "CREATE TABLE" with mysql-server-mroonga-compatible
- package. It provides "groonga" storage engine. But "groonga" storage engine
- is deprecated. We recommend that you use "mroonga" storage engine
- rather than "groonga" storage engine.
-
-Package: mysql-server-mroonga-compatible
-Section: database
-Architecture: any
-Conflicts: mysql-server-mroonga
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- libgroonga0 (>= 1.3.0),
- mysql-server
-Description: A fast fulltext searchable storage engine for MySQL.
- Mroonga is a fast fulltext searchable storage engine for MySQL.
- It is based on groonga, a fast fulltext search engine and column store.
- Groonga is good at real time update.
- .
- This package provides a MySQL storage engine as a shared library.
- This provides "groonga" storage engine. It means you can use
- "ENGINE = groonga" in "CREATE TABLE" but "groonga" storage engine
- is deprecated. You should use "mroonga" storage engine.
+ "ENGINE = mroonga" in "CREATE TABLE".
Package: mysql-server-mroonga-doc
Section: doc
Deleted: packages/debian/mysql-server-mroonga-compatible.install (+0 -2) 100644
===================================================================
--- packages/debian/mysql-server-mroonga-compatible.install 2012-01-30 02:44:04 +0900 (f104a88)
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/mysql/plugin/ha_groonga.so*
-debian/apparmor/mysql-server-mroonga etc/apparmor.d/abstractions/mysql-server-mroonga-compatible
Deleted: packages/debian/mysql-server-mroonga-compatible.postinst (+0 -74) 100755
===================================================================
--- packages/debian/mysql-server-mroonga-compatible.postinst 2012-01-30 02:44:04 +0900 (d4c2645)
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-
-set -e
-
-prevver="$2"
-
-install_plugin() {
- cat <<EOS | mysql --defaults-file=/etc/mysql/debian.cnf || true
-INSTALL PLUGIN groonga SONAME 'ha_groonga.so';
-CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_groonga.so';
-EOS
-}
-
-install_apparmor() {
- mysql_apparmor_profile_name=usr.sbin.mysqld
- mysql_apparmor_profile=/etc/apparmor.d/${mysql_apparmor_profile_name}
- mysql_local_apparmor_profile=/etc/apparmor.d/local/${mysql_apparmor_profile_name}
- apparmor_profile_name=mysql-server-mroonga-compatible
- include_profile="#include <abstractions/${apparmor_profile_name}>"
- local_apparmor_profile=/etc/apparmor.d/local/${apparmor_profile_name}
- if test -f "${mysql_local_apparmor_profile}"; then
- if ! grep -q "${include_profile}" "${mysql_local_apparmor_profile}"; then
- echo >> "${mysql_local_apparmor_profile}"
- echo "${include_profile}" >> "${mysql_local_apparmor_profile}"
- fi
- else
- mysql_abstraction_apparmor_profile=/etc/apparmor.d/abstractions/mysql
- mysql_plugin_dir=/usr/lib/mysql/plugin
- if test -f "${mysql_abstraction_apparmor_profile}" && \
- ! grep -q "${mysql_plugin_dir}" \
- "${mysql_abstraction_apparmor_profile}"; then
- # For Lucid.
- cat <<EOF >> "${mysql_abstraction_apparmor_profile}"
-
-# ${apparmor_profile_name}: START
-# Added by mysql-server-mroonga-compatible.
-${mysql_plugin_dir}/ r,
-${mysql_plugin_dir}/*.so* mr,
-${include_profile}
-# ${apparmor_profile_name}: END
-EOF
- fi
- fi
-
- if ! test -e "$local_apparmor_profile"; then
- mkdir -p $(dirname "$local_apparmor_profile")
- cat <<EOF > "$local_apparmor_profile"
-# Site-specific additions and overrides for ${apparmor_profile_name}.
-# For more details, please see /etc/apparmor.d/local/README.
-EOF
- fi
-
- if aa-status --enabled 2>/dev/null; then
- apparmor_parser -r -T -W "${mysql_apparmor_profile}" || true
- fi
-
- true
-}
-
-case "$1" in
- configure)
- install_apparmor
- install_plugin
- ;;
- abort-upgrade|abort-deconfigure|abort-remove)
- :
- ;;
- *)
- echo "Called with unknown argument $1, bailing out."
- exit 1
- ;;
-esac
-
-#DEBHELPER#
Deleted: packages/debian/mysql-server-mroonga-compatible.postrm (+0 -43) 100755
===================================================================
--- packages/debian/mysql-server-mroonga-compatible.postrm 2012-01-30 02:44:04 +0900 (e7166e3)
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-set -e
-
-cat <<EOS | mysql --defaults-file=/etc/mysql/debian.cnf || true
-DROP FUNCTION last_insert_grn_id;
-UNINSTALL PLUGIN groonga;
-EOS
-
-if [ "$1" = "purge" ]; then
- mysql_apparmor_profile_name=usr.sbin.mysqld
- mysql_apparmor_profile=/etc/apparmor.d/${mysql_apparmor_profile_name}
- mysql_local_apparmor_profile=/etc/apparmor.d/local/${mysql_apparmor_profile_name}
- mysql_abstraction_apparmor_profile=/etc/apparmor.d/abstractions/mysql
- apparmor_profile_name=mysql-server-mroonga-compatible
- if test -f "${mysql_local_apparmor_profile}"; then
- include_profile="#include <abstractions/${apparmor_profile_name}>"
- if grep -q "${include_profile}" "${mysql_local_apparmor_profile}"; then
- sed -i'' -e "s,${include_profile},," \
- "${mysql_local_apparmor_profile}"
- fi
- else
- start_marker_re="^# ${apparmor_profile_name}: START$"
- end_marker_re="^# ${apparmor_profile_name}: END$"
- if test -f "${mysql_abstraction_apparmor_profile}" && \
- grep -q "${start_marker_re}" \
- "${mysql_abstraction_apparmor_profile}"; then
- sed -i'' -e "/${start_marker_re}/,/${end_marker_re}/d" \
- "${mysql_abstraction_apparmor_profile}"
- fi
- fi
-
- rm -f "/etc/apparmor.d/local/${apparmor_profile_name}" || true
- rmdir /etc/apparmor.d/local 2>/dev/null || true
-
- if aa-status --enabled 2>/dev/null; then
- apparmor_parser -r -T -W "${mysql_apparmor_profile}" || true
- fi
-fi
-
-#DEBHELPER#
-
-exit 0