Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~ignacio-nin/percona-server/5.5.18-bug656933 into lp:percona-server/5.5

  1. 5.5.18-bug656933
  2. Merge into 5.5
Proposed by Ignacio Nin
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 213
Proposed branch: lp:~ignacio-nin/percona-server/5.5.18-bug656933
Merge into: lp:percona-server/5.5
Diff against target: 102 lines (+13/-12)
2 files modified
build/build-dpkg.sh (+5/-3)
build/debian/control (+8/-9)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5.18-bug656933
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Ignacio Nin Pending
Review via email: mp+89292@code.launchpad.net

Description of the change

Changes needed to solve bugs #656933 and #803151

Rename the libmysqlclient15-dev to libmysqlclient18-dev, which is the actual version of the current package.

Remove the "all" architecture from some packages in order to simplify the repository maintenance.

Add a --binary option to build-dpkg.sh in order to simplify the building process.

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh 2011-12-17 00:00:28 +0000
+++ build/build-dpkg.sh 2012-01-19 16:55:28 +0000
@@ -12,12 +12,13 @@
12set -ue12set -ue
1313
14# Examine parameters14# Examine parameters
15go_out="$(getopt --options "kK:" --longoptions key:,nosign \15go_out="$(getopt --options "kK:b" --longoptions key:,nosign,binary \
16 --name "$(basename "$0")" -- "$@")"16 --name "$(basename "$0")" -- "$@")"
17test $? -eq 0 || exit 117test $? -eq 0 || exit 1
18eval set -- $go_out18eval set -- $go_out
1919
20BUILDPKG_KEY=''20BUILDPKG_KEY=''
21BINARY=''
2122
22for arg23for arg
23do24do
@@ -25,6 +26,7 @@
25 -- ) shift; break;;26 -- ) shift; break;;
26 -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;27 -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;
27 -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;28 -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;
29 -b | --binary ) shift; BINARY='-b';;
28 esac30 esac
29done31done
3032
@@ -101,10 +103,10 @@
101 chmod +x debian/rules103 chmod +x debian/rules
102104
103 # Update distribution name105 # Update distribution name
104 dch -m -v "$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'106 dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'
105107
106 DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \108 DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \
107 dpkg-buildpackage -rfakeroot $BUILDPKG_KEY109 dpkg-buildpackage $BINARY -rfakeroot $BUILDPKG_KEY
108110
109 )111 )
110112
111113
=== modified file 'build/debian/control'
--- build/debian/control 2011-09-17 01:13:41 +0000
+++ build/debian/control 2012-01-19 16:55:28 +0000
@@ -22,14 +22,13 @@
22 .22 .
23 This package includes the client library.23 This package includes the client library.
2424
25Package: libmysqlclient15-dev25Package: libmysqlclient18-dev
26Architecture: any26Architecture: any
27Section: libdevel27Section: libdevel
28Depends: libmysqlclient-dev (= ${binary:Version}), ${misc:Depends}28Depends: libmysqlclient-dev (= ${binary:Version}), ${misc:Depends}
29Replaces: libpercona-server-client15-dev
30Description: Percona Server database development files - empty transitional 29Description: Percona Server database development files - empty transitional
31 package. This is an empty package that depends on libmysqlclient-dev to ease 30 package. This is an empty package that depends on libmysqlclient-dev to ease
32 the transition for packages with versioned build-deps on libmysqlclient15-dev.31 the transition for packages with versioned build-deps on libmysqlclient18-dev.
3332
34Package: libmysqlclient-dev33Package: libmysqlclient-dev
35Architecture: any34Architecture: any
@@ -47,11 +46,11 @@
4746
48Package: percona-server-common-5.547Package: percona-server-common-5.5
49Section: database48Section: database
50Architecture: all49Architecture: any
51Depends: ${misc:Depends}50Depends: ${misc:Depends}
52Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common51Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common, percona-server-common-5.1
53Provides: mysql-common52Provides: mysql-common
54Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common53Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common, percona-server-common-5.1
55Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)54Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
56 Percona Server is a fast, stable and true multi-user, multi-threaded SQL 55 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
57 database server. SQL (Structured Query Language) is the most popular database56 database server. SQL (Structured Query Language) is the most popular database
@@ -62,7 +61,7 @@
62 (e.g. /etc/mysql/my.cnf).61 (e.g. /etc/mysql/my.cnf).
6362
64Package: percona-server-test-5.563Package: percona-server-test-5.5
65Architecture: all64Architecture: any
66Depends: percona-server-client-5.5 (>= ${source:Version}), percona-server-server-5.5 (>= ${source:Version})65Depends: percona-server-client-5.5 (>= ${source:Version}), percona-server-server-5.5 (>= ${source:Version})
67Provides: mysql-client66Provides: mysql-client
68Description: Percona Server database test suite67Description: Percona Server database test suite
@@ -107,7 +106,7 @@
107106
108Package: percona-server-server107Package: percona-server-server
109Section: database108Section: database
110Architecture: all109Architecture: any
111Depends: percona-server-server-5.5, ${misc:Depends}110Depends: percona-server-server-5.5, ${misc:Depends}
112Description: Percona Server database server111Description: Percona Server database server
113 (metapackage depending on the latest version)112 (metapackage depending on the latest version)
@@ -124,7 +123,7 @@
124123
125Package: percona-server-client124Package: percona-server-client
126Section: database125Section: database
127Architecture: all126Architecture: any
128Depends: percona-server-client-5.5, ${misc:Depends}127Depends: percona-server-client-5.5, ${misc:Depends}
129Description: Percona Server database client128Description: Percona Server database client
130 (metapackage depending on the latest version)129 (metapackage depending on the latest version)

Subscribers

People subscribed via source and target branches