Merge lp:~tplavcic/percona-server/bug1319670-5.5 into lp:percona-server/5.5

[Tomislav Plavcic]

Updated compilation comment and server suffix
Standard string should be like:
Server version: 5.5.37-35.0 Percona Server (GPL), Release 35.0, Revision 657
This was tested on version 5.6 (PS+TokuDB) but should be tested more before every release

[Laurynas Biveinis (laurynas-biveinis)]

Same comment re. DEBVERSION as in 5.1.

review: Needs Fixing

=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh	2014-04-18 04:06:52 +0000
+++ build-ps/build-binary.sh	2014-05-27 06:17:51 +0000
@@ -144,10 +144,18 @@
 PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
 
 # Build information
-REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"
+if test -e "$SOURCEDIR/Docs/INFO_SRC"
+then
+    REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"
+elif test -e "$SOURCEDIR/.bzr/branch/last-revision"
+then
+    REVISION="$(cd "$SOURCEDIR"; cat .bzr/branch/last-revision | awk -F ' ' '{print $1}')"
+else
+    REVISION=""
+fi
 PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
 PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}$TAG.$(uname -s).$TARGET"
-COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
+COMMENT="Percona Server (GPL), Release ${MYSQL_VERSION_EXTRA#-}"
 COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
 
 # Compilation flags
@@ -192,7 +200,6 @@
         -DWITH_SSL=system \
         -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
         -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
-        -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
         -DCOMPILATION_COMMENT="$COMMENT" \
         -DWITH_PAM=ON \
         $OPENSSL_INCLUDE $OPENSSL_LIBRARY $CRYPTO_LIBRARY
@@ -217,7 +224,11 @@
     # Build UDF
     (
         cd "UDF"
+<<<<<<< TREE
 	autoreconf --install
+=======
+        autoreconf --install
+>>>>>>> MERGE-SOURCE
         CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/include" \
             --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
         make $MAKE_JFLAG

=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules	2014-03-31 05:35:44 +0000
+++ build-ps/debian/rules	2014-05-27 06:17:51 +0000
@@ -4,7 +4,9 @@
 export DEB_BUILD_HARDENING=1
 
 PACKAGE=percona-server-5.5
-PS_VERSION_EXTRA = $(shell echo "Percona Server (GPL), $(DEBVERSION)")
+PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
+REVISION = '@@REVISION@@'
+COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
 
 TMP=$(CURDIR)/debian/tmp/
 prefix=/usr
@@ -13,7 +15,6 @@
 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
@@ -71,8 +72,7 @@
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DWITH_LIBWRAP=ON \
 		-DWITH_SSL=system \
-		-DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
-		-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
+		-DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_RELEASE) \
 		-DSYSTEM_TYPE="debian-linux-gnu" \
 		-DINSTALL_LAYOUT=RPM \
 		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \

=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-04-26 13:57:29 +0000
+++ build-ps/percona-server.spec	2014-05-27 06:17:51 +0000
@@ -98,10 +98,10 @@
 # Server comment strings
 # ----------------------------------------------------------------------------
 %if %{undefined compilation_comment_debug}
-%define compilation_comment_debug       Percona Server - Debug (GPL), Release rel%{percona_server_version}, Revision %{revision}
+%define compilation_comment_debug       Percona Server - Debug (GPL), Release %{percona_server_version}, Revision %{revision}
 %endif
 %if %{undefined compilation_comment_release}
-%define compilation_comment_release     Percona Server (GPL), Release rel%{percona_server_version}, Revision %{revision}
+%define compilation_comment_release     Percona Server (GPL), Release %{percona_server_version}, Revision %{revision}
 %endif
 
 # ----------------------------------------------------------------------------