Merge lp:~stewart/percona-xtrabackup/xb-2.1.6-deb into lp:percona-xtrabackup/2.1

Proposed by Stewart Smith
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 705
Proposed branch: lp:~stewart/percona-xtrabackup/xb-2.1.6-deb
Merge into: lp:percona-xtrabackup/2.1
Prerequisite: lp:~percona-core/percona-xtrabackup/release-2.1.6
Diff against target: 72 lines (+19/-8)
5 files modified
utils/debian/changelog (+15/-0)
utils/debian/control (+0/-2)
utils/debian/percona-xtrabackup.dirs (+0/-4)
utils/debian/percona-xtrabackup.lintian-overrides (+4/-0)
utils/debian/rules (+0/-2)
To merge this branch: bzr merge lp:~stewart/percona-xtrabackup/xb-2.1.6-deb
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+196821@code.launchpad.net

Description of the change

This syncs our Debian packaging with what's in Debian, a few minor changes.

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
1=== modified file 'utils/debian/changelog'
2--- utils/debian/changelog 2013-11-27 06:03:23 +0000
3+++ utils/debian/changelog 2013-11-27 06:03:23 +0000
4@@ -10,6 +10,21 @@
5
6 -- Stewart Smith <stewart@flamingspork.com> Tue, 29 Oct 2013 14:56:54 +1100
7
8+percona-xtrabackup (2.1.3-618-1) unstable; urgency=low
9+
10+ [ Stewart Smith ]
11+ * Initial packaging for Debian (Closes: #620824)
12+
13+ [ Clint Byrum ]
14+ * Remove inaccurate Vcs-* fields.
15+ * Remove MAKE_J setting as it is handled by dpkg build tools.
16+ * Remove unnecesssary debian/percona-xtrabackup.dirs
17+ * Updating standards to 3.9.4, no changes necessary.
18+ * Add embedded-library libmysqlclient to
19+ percona-xtrabackup.lintian-overrides.
20+
21+ -- Stewart Smith <stewart.smith@percona.com> Fri, 19 Jul 2013 16:18:36 +1000
22+
23 percona-xtrabackup (2.1.0) unstable; urgency=low
24
25 * Update compat level to 7
26
27=== modified file 'utils/debian/control'
28--- utils/debian/control 2013-11-13 03:11:53 +0000
29+++ utils/debian/control 2013-11-27 06:03:23 +0000
30@@ -16,8 +16,6 @@
31 libgcrypt-dev
32 Standards-Version: 3.9.4
33 Homepage: http://www.percona.com/software/percona-xtrabackup
34-Vcs-Browser: http://bazaar.launchpad.net/~percona-core/percona-xtrabackup/2.1/files
35-Vcs-Bzr: lp:percona-xtrabackup/2.1
36
37 Package: percona-xtrabackup
38 Architecture: any
39
40=== removed file 'utils/debian/percona-xtrabackup.dirs'
41--- utils/debian/percona-xtrabackup.dirs 2013-09-26 06:20:33 +0000
42+++ utils/debian/percona-xtrabackup.dirs 1970-01-01 00:00:00 +0000
43@@ -1,4 +0,0 @@
44-usr/bin
45-usr/share
46-usr/share/doc
47-usr/share/doc/percona-xtrabackup
48
49=== modified file 'utils/debian/percona-xtrabackup.lintian-overrides'
50--- utils/debian/percona-xtrabackup.lintian-overrides 2013-09-26 06:20:33 +0000
51+++ utils/debian/percona-xtrabackup.lintian-overrides 2013-11-27 06:03:23 +0000
52@@ -8,5 +8,9 @@
53 embedded-library usr/bin/xtrabackup: zlib
54 embedded-library usr/bin/xtrabackup_55: zlib
55 embedded-library usr/bin/xtrabackup_56: zlib
56+
57+# The embedded forked mysql 5.6 source builds and links this statically
58+embedded-library usr/bin/xtrabackup_56: libmysqlclient
59+
60 # Older versions of lintian
61 embedded-zlib
62
63=== modified file 'utils/debian/rules'
64--- utils/debian/rules 2013-09-26 06:20:33 +0000
65+++ utils/debian/rules 2013-11-27 06:03:23 +0000
66@@ -14,8 +14,6 @@
67 CROSS= --build $(DEB_BUILD_GNU_TYPE)
68 endif
69
70-MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
71-
72 override_dh_auto_configure:
73
74

Subscribers

People subscribed via source and target branches