Merge lp:~percona-core/percona-server/release-5.1.69-14.7 into lp:percona-server/5.1

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 572
Merged at revision: 573
Proposed branch: lp:~percona-core/percona-server/release-5.1.69-14.7
Merge into: lp:percona-server/5.1
Diff against target: 41 lines (+4/-4)
3 files modified
build/debian/rules (+1/-1)
build/percona-server.spec (+2/-2)
build/percona-shared-compat.spec (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.1.69-14.7
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+168516@code.launchpad.net

Description of the change

Changes for release 5.1.69-14.7

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build/debian/rules'
--- build/debian/rules 2013-06-05 21:03:30 +0000
+++ build/debian/rules 2013-06-10 18:36:26 +0000
@@ -9,7 +9,7 @@
9TMP=$(CURDIR)/debian/tmp/9TMP=$(CURDIR)/debian/tmp/
1010
11major_version_default=1411major_version_default=14
12minor_version_default=612minor_version_default=7
1313
14ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)14ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
15ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)15ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
1616
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2013-06-06 03:39:30 +0000
+++ build/percona-server.spec 2013-06-10 18:36:26 +0000
@@ -14,9 +14,9 @@
14%define mysql_vendor Percona, Inc14%define mysql_vendor Percona, Inc
15%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')15%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
16%define community 116%define community 1
17%define mysqlversion 5.1.6817%define mysqlversion 5.1.69
18%define majorversion 1418%define majorversion 14
19%define minorversion 619%define minorversion 7
20%define distribution rhel%{redhatversion}20%define distribution rhel%{redhatversion}
21%define release rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}21%define release rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
2222
2323
=== modified file 'build/percona-shared-compat.spec'
--- build/percona-shared-compat.spec 2013-05-23 09:09:56 +0000
+++ build/percona-shared-compat.spec 2013-06-10 18:36:26 +0000
@@ -28,7 +28,7 @@
28#28#
29# Change this to match the version of the shared libs you want to include29# Change this to match the version of the shared libs you want to include
30#30#
31%define version51 5.1.6831%define version51 5.1.69
32%define version50 5.0.9132%define version50 5.0.91
33%define version41 4.1.2233%define version41 4.1.22
34%define version40 4.0.2734%define version40 4.0.27

Subscribers

People subscribed via source and target branches