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

Proposed by Tomislav Plavcic on 2014-03-28
Status: Merged
Approved by: Laurynas Biveinis on 2014-03-31
Approved revision: 625
Merged at revision: 649
Proposed branch: lp:~tplavcic/percona-server/bld-133-5.5
Merge into: lp:percona-server/5.5
Diff against target: 59 lines (+21/-5) (has conflicts)
2 files modified
build-ps/debian/control (+12/-0)
build-ps/debian/rules (+9/-5)
Text conflict in build-ps/debian/rules
To merge this branch: bzr merge lp:~tplavcic/percona-server/bld-133-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-03-28 Approve on 2014-03-31
Review via email: mp+213246@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build-ps/debian/control'
2--- build-ps/debian/control 2014-03-20 09:21:20 +0000
3+++ build-ps/debian/control 2014-03-28 12:28:10 +0000
4@@ -224,3 +224,15 @@
5 Description: Percona Server 5.5 source
6 This package includes the source code to Percona Server as configured before
7 building.
8+
9+Package: percona-server-5.5-dbg
10+Architecture: any
11+Section: debug
12+Depends: percona-server-server-5.5 (= ${binary:Version}), ${misc:Depends}
13+Description: Debugging package for Percona Server
14+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
15+ database server. SQL (Structured Query Language) is the most popular database
16+ query language in the world. The main goals of Percona Server are speed,
17+ robustness and ease of use.
18+ .
19+ This package contains the debugging symbols for the Percona Server binaries.
20\ No newline at end of file
21
22=== modified file 'build-ps/debian/rules'
23--- build-ps/debian/rules 2014-03-20 16:11:01 +0000
24+++ build-ps/debian/rules 2014-03-28 12:28:10 +0000
25@@ -62,9 +62,17 @@
26 ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
27 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
28 CC=$${MYSQL_BUILD_CC:-gcc} \
29+<<<<<<< TREE
30 CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \
31+=======
32+ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -g -DBIG_JOINS=1"} \
33+>>>>>>> MERGE-SOURCE
34 CXX=$${MYSQL_BUILD_CXX:-g++} \
35+<<<<<<< TREE
36 CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \
37+=======
38+ CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti"} \
39+>>>>>>> MERGE-SOURCE
40 cmake -DCMAKE_INSTALL_PREFIX=/usr \
41 \
42 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
43@@ -272,7 +280,7 @@
44 dh_installinfo -a
45 dh_installlogcheck -a
46 dh_installchangelogs -a
47- dh_strip -a
48+ dh_strip -a --dbg-package=percona-server-5.5-dbg
49 dh_lintian
50 dh_link -a # .so muss nach .so.1.2.3 installier werden!
51 dh_compress -a
52@@ -297,7 +305,3 @@
53
54 override_dh_installinit:
55 dh_installinit --name=mysql --error-handler=:
56-
57-override_dh_strip:
58- dh_strip --dbg-package=percona-server-5.5-dbg
59-

Subscribers

People subscribed via source and target branches