Merge lp:~percona-core/percona-server/release-5.5.30-30.1 into lp:percona-server/5.5

Proposed by Ignacio Nin
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 490
Proposed branch: lp:~percona-core/percona-server/release-5.5.30-30.1
Merge into: lp:percona-server/5.5
Diff against target: 72 lines (+8/-13)
4 files modified
Makefile (+2/-2)
build/debian/rules (+1/-1)
build/percona-server.spec (+4/-9)
build/percona-shared-compat.spec (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.30-30.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+156408@code.launchpad.net

Description of the change

Changes for release 5.5.30-30.1, fixed

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-02-26 16:38:17 +0000
3+++ Makefile 2013-04-01 20:09:27 +0000
4@@ -1,7 +1,7 @@
5 FETCH_CMD=wget
6 MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
7-MYSQL_VERSION=5.5.29
8-PERCONA_SERVER_VERSION=rel30.0
9+MYSQL_VERSION=5.5.30
10+PERCONA_SERVER_VERSION=rel30.1
11 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
12 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
13 PERCONA_SERVER_SHORT_2 ?=Percona-Server
14
15=== modified file 'build/debian/rules'
16--- build/debian/rules 2013-03-13 07:36:26 +0000
17+++ build/debian/rules 2013-04-01 20:09:27 +0000
18@@ -9,7 +9,7 @@
19
20 feature_set="community"
21 major_version=30
22-minor_version=0
23+minor_version=1
24 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
25 server_suffix="-$(major_version).$(minor_version)"
26 prefix="/usr"
27
28=== modified file 'build/percona-server.spec'
29--- build/percona-server.spec 2013-03-26 07:16:53 +0000
30+++ build/percona-server.spec 2013-04-01 20:09:27 +0000
31@@ -25,10 +25,10 @@
32 %define mysql_vendor Oracle and/or its affiliates
33 %define percona_server_vendor Percona, Inc
34
35-%define mysql_version 5.5.29
36+%define mysql_version 5.5.30
37 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
38 %define majorversion 30
39-%define minorversion 0
40+%define minorversion 1
41 %define distribution rhel%{redhatversion}
42 %define percona_server_version rel%{majorversion}.%{minorversion}
43
44@@ -232,13 +232,8 @@
45 Packager: Percona MySQL Development Team <mysqldev@percona.com>
46 Vendor: %{percona_server_vendor}
47 Provides: mysql-server
48-#
49-%if %{rhel}
50-BuildRequires: pam-devel
51-%endif
52-#
53-BuildRequires: %{distro_buildreq}
54-#
55+BuildRequires: %{distro_buildreq} pam-devel
56+
57 # Think about what you use here since the first step is to
58 # run a rm -rf
59 BuildRoot: %{_tmppath}/%{name}-%{version}-build
60
61=== modified file 'build/percona-shared-compat.spec'
62--- build/percona-shared-compat.spec 2013-03-05 16:39:46 +0000
63+++ build/percona-shared-compat.spec 2013-04-01 20:09:27 +0000
64@@ -28,7 +28,7 @@
65 #
66 # Change this to match the version of the shared libs you want to include
67 #
68-%define version55 5.5.29
69+%define version55 5.5.30
70 %define version51 5.1.66
71 %define version50 5.0.91
72 %define version41 4.1.22

Subscribers

People subscribed via source and target branches