RM-1274 PXB-8.2

storage/innobase/xtrabackup/utils/debian/changelog

@@ -1,3 +1,7 @@
+percona-xtrabackup-82 (8.2) unstable; urgency=low
+
+  * Packaging changes for version 8.2
+
 percona-xtrabackup-81 (8.1) unstable; urgency=low
 
   * Packaging changes for version 8.1

storage/innobase/xtrabackup/utils/debian/control

@@ -1,4 +1,4 @@
-Source: percona-xtrabackup-81
+Source: percona-xtrabackup-82
 Section: database
 Priority: extra
 Maintainer: Percona Development Team <[email protected]>
@@ -25,11 +25,11 @@ Build-Depends: automake,
 Standards-Version: 3.9.5
 Homepage: http://www.percona.com/software/percona-xtrabackup
 
-Package: percona-xtrabackup-81
+Package: percona-xtrabackup-82
 Architecture: any
 Depends: libdbd-mysql-perl, libcurl4-openssl-dev, rsync, zstd, ${misc:Depends}, ${shlibs:Depends}
 Provides: xtrabackup
-Conflicts: percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80
+Conflicts: percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80, percona-xtrabackup-81
 Breaks: xtrabackup (<< 2.0.0~)
 Replaces: xtrabackup (<< 2.0.0~)
 Enhances: mysql-server
@@ -39,17 +39,17 @@ Description: Open source backup tool for InnoDB and XtraDB
  InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server/MariaDB
  servers, and has many advanced features.
 
-Package: percona-xtrabackup-dbg-81
+Package: percona-xtrabackup-dbg-82
 Section: debug
 Architecture: any
-Depends: percona-xtrabackup-81 (= ${binary:Version}), ${misc:Depends}
+Depends: percona-xtrabackup-82 (= ${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-81
+Package: percona-xtrabackup-test-82
 Architecture: any
-Depends: mysql-client, percona-xtrabackup-81, ${misc:Depends}
+Depends: mysql-client, percona-xtrabackup-82, ${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.

storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-81.install

@@ -1 +1 @@
-/usr/share/percona-xtrabackup-test-81
+/usr/share/percona-xtrabackup-test-82

storage/innobase/xtrabackup/utils/debian/rules

@@ -24,14 +24,14 @@ override_dh_auto_configure:
 ifeq "$(DEB_DUMMY)" ""
 	( test -d $(builddirdebug) || mkdir $(builddirdebug) ) && cd $(builddirdebug) && \
 	cmake .. -DBUILD_CONFIG=xtrabackup_release -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-81 \
+	  -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-82 \
 	  -DINSTALL_MANDIR=/usr/share/man -DWITH_MAN_PAGES=1 -DMINIMAL_RELWITHDEBINFO=OFF \
 	  -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 	  -DINSTALL_PLUGINDIR=lib/xtrabackup/plugin -DFORCE_INSOURCE_BUILD=1 -DWITH_ZLIB=bundled -DWITH_ZSTD=bundled -DWITH_PROTOBUF=bundled && \
 	cd ..
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
 	cmake .. -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-81 \
+	  -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-82 \
 	  -DINSTALL_MANDIR=/usr/share/man -DWITH_MAN_PAGES=1 -DMINIMAL_RELWITHDEBINFO=OFF \
 	  -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 	  -DINSTALL_PLUGINDIR=lib/xtrabackup/plugin -DFORCE_INSOURCE_BUILD=1 -DWITH_ZLIB=bundled -DWITH_ZSTD=bundled -DWITH_PROTOBUF=bundled
@@ -61,15 +61,15 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install
-	mkdir -p debian/percona-xtrabackup-81/usr/lib/private/
-	mkdir -p debian/percona-xtrabackup-81/usr/bin/
-	cp ./$(builddir)/library_output_directory/libprotobuf-lite.so* debian/percona-xtrabackup-81/usr/lib/private/
-	cp ./$(builddirdebug)/runtime_output_directory/xtrabackup debian/percona-xtrabackup-81/usr/bin/xtrabackup-debug
-	patchelf --debug --set-rpath $(rpath) debian/percona-xtrabackup-81/usr/bin/xtrabackup-debug
+	mkdir -p debian/percona-xtrabackup-82/usr/lib/private/
+	mkdir -p debian/percona-xtrabackup-82/usr/bin/
+	cp ./$(builddir)/library_output_directory/libprotobuf-lite.so* debian/percona-xtrabackup-82/usr/lib/private/
+	cp ./$(builddirdebug)/runtime_output_directory/xtrabackup debian/percona-xtrabackup-82/usr/bin/xtrabackup-debug
+	patchelf --debug --set-rpath $(rpath) debian/percona-xtrabackup-82/usr/bin/xtrabackup-debug
 	@echo "RULES.$@"
 
 override_dh_strip:
-	dh_strip --dbg-package=percona-xtrabackup-dbg-81
+	dh_strip --dbg-package=percona-xtrabackup-dbg-82
 	dh_strip -Xlibprotobuf-lite
 
 %:

storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh

@@ -510,7 +510,7 @@ build_source_deb(){
 
     echo "DEB_RELEASE=${DEB_RELEASE}" >> ${CURDIR}/percona-xtrabackup-8.0.properties
 
-    NEWTAR=${NAME}-81_${VERSION}.orig.tar.gz
+    NEWTAR=${NAME}-82_${VERSION}.orig.tar.gz
     mv ${TARFILE} ${NEWTAR}
 
     tar xzf ${NEWTAR}

storage/innobase/xtrabackup/utils/percona-xtrabackup.spec

@@ -32,7 +32,7 @@ Source:         percona-xtrabackup-%{version}%{xb_version_extra}.tar.gz
 
 BuildRequires:  %{cmake_bin}, libaio-devel, libgcrypt-devel, ncurses-devel, readline-devel, zlib-devel, libev-devel openssl-devel
 BuildRequires:  libcurl-devel
-Conflicts:      percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80
+Conflicts:      percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80, percona-xtrabackup-81
 Requires:       perl(DBD::mysql), rsync, zstd
 Requires:	perl(Digest::MD5)
 BuildRoot:      %{_tmppath}/%{name}-%{version}%{xb_version_extra}-root