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: no longer in the source branch.
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
=== modified file 'utils/build-dpkg.sh'
--- utils/build-dpkg.sh 2013-09-16 19:04:41 +0000
+++ utils/build-dpkg.sh 2014-07-10 10:18:29 +0000
@@ -105,7 +105,7 @@
105105
106 # Create the original tarball106 # Create the original tarball
107 mv "$SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz" \107 mv "$SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz" \
108 "$WORKDIR/percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"108 "$WORKDIR/percona-xtrabackup-21_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"
109109
110 (110 (
111 cd "$WORKDIR"111 cd "$WORKDIR"
@@ -115,10 +115,10 @@
115 dpkg-source -i'.*' -b "$SOURCEDIR"115 dpkg-source -i'.*' -b "$SOURCEDIR"
116116
117 # Unpack it117 # Unpack it
118 dpkg-source -x "percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION$PACKAGE_SUFFIX.dsc"118 dpkg-source -x "percona-xtrabackup-21_$XTRABACKUP_VERSION-$REVISION$PACKAGE_SUFFIX.dsc"
119119
120 (120 (
121 cd "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION"121 cd "percona-xtrabackup-21-$XTRABACKUP_VERSION-$REVISION"
122122
123 # Don't build transitional packages if requested123 # Don't build transitional packages if requested
124 if test "x$NOTRANSITIONAL" = "xyes"124 if test "x$NOTRANSITIONAL" = "xyes"
@@ -131,7 +131,7 @@
131 131
132 )132 )
133133
134 rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION"134 rm -rf "percona-xtrabackup-21-$XTRABACKUP_VERSION-$REVISION"
135 135
136 )136 )
137)137)
138138
=== modified file 'utils/debian/changelog'
--- utils/debian/changelog 2014-03-11 15:24:27 +0000
+++ utils/debian/changelog 2014-07-10 10:18:29 +0000
@@ -1,3 +1,9 @@
1percona-xtrabackup-21 (2.1.9-1) unstable; urgency=low
2
3 * Renamed package to percona-xtrabackup-21
4
5 -- Tomislav Plavcic <tomislav.plavcic@percona.com> Tue, 10 Jun 2014 10:56:15 +0200
6
1percona-xtrabackup (2.1.8-1) unstable; urgency=low7percona-xtrabackup (2.1.8-1) unstable; urgency=low
28
3 * Update to new upstream release Percona XtraBackup 2.1.89 * Update to new upstream release Percona XtraBackup 2.1.8
410
=== modified file 'utils/debian/control'
--- utils/debian/control 2014-05-02 09:20:46 +0000
+++ utils/debian/control 2014-07-10 10:18:29 +0000
@@ -1,4 +1,4 @@
1Source: percona-xtrabackup1Source: percona-xtrabackup-21
2Section: database2Section: database
3Priority: extra3Priority: extra
4Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>4Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
@@ -18,10 +18,11 @@
18Standards-Version: 3.9.518Standards-Version: 3.9.5
19Homepage: http://www.percona.com/software/percona-xtrabackup19Homepage: http://www.percona.com/software/percona-xtrabackup
2020
21Package: percona-xtrabackup21Package: percona-xtrabackup-21
22Architecture: any22Architecture: any
23Depends: libdbd-mysql-perl, ${misc:Depends}, ${shlibs:Depends}23Depends: libdbd-mysql-perl, ${misc:Depends}, ${shlibs:Depends}
24Provides: xtrabackup24Provides: xtrabackup
25Conflicts: percona-xtrabackup
25Breaks: xtrabackup (<< 2.0.0~)26Breaks: xtrabackup (<< 2.0.0~)
26Replaces: xtrabackup (<< 2.0.0~)27Replaces: xtrabackup (<< 2.0.0~)
27Enhances: mysql-server28Enhances: mysql-server
@@ -31,27 +32,17 @@
31 InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server 5.1 and32 InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server 5.1 and
32 5.5 servers, and has many advanced features.33 5.5 servers, and has many advanced features.
3334
34Package: percona-xtrabackup-dbg35Package: percona-xtrabackup-dbg-21
35Section: debug36Section: debug
36Architecture: any37Architecture: any
37Depends: percona-xtrabackup (= ${binary:Version}), ${misc:Depends}38Depends: percona-xtrabackup-21 (= ${binary:Version}), ${misc:Depends}
38Description: Debug symbols for Percona XtraBackup39Description: Debug symbols for Percona XtraBackup
39 Debug symbols for the binaries in percona-xtrabackup. Install this40 Debug symbols for the binaries in percona-xtrabackup. Install this
40 package if you need to run any of those with gdb.41 package if you need to run any of those with gdb.
4142
42Package: percona-xtrabackup-test43Package: percona-xtrabackup-test-21
43Architecture: any44Architecture: any
44Depends: mysql-client, percona-xtrabackup, python, ${misc:Depends}45Depends: mysql-client, percona-xtrabackup-21, python, ${misc:Depends}
45Description: Test suite for Percona XtraBackup46Description: Test suite for Percona XtraBackup
46 Test suite for Percona XtraBackup. Install this package if you intend47 Test suite for Percona XtraBackup. Install this package if you intend
47 to run XtraBackup's test suite.48 to run XtraBackup's test suite.
48
49Package: xtrabackup
50Architecture: all
51Section: oldlibs
52Depends: percona-xtrabackup, ${misc:Depends}
53Description: Transitional package for percona-xtrabackup
54 In 2.0.0, the XtraBackup package name was rebranded to
55 percona-xtrabackup. This package is an empty dummy package
56 that depends on percona-xtrabackup, and replaces older versions of
57 xtrabackup (2.0.0). It is not intended to be installed manually.
5849
=== renamed file 'utils/debian/percona-xtrabackup.docs' => 'utils/debian/percona-xtrabackup-21.docs'
=== renamed file 'utils/debian/percona-xtrabackup.install' => 'utils/debian/percona-xtrabackup-21.install'
=== renamed file 'utils/debian/percona-xtrabackup.links' => 'utils/debian/percona-xtrabackup-21.links'
=== renamed file 'utils/debian/percona-xtrabackup.lintian-overrides' => 'utils/debian/percona-xtrabackup-21.lintian-overrides'
=== renamed file 'utils/debian/percona-xtrabackup-test.dirs' => 'utils/debian/percona-xtrabackup-test-21.dirs'
=== renamed file 'utils/debian/percona-xtrabackup-test.install' => 'utils/debian/percona-xtrabackup-test-21.install'
=== renamed file 'utils/debian/percona-xtrabackup-test.lintian-overrides' => 'utils/debian/percona-xtrabackup-test-21.lintian-overrides'
=== modified file 'utils/debian/rules'
--- utils/debian/rules 2013-11-27 03:29:12 +0000
+++ utils/debian/rules 2014-07-10 10:18:29 +0000
@@ -40,7 +40,7 @@
40 #docbook-to-man debian/xtrabackup.sgml > xtrabackup.140 #docbook-to-man debian/xtrabackup.sgml > xtrabackup.1
4141
42override_dh_strip:42override_dh_strip:
43 dh_strip --dbg-package=percona-xtrabackup-dbg43 dh_strip --dbg-package=percona-xtrabackup-dbg-21
4444
45%:45%:
46 dh $@46 dh $@
4747
=== modified file 'utils/xtrabackup.spec'
--- utils/xtrabackup.spec 2014-03-07 15:36:14 +0000
+++ utils/xtrabackup.spec 2014-07-10 10:18:29 +0000
@@ -10,7 +10,7 @@
10%define __os_install_post /usr/lib/rpm/brp-compress10%define __os_install_post /usr/lib/rpm/brp-compress
1111
12Summary: XtraBackup online backup for MySQL / InnoDB 12Summary: XtraBackup online backup for MySQL / InnoDB
13Name: percona-xtrabackup13Name: percona-xtrabackup-21
14Version: %{xtrabackup_version}14Version: %{xtrabackup_version}
15Release: %{release}15Release: %{release}
16Group: Server/Databases16Group: Server/Databases
@@ -19,6 +19,7 @@
19URL: http://www.percona.com/software/percona-xtrabackup/19URL: http://www.percona.com/software/percona-xtrabackup/
20Source: percona-xtrabackup-%{xtrabackup_version}.tar.gz20Source: percona-xtrabackup-%{xtrabackup_version}.tar.gz
21BuildRoot: %{_tmppath}/%{name}-%{version}-root21BuildRoot: %{_tmppath}/%{name}-%{version}-root
22Conflicts: percona-xtrabackup
22Provides: xtrabackup23Provides: xtrabackup
23Obsoletes: xtrabackup24Obsoletes: xtrabackup
24BuildRequires: libaio-devel, libgcrypt-devel25BuildRequires: libaio-devel, libgcrypt-devel
@@ -27,18 +28,21 @@
27%description28%description
28Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines.29Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines.
2930
30%package test31%package -n percona-xtrabackup-test-21
31Summary: Test suite for Percona Xtrabackup32Summary: Test suite for Percona Xtrabackup
32Group: Applications/Databases33Group: Applications/Databases
33Requires: percona-xtrabackup34Requires: percona-xtrabackup-21
34AutoReqProv: no35AutoReqProv: no
35Requires: /usr/bin/mysql36Requires: /usr/bin/mysql
3637
37%description test38%description -n percona-xtrabackup-test-21
38This package contains the test suite for Percona Xtrabackup39This package contains the test suite for Percona Xtrabackup
3940
4041
41%changelog42%changelog
43* Tue Jun 10 2014 Tomislav Plavcic
44- Changed package name to percona-xtrabackup-21
45
42* Thu Mar 06 2014 Alexey Bychko46* Thu Mar 06 2014 Alexey Bychko
43- Version 2.1.847- Version 2.1.8
4448
@@ -68,7 +72,7 @@
6872
6973
70%prep74%prep
71%setup -q75%setup -q -n percona-xtrabackup-%{version}
7276
7377
74%build78%build
@@ -123,7 +127,8 @@
123%{_bindir}/xbcrypt127%{_bindir}/xbcrypt
124%doc COPYING128%doc COPYING
125129
126%files -n percona-xtrabackup-test130%files -n percona-xtrabackup-test-21
131%defattr(-,root,root)
127%{_datadir}/percona-xtrabackup-test132%{_datadir}/percona-xtrabackup-test
128133
129###134###

Subscribers

People subscribed via source and target branches