Merge lp:~ignacio-nin/percona-xtrabackup/2.1-dpkg-revamp into lp:percona-xtrabackup/2.1

[Ignacio Nin]

Revamp of debian/ files

[Stewart Smith (stewart)]

review: Approve

=== modified file 'utils/debian/changelog'
--- utils/debian/changelog	2012-10-15 16:14:59 +0000
+++ utils/debian/changelog	2013-04-22 22:03:36 +0000
@@ -1,3 +1,15 @@
+percona-xtrabackup (2.1.0) unstable; urgency=low
+
+  * Update compat level to 7
+  * Update Standards-Version to 3.9.1.
+  * Use dh targets and overrides.
+  * Remove the obsolete debian/info file
+  * Move the /usr/share/percona-xtrabackup-test directory to
+    the percona-xtrabackup-test package.
+  * Update the copyright file to a machine-readable format.
+
+ -- Ignacio Nin <[e-mail]>  Mon, 22 Apr 2013 16:14:20 -0300
+
 percona-xtrabackup (2.0.0) lucid; urgency=low
 
   * General polishing of debian/ directory

=== modified file 'utils/debian/compat'
--- utils/debian/compat	2011-10-05 02:29:27 +0000
+++ utils/debian/compat	2013-04-22 22:03:36 +0000
@@ -1,1 +1,1 @@
-5
+7

=== modified file 'utils/debian/control'
--- utils/debian/control	2013-04-03 14:50:52 +0000
+++ utils/debian/control	2013-04-22 22:03:36 +0000
@@ -4,7 +4,7 @@
 Maintainer: Percona Development <[e-mail]>
 Build-Depends: debhelper (>= 7.3), autotools-dev, libaio-dev, wget, automake,
  libtool, bison, libncurses-dev, libz-dev, cmake, bzr, libgcrypt-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
 Homepage: https://launchpad.net/percona-xtrabackup
 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/

=== modified file 'utils/debian/copyright'
--- utils/debian/copyright	2013-01-11 12:56:00 +0000
+++ utils/debian/copyright	2013-04-22 22:03:36 +0000
@@ -1,40 +1,41 @@
-This package was debianized by Alex <[e-mail]> on
-Sun, 28 Jun 2009 14:20:17 -0700.
-
-Its current debian maintainer is Ignacio Nin <[e-mail]>
-
-It was downloaded from lp:percona-xtrabackup (bzr repo)
-
-Author:
-
-    Percona, Inc. <[e-mail]>
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Percona Development <[e-mail]>
+Source: https://launchpad.net/percona-xtrabackup
+Comment:
+ This package was debianized by Alex <[e-mail]> on
+ Sun, 28 Jun 2009 14:20:17 -0700. Its current debian maintainer is
+ Ignacio Nin <[e-mail]>.
 Copyright:
-
-    Copyright (C) 2009 2010 2011  Percona, Inc., except for the
+    Copyright (C) 2009-2013 Percona, LLC, except for the
     innobackupex script (innobackupex-1.5.1), which is
     Copyright (C) 2003, 2009 Innobase Oy. All rights reserved.,
     published under the GNU General Public License Version 2.
-
-License:
-
+License: GPL-2
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
-
+    .
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
-
+    .
     You should have received a copy of the GNU General Public License with
     the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
     if not, write to the Free Software Foundation, Inc., 51 Franklin St,
     Fifth Floor, Boston, MA  02110-1301  USA
-
-On Debian systems, the complete text of the GNU General Public
-License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-
-The Debian packaging is Copyright © 2009 2010 2011 Percona Ireland Ltd.
-and is licensed under the GNU General Public License, version 2.
+    .
+    On Debian systems, the complete text of the GNU General Public
+    License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+    .
+    The Debian packaging is Copyright © 2009-2013 Percona, LLC
+    and is licensed under the GNU General Public License, version 2.
+
+Files: innobackupex
+Copyright: Copyright (C) 2003, 2009 Innobase Oy. All rights reserved.
+License: GPL-2
+
+Files: *
+Copyright: Copyright (C) 2009-2013 Percona, LLC
+License: GPL-2

=== removed file 'utils/debian/info'
--- utils/debian/info	2010-07-04 12:15:06 +0000
+++ utils/debian/info	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Docs/mysql.info

=== added file 'utils/debian/percona-xtrabackup-test.dirs'
--- utils/debian/percona-xtrabackup-test.dirs	1970-01-01 00:00:00 +0000
+++ utils/debian/percona-xtrabackup-test.dirs	2013-04-22 22:03:36 +0000
@@ -0,0 +1,1 @@
+usr/share/percona-xtrabackup-test

=== modified file 'utils/debian/percona-xtrabackup.dirs'
--- utils/debian/percona-xtrabackup.dirs	2012-10-15 16:14:59 +0000
+++ utils/debian/percona-xtrabackup.dirs	2013-04-22 22:03:36 +0000
@@ -2,4 +2,3 @@
 usr/share
 usr/share/doc
 usr/share/doc/percona-xtrabackup
-usr/share/percona-xtrabackup-test

=== modified file 'utils/debian/rules'
--- utils/debian/rules	2013-04-22 22:03:36 +0000
+++ utils/debian/rules	2013-04-22 22:03:36 +0000
@@ -22,23 +22,10 @@
 
 MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
 
-
-config.status: 
-	dh_testdir
-	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	#./configure --enable-local-infile --enable-thread-safe-client --with-plugins=innobase --with-zlib-dir=bundled --with-extra-charsets=complex
-
-
-build: build-stamp
-
-build-stamp:  config.status 
-	dh_testdir
+override_dh_auto_configure:
+
+
+override_dh_auto_build:
 
 ifeq "$(DEB_DUMMY)" ""
 	AUTO_DOWNLOAD=yes ./utils/build.sh xtradb
@@ -60,61 +47,9 @@
 
 	#docbook-to-man debian/xtrabackup.sgml > xtrabackup.1
 
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	#[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
-
-	dh_clean 
-
-install: 
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	dh_install
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-#	dh_installexamples
-	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-#	dh_installman
-	dh_link
+override_dh_strip:
 	dh_strip --dbg-package=percona-xtrabackup-dbg
-	dh_lintian
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+
+%:
+	dh $@
+