HAYASHI Kentaro
null+****@clear*****
Fri Jan 25 18:58:39 JST 2013
HAYASHI Kentaro 2013-01-25 18:58:39 +0900 (Fri, 25 Jan 2013) New Revision: af918b08ed734eb2fe7815d6089f719a9d9a0154 https://github.com/mroonga/mroonga/commit/af918b08ed734eb2fe7815d6089f719a9d9a0154 Log: apt: suppress variable expansion The variable @MYSQL_VERSION@ is expanded to build host MySQL version. It is useless for chroot build process. The version of MySQL package installed at chroot is really required information. So, rewrite MYSQL_VERSION to installed MySQL package version in build-deb.sh build process. Modified files: packages/apt/build-deb.sh packages/debian/control.in Modified: packages/apt/build-deb.sh (+1 -1) =================================================================== --- packages/apt/build-deb.sh 2013-01-25 18:12:00 +0900 (8fccb70) +++ packages/apt/build-deb.sh 2013-01-25 18:58:39 +0900 (f95ae08) @@ -123,7 +123,7 @@ cp -rp /tmp/${PACKAGE}-debian debian # export DEB_BUILD_OPTIONS="noopt nostrip" MYSQL_PACKAGE_INFO=\$(apt-cache show mysql-server | grep Version | sort | tail -1) MYSQL_PACKAGE_VERSION=\${MYSQL_PACKAGE_INFO##Version: } -sed -i "s/@VERSION@/\$MYSQL_PACKAGE_VERSION/" debian/control +sed -i "s/MYSQL_VERSION/\$MYSQL_PACKAGE_VERSION/" debian/control debuild -us -uc EOF Modified: packages/debian/control.in (+1 -1) =================================================================== --- packages/debian/control.in 2013-01-25 18:12:00 +0900 (e0bb3d0) +++ packages/debian/control.in 2013-01-25 18:58:39 +0900 (e091b2c) @@ -20,7 +20,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libgroonga0 (>= @REQUIRED_GROONGA_VERSION@), - mysql-server (= @MYSQL_VERSION@) + mysql-server (= MYSQL_VERSION) 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. -------------- next part -------------- HTML����������������������������...Download