Merge lp:~percona-core/percona-xtrabackup/xbcloud into lp:percona-xtrabackup/2.3

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

Why the storage/innobase/xtrabackup/utils/debian/percona-xtrabackup* => storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-23* rename?

review: Needs Information

[Alexey Kopytov (akopytov)]

Also, how exactly are the packages names? Is it 2.3.0alpha1 or 2.3.0-alpha1? We used the latter scheme in the past, but I'm not sure we are consistent with it in this release.

[Tomislav Plavcic (tplavcic)]

The package was renamed so it can go into testing repository and not mess with the real percona-xtrabackup package (so for example people that want to test next release of percona-xtrabackup install that one which later goes into main repository and they also can install percona-xtrabackup-23 to test that one).
Because of that this branch (at least as it is should not be merged to percona-xtrabackup - because of the packages renaming which are not good for real release) - not sure if this wasn't comunicated well or misunderstanding - I didn't know that this branch will be merged into main branch - I tought it is just a branch created for that one build.
Anyway if you wish I can revert my commits (parts) that rename packages and then it can possibly be merged?
Regarding package names they are like below (ended up like that when I inserted alpha1 into version - checked with AlexeyB and Hrvoje and there were no objections):
percona-xtrabackup-23-2.3.0-5047.alpha1.el6.x86_64.rpm
percona-xtrabackup-23_2.3.0-5047.alpha1-1.precise_amd64.deb

[Alexey Kopytov (akopytov)]

No, I was referring to directory renaming in the source code tree. Do we really need them.

As to package names. I think we should be consistent. If we used x.y.z-alphaN for PXB 2.1/2.2, we should follow the same naming scheme.

I understand it's too late to fix 2.3.0alpha1 now, this is more a request for future 2.3 releases.

As in, this branch will be merged anyway, because we have already released it (note that lp:percona-xtrabackup now points to the new trunk, lp:percona-xtrabackup/2.3).

I'm just trying to clarify a few things as a part of the "review".

[Tomislav Plavcic (tplavcic)]

Debian files were renamed because they need to match the package name (that's part of the packaging).
But if the PXB 2.3 is becoming a new trunk we need to agree on future releases and package names and how is transition going to happen.
I agree on alpha1 naming issue - will fix it the next release.

[Alexey Kopytov (akopytov)]

OK, I see, thanks.

Packaging naming has already been discussed with AlexeyB before. We agreed that we need to have explicit versions in package names and make 'percona-xtrabackup' a metapackage that would pull the current GA release series as a dependency.

However, I think it should be percona-xtrabackup-2.3 (i.e. with a dot between major/minor versions). Again, for consistency.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'XB_VERSION'
--- XB_VERSION	2014-09-26 09:09:04 +0000
+++ XB_VERSION	2014-11-05 13:32:25 +0000
@@ -1,4 +1,4 @@
 XB_VERSION_MAJOR=2
-XB_VERSION_MINOR=2
-XB_VERSION_PATCH=5
-XB_VERSION_EXTRA=
+XB_VERSION_MINOR=3
+XB_VERSION_PATCH=0
+XB_VERSION_EXTRA=alpha1

=== modified file 'storage/innobase/xtrabackup/utils/debian/changelog'
--- storage/innobase/xtrabackup/utils/debian/changelog	2014-09-26 09:09:04 +0000
+++ storage/innobase/xtrabackup/utils/debian/changelog	2014-11-05 13:32:25 +0000
@@ -1,3 +1,9 @@
+percona-xtrabackup-23 (2.3.0alpha1) unstable; urgency=low
+
+  * Update to new release Percona XtraBackup 2.3.0alpha1
+
+ -- Tomislav Plavcic <[e-mail]>  Tue, 28 Oct 2014 10:34:53 +0100
+
 percona-xtrabackup (2.2.5) unstable; urgency=low
 
   * Update to new release Percona XtraBackup 2.2.5

=== modified file 'storage/innobase/xtrabackup/utils/debian/control'
--- storage/innobase/xtrabackup/utils/debian/control	2014-11-05 13:32:25 +0000
+++ storage/innobase/xtrabackup/utils/debian/control	2014-11-05 13:32:25 +0000
@@ -1,4 +1,4 @@
-Source: percona-xtrabackup
+Source: percona-xtrabackup-23
 Section: database
 Priority: extra
 Maintainer: Debian MySQL Maintainers <[e-mail]>
@@ -20,10 +20,11 @@
 Standards-Version: 3.9.5
 Homepage: http://www.percona.com/software/percona-xtrabackup
 
-Package: percona-xtrabackup
+Package: percona-xtrabackup-23
 Architecture: any
 Depends: libdbd-mysql-perl, rsync, ${misc:Depends}, ${shlibs:Depends}
 Provides: xtrabackup
+Conflicts: percona-xtrabackup, percona-xtrabackup-21
 Breaks: xtrabackup (<< 2.0.0~)
 Replaces: xtrabackup (<< 2.0.0~)
 Enhances: mysql-server
@@ -33,27 +34,17 @@
  InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server 5.1 and
  5.5 servers, and has many advanced features.
 
-Package: percona-xtrabackup-dbg
+Package: percona-xtrabackup-dbg-23
 Section: debug
 Architecture: any
-Depends: percona-xtrabackup (= ${binary:Version}), ${misc:Depends}
+Depends: percona-xtrabackup-23 (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for Percona XtraBackup
  Debug symbols for the binaries in percona-xtrabackup. Install this
  package if you need to run any of those with gdb.
 
-Package: percona-xtrabackup-test
+Package: percona-xtrabackup-test-23
 Architecture: any
-Depends: mysql-client, percona-xtrabackup, python, ${misc:Depends}
+Depends: mysql-client, percona-xtrabackup-23, python, ${misc:Depends}
 Description: Test suite for Percona XtraBackup
  Test suite for Percona XtraBackup. Install this package if you intend
- to run XtraBackup's test suite.
-
-Package: xtrabackup
-Architecture: all
-Section: oldlibs
-Depends: percona-xtrabackup, ${misc:Depends}
-Description: Transitional package for percona-xtrabackup
- In 2.2.x, the XtraBackup package name was rebranded to
- percona-xtrabackup. This package is an empty dummy package
- that depends on percona-xtrabackup, and replaces older versions of
- xtrabackup (2.0.0). It is not intended to be installed manually.
+ to run XtraBackup's test suite.
\ No newline at end of file

=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.docs' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-23.docs'
=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-23.install'
=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.lintian-overrides' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-23.lintian-overrides'
=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.install' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-23.install'
=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.lintian-overrides' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-23.lintian-overrides'
=== modified file 'storage/innobase/xtrabackup/utils/debian/rules'
--- storage/innobase/xtrabackup/utils/debian/rules	2014-11-05 13:32:25 +0000
+++ storage/innobase/xtrabackup/utils/debian/rules	2014-11-05 13:32:25 +0000
@@ -35,7 +35,7 @@
 	make -j$(NCPU)
 
 override_dh_strip:
-	dh_strip --dbg-package=percona-xtrabackup-dbg
+	dh_strip --dbg-package=percona-xtrabackup-dbg-23
 
 %:
 	dh $@

=== modified file 'storage/innobase/xtrabackup/utils/percona-xtrabackup.spec'
--- storage/innobase/xtrabackup/utils/percona-xtrabackup.spec	2014-11-05 13:32:25 +0000
+++ storage/innobase/xtrabackup/utils/percona-xtrabackup.spec	2014-11-05 13:32:25 +0000
@@ -6,7 +6,7 @@
 %define xb_revision       @@XB_REVISION@@
 
 #####################################
-Name:           percona-xtrabackup
+Name:           percona-xtrabackup-23
 Version:        %{xb_version_major}.%{xb_version_minor}.%{xb_version_patch}
 Release:        %{xb_revision}%{xb_rpm_version_extra}%{?dist}
 Summary:        XtraBackup online backup for MySQL / InnoDB
@@ -16,21 +16,27 @@
 URL:            http://www.percona.com/software/percona-xtrabackup
 Source:         percona-xtrabackup-%{version}%{xb_version_extra}.tar.gz
 
-BuildRequires:  cmake, libaio-devel, libgcrypt-devel, ncurses-devel, readline-devel, zlib-devel, libev-devel, libcurl-devel
+BuildRequires:  cmake, libaio-devel, libgcrypt-devel, ncurses-devel, readline-devel, zlib-devel, libev-devel
+%if 0%{?rhel} > 5
+BuildRequires:  libcurl-devel
+%else
+BuildRequires:  curl-devel
+%endif
+Conflicts:      percona-xtrabackup, percona-xtrabackup-21
 Requires:       perl(DBD::mysql), rsync
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 %description
 Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines
 
-%package -n percona-xtrabackup-test
+%package -n percona-xtrabackup-test-23
 Summary:        Test suite for Percona XtraBackup
 Group:          Applications/Databases
-Requires:       percona-xtrabackup = %{version}-%{release}
+Requires:       percona-xtrabackup-23 = %{version}-%{release}
 Requires:       /usr/bin/mysql
 AutoReqProv:    no
 
-%description -n percona-xtrabackup-test
+%description -n percona-xtrabackup-test-23
 This package contains the test suite for Percona XtraBackup %{version}
 
 %prep
@@ -77,11 +83,14 @@
 %{_bindir}/xbcloud
 %doc COPYING
 
-%files -n percona-xtrabackup-test
+%files -n percona-xtrabackup-test-23
 %defattr(-,root,root,-)
 %{_datadir}/percona-xtrabackup-test
 
 %changelog
+* Fri Sep 28 2014 Tomislav Plavcic <[e-mail]>
+- Update to new release Percona XtraBackup 2.3.0alpha1
+
 * Fri Sep 26 2014 Tomislav Plavcic <[e-mail]>
 - Update to new release Percona XtraBackup 2.2.5