Merge lp:~tplavcic/percona-xtrabackup/2.1.9-rename-pkg into lp:percona-xtrabackup/2.1

Proposed by Tomislav Plavcic
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 746
Merged at revision: 754
Proposed branch: lp:~tplavcic/percona-xtrabackup/2.1.9-rename-pkg
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 188 lines (+29/-27)
5 files modified
utils/build-dpkg.sh (+4/-4)
utils/debian/changelog (+6/-0)
utils/debian/control (+7/-16)
utils/debian/rules (+1/-1)
utils/xtrabackup.spec (+11/-6)
To merge this branch: bzr merge lp:~tplavcic/percona-xtrabackup/2.1.9-rename-pkg
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+226269@code.launchpad.net

Description of the change

This branch was used to produce packages for PXB 2.1 which were renamed to percona-xtrabackup-21 so that PXB 2.2.3 can be just percona-xtrabackup.
Since I think this should be permanent change for PXB 2.1 this should be merged to PXB 2.1 trunk.

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 'utils/build-dpkg.sh'
2--- utils/build-dpkg.sh 2013-09-16 19:04:41 +0000
3+++ utils/build-dpkg.sh 2014-07-10 10:18:29 +0000
4@@ -105,7 +105,7 @@
5
6 # Create the original tarball
7 mv "$SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz" \
8- "$WORKDIR/percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"
9+ "$WORKDIR/percona-xtrabackup-21_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"
10
11 (
12 cd "$WORKDIR"
13@@ -115,10 +115,10 @@
14 dpkg-source -i'.*' -b "$SOURCEDIR"
15
16 # Unpack it
17- dpkg-source -x "percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION$PACKAGE_SUFFIX.dsc"
18+ dpkg-source -x "percona-xtrabackup-21_$XTRABACKUP_VERSION-$REVISION$PACKAGE_SUFFIX.dsc"
19
20 (
21- cd "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION"
22+ cd "percona-xtrabackup-21-$XTRABACKUP_VERSION-$REVISION"
23
24 # Don't build transitional packages if requested
25 if test "x$NOTRANSITIONAL" = "xyes"
26@@ -131,7 +131,7 @@
27
28 )
29
30- rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION"
31+ rm -rf "percona-xtrabackup-21-$XTRABACKUP_VERSION-$REVISION"
32
33 )
34 )
35
36=== modified file 'utils/debian/changelog'
37--- utils/debian/changelog 2014-03-11 15:24:27 +0000
38+++ utils/debian/changelog 2014-07-10 10:18:29 +0000
39@@ -1,3 +1,9 @@
40+percona-xtrabackup-21 (2.1.9-1) unstable; urgency=low
41+
42+ * Renamed package to percona-xtrabackup-21
43+
44+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Tue, 10 Jun 2014 10:56:15 +0200
45+
46 percona-xtrabackup (2.1.8-1) unstable; urgency=low
47
48 * Update to new upstream release Percona XtraBackup 2.1.8
49
50=== modified file 'utils/debian/control'
51--- utils/debian/control 2014-05-02 09:20:46 +0000
52+++ utils/debian/control 2014-07-10 10:18:29 +0000
53@@ -1,4 +1,4 @@
54-Source: percona-xtrabackup
55+Source: percona-xtrabackup-21
56 Section: database
57 Priority: extra
58 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
59@@ -18,10 +18,11 @@
60 Standards-Version: 3.9.5
61 Homepage: http://www.percona.com/software/percona-xtrabackup
62
63-Package: percona-xtrabackup
64+Package: percona-xtrabackup-21
65 Architecture: any
66 Depends: libdbd-mysql-perl, ${misc:Depends}, ${shlibs:Depends}
67 Provides: xtrabackup
68+Conflicts: percona-xtrabackup
69 Breaks: xtrabackup (<< 2.0.0~)
70 Replaces: xtrabackup (<< 2.0.0~)
71 Enhances: mysql-server
72@@ -31,27 +32,17 @@
73 InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server 5.1 and
74 5.5 servers, and has many advanced features.
75
76-Package: percona-xtrabackup-dbg
77+Package: percona-xtrabackup-dbg-21
78 Section: debug
79 Architecture: any
80-Depends: percona-xtrabackup (= ${binary:Version}), ${misc:Depends}
81+Depends: percona-xtrabackup-21 (= ${binary:Version}), ${misc:Depends}
82 Description: Debug symbols for Percona XtraBackup
83 Debug symbols for the binaries in percona-xtrabackup. Install this
84 package if you need to run any of those with gdb.
85
86-Package: percona-xtrabackup-test
87+Package: percona-xtrabackup-test-21
88 Architecture: any
89-Depends: mysql-client, percona-xtrabackup, python, ${misc:Depends}
90+Depends: mysql-client, percona-xtrabackup-21, python, ${misc:Depends}
91 Description: Test suite for Percona XtraBackup
92 Test suite for Percona XtraBackup. Install this package if you intend
93 to run XtraBackup's test suite.
94-
95-Package: xtrabackup
96-Architecture: all
97-Section: oldlibs
98-Depends: percona-xtrabackup, ${misc:Depends}
99-Description: Transitional package for percona-xtrabackup
100- In 2.0.0, the XtraBackup package name was rebranded to
101- percona-xtrabackup. This package is an empty dummy package
102- that depends on percona-xtrabackup, and replaces older versions of
103- xtrabackup (2.0.0). It is not intended to be installed manually.
104
105=== renamed file 'utils/debian/percona-xtrabackup.docs' => 'utils/debian/percona-xtrabackup-21.docs'
106=== renamed file 'utils/debian/percona-xtrabackup.install' => 'utils/debian/percona-xtrabackup-21.install'
107=== renamed file 'utils/debian/percona-xtrabackup.links' => 'utils/debian/percona-xtrabackup-21.links'
108=== renamed file 'utils/debian/percona-xtrabackup.lintian-overrides' => 'utils/debian/percona-xtrabackup-21.lintian-overrides'
109=== renamed file 'utils/debian/percona-xtrabackup-test.dirs' => 'utils/debian/percona-xtrabackup-test-21.dirs'
110=== renamed file 'utils/debian/percona-xtrabackup-test.install' => 'utils/debian/percona-xtrabackup-test-21.install'
111=== renamed file 'utils/debian/percona-xtrabackup-test.lintian-overrides' => 'utils/debian/percona-xtrabackup-test-21.lintian-overrides'
112=== modified file 'utils/debian/rules'
113--- utils/debian/rules 2013-11-27 03:29:12 +0000
114+++ utils/debian/rules 2014-07-10 10:18:29 +0000
115@@ -40,7 +40,7 @@
116 #docbook-to-man debian/xtrabackup.sgml > xtrabackup.1
117
118 override_dh_strip:
119- dh_strip --dbg-package=percona-xtrabackup-dbg
120+ dh_strip --dbg-package=percona-xtrabackup-dbg-21
121
122 %:
123 dh $@
124
125=== modified file 'utils/xtrabackup.spec'
126--- utils/xtrabackup.spec 2014-03-07 15:36:14 +0000
127+++ utils/xtrabackup.spec 2014-07-10 10:18:29 +0000
128@@ -10,7 +10,7 @@
129 %define __os_install_post /usr/lib/rpm/brp-compress
130
131 Summary: XtraBackup online backup for MySQL / InnoDB
132-Name: percona-xtrabackup
133+Name: percona-xtrabackup-21
134 Version: %{xtrabackup_version}
135 Release: %{release}
136 Group: Server/Databases
137@@ -19,6 +19,7 @@
138 URL: http://www.percona.com/software/percona-xtrabackup/
139 Source: percona-xtrabackup-%{xtrabackup_version}.tar.gz
140 BuildRoot: %{_tmppath}/%{name}-%{version}-root
141+Conflicts: percona-xtrabackup
142 Provides: xtrabackup
143 Obsoletes: xtrabackup
144 BuildRequires: libaio-devel, libgcrypt-devel
145@@ -27,18 +28,21 @@
146 %description
147 Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines.
148
149-%package test
150+%package -n percona-xtrabackup-test-21
151 Summary: Test suite for Percona Xtrabackup
152 Group: Applications/Databases
153-Requires: percona-xtrabackup
154+Requires: percona-xtrabackup-21
155 AutoReqProv: no
156 Requires: /usr/bin/mysql
157
158-%description test
159+%description -n percona-xtrabackup-test-21
160 This package contains the test suite for Percona Xtrabackup
161
162
163 %changelog
164+* Tue Jun 10 2014 Tomislav Plavcic
165+- Changed package name to percona-xtrabackup-21
166+
167 * Thu Mar 06 2014 Alexey Bychko
168 - Version 2.1.8
169
170@@ -68,7 +72,7 @@
171
172
173 %prep
174-%setup -q
175+%setup -q -n percona-xtrabackup-%{version}
176
177
178 %build
179@@ -123,7 +127,8 @@
180 %{_bindir}/xbcrypt
181 %doc COPYING
182
183-%files -n percona-xtrabackup-test
184+%files -n percona-xtrabackup-test-21
185+%defattr(-,root,root)
186 %{_datadir}/percona-xtrabackup-test
187
188 ###

Subscribers

People subscribed via source and target branches