Merge lp:~tplavcic/percona-server/bld-133-5.5 into lp:percona-server/5.5

[Tomislav Plavcic]

Package with the debug symbols was missing in the latest releases and is now added

Param build is:
http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/984/

Packages with debug symbols were tested by locally making package builds and they were created.

[Laurynas Biveinis (laurynas-biveinis)]

Please assign fixed bugs to yourself and set bug status to Fix Committed once you MP any fix.

review: Approve

=== modified file 'build-ps/debian/control'
--- build-ps/debian/control	2014-03-20 09:21:20 +0000
+++ build-ps/debian/control	2014-03-28 12:28:10 +0000
@@ -224,3 +224,15 @@
 Description: Percona Server 5.5 source
  This package includes the source code to Percona Server as configured before
  building.
+
+Package: percona-server-5.5-dbg
+Architecture: any
+Section: debug
+Depends: percona-server-server-5.5 (= ${binary:Version}), ${misc:Depends}
+Description: Debugging package for Percona Server
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
+ .
+ This package contains the debugging symbols for the Percona Server binaries.
 \ No newline at end of file
 
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules	2014-03-20 16:11:01 +0000
+++ build-ps/debian/rules	2014-03-28 12:28:10 +0000
@@ -62,9 +62,17 @@
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
+<<<<<<< TREE
 	    	CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \
+=======
+	    	CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -g -DBIG_JOINS=1"} \
+>>>>>>> MERGE-SOURCE
 	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
+<<<<<<< TREE
 	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \
+=======
+	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti"} \
+>>>>>>> MERGE-SOURCE
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
 		\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
@@ -272,7 +280,7 @@
 	dh_installinfo -a
 	dh_installlogcheck -a
 	dh_installchangelogs -a
-	dh_strip -a
+	dh_strip -a --dbg-package=percona-server-5.5-dbg
 	dh_lintian
 	dh_link -a	# .so muss nach .so.1.2.3 installier werden!
 	dh_compress -a
@@ -297,7 +305,3 @@
 
 override_dh_installinit:
 	dh_installinit --name=mysql --error-handler=:
-
-override_dh_strip:
-	dh_strip --dbg-package=percona-server-5.5-dbg
-