Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp:~percona-core/percona-xtrabackup/release-2.0.0 into lp:percona-xtrabackup/2.0

  1. release-2.0.0
  2. Merge into 2.0
Proposed by Ignacio Nin
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 419
Proposed branch: lp:~percona-core/percona-xtrabackup/release-2.0.0
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 148 lines (+24/-13)
7 files modified
VERSION (+1/-1)
utils/build-binary.sh (+6/-3)
utils/build-dpkg.sh (+2/-1)
utils/debian/control (+8/-2)
utils/debian/docs (+1/-2)
utils/debian/rules (+2/-2)
utils/xtrabackup.spec (+4/-2)
To merge this branch: bzr merge lp:~percona-core/percona-xtrabackup/release-2.0.0
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+100983@code.launchpad.net

This proposal supersedes a proposal from 2012-04-05.

Description of the change

Changes for Release 2.0.0.

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 2012-03-29 22:54:43 +0000
3+++ VERSION 2012-04-05 14:50:46 +0000
4@@ -1,1 +1,1 @@
5-XTRABACKUP_VERSION=1.9.2
6+XTRABACKUP_VERSION=2.0.0
7
8=== modified file 'utils/build-binary.sh'
9--- utils/build-binary.sh 2012-03-19 16:49:12 +0000
10+++ utils/build-binary.sh 2012-04-05 14:50:46 +0000
11@@ -91,8 +91,8 @@
12 export MAKE_JFLAG=-j4
13
14 # Create a temporary working directory
15-INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d xtrabackup-build.XXXXXX)"
16-INSTALLDIR="$WORKDIR_ABS/$INSTALLDIR/percona-xtrabackup-$XTRABACKUP_VERSION" # Make it absolute
17+BASEINSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d xtrabackup-build.XXXXXX)"
18+INSTALLDIR="$WORKDIR_ABS/$BASEINSTALLDIR/percona-xtrabackup-$XTRABACKUP_VERSION" # Make it absolute
19
20 mkdir "$INSTALLDIR"
21
22@@ -113,6 +113,7 @@
23
24 # Install the files
25 mkdir "$INSTALLDIR/bin" "$INSTALLDIR/share"
26+ mkdir -p "$INSTALLDIR/share/doc/percona-xtrabackup"
27
28 bash utils/build.sh xtradb55
29 install -m 755 src/xtrabackup_55 "$INSTALLDIR/bin"
30@@ -128,6 +129,8 @@
31 install -m 755 innobackupex "$INSTALLDIR/bin"
32 ln -s innobackupex "$INSTALLDIR/bin/innobackupex-1.5.1"
33
34+ install -m 644 COPYING "$INSTALLDIR/share/doc/percona-xtrabackup"
35+
36 cp -R test "$INSTALLDIR/share/percona-xtrabackup-test"
37
38 ) || false
39@@ -142,5 +145,5 @@
40 ) || false
41
42 # Clean up
43-rm -rf "$INSTALLDIR"
44+rm -rf "$WORKDIR_ABS/$BASEINSTALLDIR"
45
46
47=== modified file 'utils/build-dpkg.sh'
48--- utils/build-dpkg.sh 2012-03-16 11:44:09 +0000
49+++ utils/build-dpkg.sh 2012-04-05 14:50:46 +0000
50@@ -12,7 +12,7 @@
51 set -ue
52
53 # Examine parameters
54-go_out="$(getopt --options "k:Kb" --longoptions key:,nosign,binary \
55+go_out="$(getopt --options "k:KbB" --longoptions key:,nosign,binary,binarydep \
56 --name "$(basename "$0")" -- "$@")"
57 test $? -eq 0 || exit 1
58 eval set -- $go_out
59@@ -27,6 +27,7 @@
60 -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;
61 -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;
62 -b | --binary ) shift; BINARY='-b';;
63+ -B | --binarydep ) shift; BINARY='-B';;
64 esac
65 done
66
67
68=== modified file 'utils/debian/control'
69--- utils/debian/control 2012-03-15 15:23:15 +0000
70+++ utils/debian/control 2012-04-05 14:50:46 +0000
71@@ -12,7 +12,13 @@
72 Architecture: any
73 Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-client
74 Provides: xtrabackup
75-Conflicts: xtrabackup
76-Replaces: xtrabackup
77+Breaks: xtrabackup (<< 2.0.0~)
78+Replaces: xtrabackup (<< 2.0.0~)
79 Description: Open source backup tool for InnoDB and XtraDB
80 Open source backup tool for InnoDB and XtraDB
81+
82+Package: xtrabackup
83+Architecture: all
84+Section: oldlibs
85+Depends: percona-xtrabackup, ${misc:Depends}
86+Description: Transitional package for percona-xtrabackup
87
88=== modified file 'utils/debian/docs'
89--- utils/debian/docs 2010-07-04 12:15:06 +0000
90+++ utils/debian/docs 2012-04-05 14:50:46 +0000
91@@ -1,2 +1,1 @@
92-CMakeLists.txt
93-README
94+COPYING
95
96=== modified file 'utils/debian/rules'
97--- utils/debian/rules 2012-03-15 15:23:15 +0000
98+++ utils/debian/rules 2012-04-05 14:50:46 +0000
99@@ -78,7 +78,7 @@
100 install -m 755 xbstream $(CURDIR)/debian/percona-xtrabackup/usr/bin
101 install -m 755 innobackupex $(CURDIR)/debian/percona-xtrabackup/usr/bin
102 ln -s innobackupex $(CURDIR)/debian/percona-xtrabackup/usr/bin/innobackupex-1.5.1
103- cp -R test $(CURDIR)/debian/percona-xtrabackup/usr/share/xtrabackup-test
104+ cp -R test $(CURDIR)/debian/percona-xtrabackup/usr/share/percona-xtrabackup-test
105
106 # Build architecture-independent files here.
107 binary-indep: install
108@@ -89,7 +89,7 @@
109 dh_testdir
110 dh_testroot
111 # dh_installchangelogs ChangeLog
112-# dh_installdocs
113+ dh_installdocs
114 # dh_installexamples
115 # dh_install
116 # dh_installmenu
117
118=== modified file 'utils/xtrabackup.spec'
119--- utils/xtrabackup.spec 2012-03-19 16:49:12 +0000
120+++ utils/xtrabackup.spec 2012-04-05 14:50:46 +0000
121@@ -23,6 +23,7 @@
122 Provides: xtrabackup
123 Obsoletes: xtrabackup
124 BuildRequires: libaio-devel
125+AutoReqProv: no
126
127 %description
128 Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines.
129@@ -71,7 +72,7 @@
130 ln -s innobackupex %{buildroot}%{_bindir}/innobackupex-1.5.1
131 install -m 755 xtrabackup_51 %{buildroot}%{_bindir}
132 install -m 755 xbstream %{buildroot}%{_bindir}
133-cp -R test %{buildroot}%{_datadir}/xtrabackup-test
134+cp -R test %{buildroot}%{_datadir}/percona-xtrabackup-test
135
136 %clean
137 [ "%{buildroot}" != '/' ] && rm -rf %{buildroot}
138@@ -84,8 +85,9 @@
139 %{_bindir}/xtrabackup_51
140 %{_bindir}/xtrabackup_55
141 %{_bindir}/xbstream
142-%{_datadir}/xtrabackup-test
143+%{_datadir}/percona-xtrabackup-test
144
145+%doc COPYING
146
147 ###
148 ### eof

Subscribers

People subscribed via source and target branches