Merge lp:~percona-core/percona-xtrabackup/release-2.1.0-alpha1 into lp:percona-xtrabackup/2.1

Proposed by Ignacio Nin
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 530
Proposed branch: lp:~percona-core/percona-xtrabackup/release-2.1.0-alpha1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 74 lines (+4/-12)
6 files modified
VERSION (+1/-1)
utils/build-binary.sh (+0/-3)
utils/debian/control (+1/-1)
utils/debian/percona-xtrabackup.install (+0/-1)
utils/debian/rules (+1/-5)
utils/xtrabackup.spec (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-xtrabackup/release-2.1.0-alpha1
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+156999@code.launchpad.net

Description of the change

Changes for release 2.1.0-alpha1

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VERSION'
2--- VERSION 2013-03-04 07:35:20 +0000
3+++ VERSION 2013-04-03 23:44:22 +0000
4@@ -1,1 +1,1 @@
5-XTRABACKUP_VERSION=2.1.0
6+XTRABACKUP_VERSION=2.1.0alpha1
7
8=== modified file 'utils/build-binary.sh'
9--- utils/build-binary.sh 2013-03-11 19:11:29 +0000
10+++ utils/build-binary.sh 2013-04-03 23:44:22 +0000
11@@ -121,9 +121,6 @@
12 bash utils/build.sh xtradb
13 install -m 755 src/xtrabackup "$INSTALLDIR/bin"
14
15- bash utils/build.sh 5.1
16- install -m 755 src/xtrabackup_51 "$INSTALLDIR/bin"
17-
18 install -m 755 src/xbstream "$INSTALLDIR/bin"
19
20 install -m 755 src/xbcrypt "$INSTALLDIR/bin"
21
22=== modified file 'utils/debian/control'
23--- utils/debian/control 2013-03-26 20:38:26 +0000
24+++ utils/debian/control 2013-04-03 23:44:22 +0000
25@@ -3,7 +3,7 @@
26 Priority: extra
27 Maintainer: Percona Development <mysql-dev@percona.com>
28 Build-Depends: debhelper (>= 7.3), autotools-dev, libaio-dev, wget, automake,
29- libtool, bison, libncurses-dev, libz-dev, cmake, bzr
30+ libtool, bison, libncurses-dev, libz-dev, cmake, bzr, libgcrypt-dev
31 Standards-Version: 3.8.4
32 Homepage: https://launchpad.net/percona-xtrabackup
33 Vcs-Browser: http://bazaar.launchpad.net/~percona-dev/percona-xtrabackup/release-1.4/files
34
35=== modified file 'utils/debian/percona-xtrabackup.install'
36--- utils/debian/percona-xtrabackup.install 2013-03-11 19:11:29 +0000
37+++ utils/debian/percona-xtrabackup.install 2013-04-03 23:44:22 +0000
38@@ -1,5 +1,4 @@
39 xtrabackup usr/bin/
40-xtrabackup_51 usr/bin/
41 xtrabackup_55 usr/bin/
42 xbstream usr/bin/
43 xbcrypt usr/bin/
44
45=== modified file 'utils/debian/rules'
46--- utils/debian/rules 2013-03-11 19:11:29 +0000
47+++ utils/debian/rules 2013-04-03 23:44:22 +0000
48@@ -40,12 +40,8 @@
49 build-stamp: config.status
50 dh_testdir
51
52- # Add here commands to compile the package.
53- AUTO_DOWNLOAD=yes ./utils/build.sh 5.1
54- cp src/xtrabackup_51 src/xbstream src/xbcrypt .
55-
56 AUTO_DOWNLOAD=yes ./utils/build.sh xtradb
57- cp src/xtrabackup .
58+ cp src/xtrabackup src/xbstream src/xbcrypt .
59
60 AUTO_DOWNLOAD=yes ./utils/build.sh xtradb55
61 cp src/xtrabackup_55 .
62
63=== modified file 'utils/xtrabackup.spec'
64--- utils/xtrabackup.spec 2013-03-26 20:38:26 +0000
65+++ utils/xtrabackup.spec 2013-04-03 23:44:22 +0000
66@@ -21,7 +21,7 @@
67 BuildRoot: %{_tmppath}/%{name}-%{version}-root
68 Provides: xtrabackup
69 Obsoletes: xtrabackup
70-BuildRequires: libaio-devel
71+BuildRequires: libaio-devel, libgcrypt-devel
72 Requires: perl(DBD::mysql)
73
74 %description

Subscribers

People subscribed via source and target branches

to all changes: