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
1=== modified file 'build/build-dpkg.sh'
2--- build/build-dpkg.sh 2011-12-17 00:00:28 +0000
3+++ build/build-dpkg.sh 2012-01-19 16:55:28 +0000
4@@ -12,12 +12,13 @@
5 set -ue
6
7 # Examine parameters
8-go_out="$(getopt --options "kK:" --longoptions key:,nosign \
9+go_out="$(getopt --options "kK:b" --longoptions key:,nosign,binary \
10 --name "$(basename "$0")" -- "$@")"
11 test $? -eq 0 || exit 1
12 eval set -- $go_out
13
14 BUILDPKG_KEY=''
15+BINARY=''
16
17 for arg
18 do
19@@ -25,6 +26,7 @@
20 -- ) shift; break;;
21 -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;
22 -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;
23+ -b | --binary ) shift; BINARY='-b';;
24 esac
25 done
26
27@@ -101,10 +103,10 @@
28 chmod +x debian/rules
29
30 # Update distribution name
31- dch -m -v "$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'
32+ dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'
33
34 DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \
35- dpkg-buildpackage -rfakeroot $BUILDPKG_KEY
36+ dpkg-buildpackage $BINARY -rfakeroot $BUILDPKG_KEY
37
38 )
39
40
41=== modified file 'build/debian/control'
42--- build/debian/control 2011-09-17 01:13:41 +0000
43+++ build/debian/control 2012-01-19 16:55:28 +0000
44@@ -22,14 +22,13 @@
45 .
46 This package includes the client library.
47
48-Package: libmysqlclient15-dev
49+Package: libmysqlclient18-dev
50 Architecture: any
51 Section: libdevel
52 Depends: libmysqlclient-dev (= ${binary:Version}), ${misc:Depends}
53-Replaces: libpercona-server-client15-dev
54 Description: Percona Server database development files - empty transitional
55 package. This is an empty package that depends on libmysqlclient-dev to ease
56- the transition for packages with versioned build-deps on libmysqlclient15-dev.
57+ the transition for packages with versioned build-deps on libmysqlclient18-dev.
58
59 Package: libmysqlclient-dev
60 Architecture: any
61@@ -47,11 +46,11 @@
62
63 Package: percona-server-common-5.5
64 Section: database
65-Architecture: all
66+Architecture: any
67 Depends: ${misc:Depends}
68-Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
69+Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common, percona-server-common-5.1
70 Provides: mysql-common
71-Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
72+Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common, percona-server-common-5.1
73 Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
74 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
75 database server. SQL (Structured Query Language) is the most popular database
76@@ -62,7 +61,7 @@
77 (e.g. /etc/mysql/my.cnf).
78
79 Package: percona-server-test-5.5
80-Architecture: all
81+Architecture: any
82 Depends: percona-server-client-5.5 (>= ${source:Version}), percona-server-server-5.5 (>= ${source:Version})
83 Provides: mysql-client
84 Description: Percona Server database test suite
85@@ -107,7 +106,7 @@
86
87 Package: percona-server-server
88 Section: database
89-Architecture: all
90+Architecture: any
91 Depends: percona-server-server-5.5, ${misc:Depends}
92 Description: Percona Server database server
93 (metapackage depending on the latest version)
94@@ -124,7 +123,7 @@
95
96 Package: percona-server-client
97 Section: database
98-Architecture: all
99+Architecture: any
100 Depends: percona-server-client-5.5, ${misc:Depends}
101 Description: Percona Server database client
102 (metapackage depending on the latest version)

Subscribers

People subscribed via source and target branches