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

Proposed by Ignacio Nin on 2013-09-04
Status: Merged
Approved by: Alexey Kopytov on 2013-09-04
Approved revision: 588
Merged at revision: 587
Proposed branch: lp:~percona-core/percona-xtrabackup/release-2.0.8
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 159 lines (+26/-23)
5 files modified
VERSION (+1/-1)
utils/debian/changelog (+6/-0)
utils/debian/control (+7/-16)
utils/debian/rules (+1/-1)
utils/xtrabackup.spec (+11/-5)
To merge this branch: bzr merge lp:~percona-core/percona-xtrabackup/release-2.0.8
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2013-09-04 Approve on 2013-09-04
Review via email: mp+183946@code.launchpad.net

Description of the change

Changes for release 2.0.8.

These include renaming the packages to percona-xtrabackup-20-*

To post a comment you must log in.
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 'VERSION'
2--- VERSION 2013-05-04 16:03:49 +0000
3+++ VERSION 2013-09-04 18:16:07 +0000
4@@ -1,1 +1,1 @@
5-XTRABACKUP_VERSION=2.0.7
6+XTRABACKUP_VERSION=2.0.8
7
8=== modified file 'utils/debian/changelog'
9--- utils/debian/changelog 2013-04-22 20:11:35 +0000
10+++ utils/debian/changelog 2013-09-04 18:16:07 +0000
11@@ -1,3 +1,9 @@
12+percona-xtrabackup-20 (2.0.8) unstable; urgency=low
13+
14+ * Change name of the packages to percona-xtrabackup-20*
15+
16+ -- Ignacio Nin <ignacio.nin@percona.com> Fri, 30 Aug 2013 11:00:00 -0300
17+
18 percona-xtrabackup (2.0.6) unstable; urgency=low
19
20 * Update compat level to 7
21
22=== modified file 'utils/debian/control'
23--- utils/debian/control 2013-05-03 00:19:28 +0000
24+++ utils/debian/control 2013-09-04 18:16:07 +0000
25@@ -1,4 +1,4 @@
26-Source: percona-xtrabackup
27+Source: percona-xtrabackup-20
28 Section: misc
29 Priority: extra
30 Maintainer: Percona Development <mysql-dev@percona.com>
31@@ -9,39 +9,30 @@
32 Vcs-Browser: http://bazaar.launchpad.net/~percona-dev/percona-xtrabackup/release-1.4/files
33 Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~percona-dev/percona-xtrabackup/release-1.4/
34
35-Package: percona-xtrabackup
36+Package: percona-xtrabackup-20
37 Architecture: any
38 Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-client
39 Provides: xtrabackup
40 Breaks: xtrabackup (<< 2.0.0~)
41 Replaces: xtrabackup (<< 2.0.0~)
42+Conflicts: percona-xtrabackup
43 Description: Open source backup tool for InnoDB and XtraDB
44 Percona XtraBackup is an open-source hot backup utility for MySQL that
45 doesn't lock your database during the backup. It can back up data from
46 InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server 5.0, 5.1 and
47 5.5 servers, and has many advanced features.
48
49-Package: percona-xtrabackup-dbg
50+Package: percona-xtrabackup-20-dbg
51 Section: debug
52 Architecture: any
53-Depends: percona-xtrabackup (= ${binary:Version}), ${misc:Depends}
54+Depends: percona-xtrabackup-20 (= ${binary:Version}), ${misc:Depends}
55 Description: Debug symbols for Percona XtraBackup
56 Debug symbols for the binaries in percona-xtrabackup. Install this
57 package if you need to run any of those with gdb.
58
59-Package: percona-xtrabackup-test
60+Package: percona-xtrabackup-20-test
61 Architecture: any
62-Depends: percona-xtrabackup, python, ${misc:Depends}
63+Depends: percona-xtrabackup-20, python, ${misc:Depends}
64 Description: Test suite for Percona XtraBackup
65 Test suite for Percona XtraBackup. Install this package if you intend
66 to run XtraBackup's test suite.
67-
68-Package: xtrabackup
69-Architecture: all
70-Section: oldlibs
71-Depends: percona-xtrabackup, ${misc:Depends}
72-Description: Transitional package for percona-xtrabackup
73- In 2.0.0, the XtraBackup package name was rebranded to
74- percona-xtrabackup. This package is an empty dummy package
75- that depends on percona-xtrabackup, and replaces older versions of
76- xtrabackup (2.0.0). It is not intended to be installed manually.
77
78=== renamed file 'utils/debian/percona-xtrabackup-test.dirs' => 'utils/debian/percona-xtrabackup-20-test.dirs'
79=== renamed file 'utils/debian/percona-xtrabackup-test.install' => 'utils/debian/percona-xtrabackup-20-test.install'
80=== renamed file 'utils/debian/percona-xtrabackup-test.lintian-overrides' => 'utils/debian/percona-xtrabackup-20-test.lintian-overrides'
81=== renamed file 'utils/debian/percona-xtrabackup.dirs' => 'utils/debian/percona-xtrabackup-20.dirs'
82=== renamed file 'utils/debian/percona-xtrabackup.docs' => 'utils/debian/percona-xtrabackup-20.docs'
83=== renamed file 'utils/debian/percona-xtrabackup.install' => 'utils/debian/percona-xtrabackup-20.install'
84=== renamed file 'utils/debian/percona-xtrabackup.links' => 'utils/debian/percona-xtrabackup-20.links'
85=== renamed file 'utils/debian/percona-xtrabackup.lintian-overrides' => 'utils/debian/percona-xtrabackup-20.lintian-overrides'
86=== modified file 'utils/debian/rules'
87--- utils/debian/rules 2013-04-22 19:54:56 +0000
88+++ utils/debian/rules 2013-09-04 18:16:07 +0000
89@@ -52,7 +52,7 @@
90 #docbook-to-man debian/xtrabackup.sgml > xtrabackup.1
91
92 override_dh_strip:
93- dh_strip --dbg-package=percona-xtrabackup-dbg
94+ dh_strip --dbg-package=percona-xtrabackup-20-dbg
95
96 %:
97 dh $@
98
99=== modified file 'utils/xtrabackup.spec'
100--- utils/xtrabackup.spec 2013-05-02 20:17:02 +0000
101+++ utils/xtrabackup.spec 2013-09-04 18:16:07 +0000
102@@ -10,7 +10,7 @@
103 %define __os_install_post /usr/lib/rpm/brp-compress
104
105 Summary: XtraBackup online backup for MySQL / InnoDB
106-Name: percona-xtrabackup
107+Name: percona-xtrabackup-20
108 Version: %{xtrabackup_version}
109 Release: %{release}
110 Group: Server/Databases
111@@ -22,7 +22,8 @@
112 Requires: /usr/bin/mysql
113 Provides: xtrabackup
114 Obsoletes: xtrabackup
115-BuildRequires: libaio-devel
116+Conflicts: percona-xtrabackup
117+BuildRequires: wget bzr automake autoconf libtool make cmake gcc-c++ bison libaio-devel zlib-devel ncurses-devel
118
119 %description
120 Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines.
121@@ -30,7 +31,7 @@
122 %package test
123 Summary: Test suite for Percona Xtrabackup
124 Group: Applications/Databases
125-Requires: percona-xtrabackup
126+Requires: percona-xtrabackup-20
127 AutoReqProv: no
128
129 %description test
130@@ -38,6 +39,11 @@
131
132
133 %changelog
134+* Fri Aug 30 2013 Ignacio Nin
135+- Version 2.0.8
136+- Update package name to `percona-xtrabackup-20', so it's able to share
137+ repository with 2.1 packages.
138+
139 * Mon Sep 27 2010 Aleksandr Kuzminsky
140 - Version 1.4
141
142@@ -52,7 +58,7 @@
143
144
145 %prep
146-%setup -q
147+%setup -q -n percona-xtrabackup-%{xtrabackup_version}
148
149
150 %build
151@@ -108,7 +114,7 @@
152 %{_bindir}/xbstream
153 %doc COPYING
154
155-%files -n percona-xtrabackup-test
156+%files test
157 %{_datadir}/percona-xtrabackup-test
158
159 ###

Subscribers

People subscribed via source and target branches