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

[Ignacio Nin]

Changes for release 2.0.8.

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

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'VERSION'
--- VERSION	2013-05-04 16:03:49 +0000
+++ VERSION	2013-09-04 18:16:07 +0000
@@ -1,1 +1,1 @@
-XTRABACKUP_VERSION=2.0.7
+XTRABACKUP_VERSION=2.0.8

=== modified file 'utils/debian/changelog'
--- utils/debian/changelog	2013-04-22 20:11:35 +0000
+++ utils/debian/changelog	2013-09-04 18:16:07 +0000
@@ -1,3 +1,9 @@
+percona-xtrabackup-20 (2.0.8) unstable; urgency=low
+
+  * Change name of the packages to percona-xtrabackup-20*
+
+ -- Ignacio Nin <[e-mail]>  Fri, 30 Aug 2013 11:00:00 -0300
+
 percona-xtrabackup (2.0.6) unstable; urgency=low
 
   * Update compat level to 7

=== modified file 'utils/debian/control'
--- utils/debian/control	2013-05-03 00:19:28 +0000
+++ utils/debian/control	2013-09-04 18:16:07 +0000
@@ -1,4 +1,4 @@
-Source: percona-xtrabackup
+Source: percona-xtrabackup-20
 Section: misc
 Priority: extra
 Maintainer: Percona Development <[e-mail]>
@@ -9,39 +9,30 @@
 Vcs-Browser: http://bazaar.launchpad.net/~percona-dev/percona-xtrabackup/release-1.4/files
 Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~percona-dev/percona-xtrabackup/release-1.4/
 
-Package: percona-xtrabackup
+Package: percona-xtrabackup-20
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-client
 Provides: xtrabackup
 Breaks: xtrabackup (<< 2.0.0~)
 Replaces: xtrabackup (<< 2.0.0~)
+Conflicts: percona-xtrabackup
 Description: Open source backup tool for InnoDB and XtraDB
  Percona XtraBackup is an open-source hot backup utility for MySQL that
  doesn't lock your database during the backup. It can back up data from
  InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server 5.0, 5.1 and
  5.5 servers, and has many advanced features.
 
-Package: percona-xtrabackup-dbg
+Package: percona-xtrabackup-20-dbg
 Section: debug
 Architecture: any
-Depends: percona-xtrabackup (= ${binary:Version}), ${misc:Depends}
+Depends: percona-xtrabackup-20 (= ${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-20-test
 Architecture: any
-Depends: percona-xtrabackup, python, ${misc:Depends}
+Depends: percona-xtrabackup-20, 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.0.0, 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.

=== renamed file 'utils/debian/percona-xtrabackup-test.dirs' => 'utils/debian/percona-xtrabackup-20-test.dirs'
=== renamed file 'utils/debian/percona-xtrabackup-test.install' => 'utils/debian/percona-xtrabackup-20-test.install'
=== renamed file 'utils/debian/percona-xtrabackup-test.lintian-overrides' => 'utils/debian/percona-xtrabackup-20-test.lintian-overrides'
=== renamed file 'utils/debian/percona-xtrabackup.dirs' => 'utils/debian/percona-xtrabackup-20.dirs'
=== renamed file 'utils/debian/percona-xtrabackup.docs' => 'utils/debian/percona-xtrabackup-20.docs'
=== renamed file 'utils/debian/percona-xtrabackup.install' => 'utils/debian/percona-xtrabackup-20.install'
=== renamed file 'utils/debian/percona-xtrabackup.links' => 'utils/debian/percona-xtrabackup-20.links'
=== renamed file 'utils/debian/percona-xtrabackup.lintian-overrides' => 'utils/debian/percona-xtrabackup-20.lintian-overrides'
=== modified file 'utils/debian/rules'
--- utils/debian/rules	2013-04-22 19:54:56 +0000
+++ utils/debian/rules	2013-09-04 18:16:07 +0000
@@ -52,7 +52,7 @@
 	#docbook-to-man debian/xtrabackup.sgml > xtrabackup.1
 
 override_dh_strip:
-	dh_strip --dbg-package=percona-xtrabackup-dbg
+	dh_strip --dbg-package=percona-xtrabackup-20-dbg
 
 %:
 	dh $@

=== modified file 'utils/xtrabackup.spec'
--- utils/xtrabackup.spec	2013-05-02 20:17:02 +0000
+++ utils/xtrabackup.spec	2013-09-04 18:16:07 +0000
@@ -10,7 +10,7 @@
 %define __os_install_post /usr/lib/rpm/brp-compress
 
 Summary: XtraBackup online backup for MySQL / InnoDB 
-Name: percona-xtrabackup
+Name: percona-xtrabackup-20
 Version: %{xtrabackup_version}
 Release: %{release}
 Group: Server/Databases
@@ -22,7 +22,8 @@
 Requires: /usr/bin/mysql
 Provides: xtrabackup
 Obsoletes: xtrabackup
-BuildRequires: libaio-devel
+Conflicts: percona-xtrabackup
+BuildRequires: wget bzr automake autoconf libtool make cmake gcc-c++ bison libaio-devel zlib-devel ncurses-devel
 
 %description
 Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines.
@@ -30,7 +31,7 @@
 %package test
 Summary: Test suite for Percona Xtrabackup
 Group: Applications/Databases
-Requires: percona-xtrabackup
+Requires: percona-xtrabackup-20
 AutoReqProv: no
 
 %description test
@@ -38,6 +39,11 @@
 
 
 %changelog
+* Fri Aug 30 2013 Ignacio Nin
+- Version 2.0.8
+- Update package name to `percona-xtrabackup-20', so it's able to share
+  repository with 2.1 packages.
+
 * Mon Sep 27 2010 Aleksandr Kuzminsky
 - Version 1.4
 
@@ -52,7 +58,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n percona-xtrabackup-%{xtrabackup_version}
 
 
 %build
@@ -108,7 +114,7 @@
 %{_bindir}/xbstream
 %doc COPYING
 
-%files -n percona-xtrabackup-test
+%files test
 %{_datadir}/percona-xtrabackup-test
 
 ###