[Pkg-mysql-commits] [pkg-mariadb] 02/02: Manual merge

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository pkg-mariadb.

commit 0063567b14b214f33ac3f41fa8447671f37eaab4
Merge: 5d67f76 ce1f18e
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Wed Sep 25 08:23:04 2013 +0300

    Manual merge

 debian/changelog |   35 ++++++++++++++++++++---------------
 debian/control   |    4 ++--
 debian/rules     |   10 +++++-----
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --cc debian/control
index 751d78d,fc53545..6224a9f
--- a/debian/control
+++ b/debian/control
@@@ -2,12 -2,12 +2,12 @@@ Source: mariadb-5.
  Section: database
  Priority: optional
  Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
- Uploaders: Otto Kekäläinen <otto at seravo.fi>, Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at periapt.co.uk>
- Build-Depends: debhelper (>= 9), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-gplv2-dev, po-debconf, psmisc, chrpath, gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.4 [any-i386], g++-4.4 [any-i386], libssl-dev
+ Uploaders: Otto Kekäläinen <otto at seravo.fi>, Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at periapt.co.uk>, James Page <jamespage at debian.org>
+ Build-Depends: debhelper (>= 9), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-gplv2-dev, po-debconf, psmisc, chrpath, gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
  Standards-Version: 3.9.4
  Homepage: http://mariadb.org/
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mysql/pkg-mariadb.git
 -Vcs-Git: git://anonscm.debian.org/pkg-mysql/pkg-mariadb.git
 +Vcs-Git: git://git.debian.org/git/pkg-mysql/pkg-mariadb.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-mysql/pkg-mariadb.git
  
  Package: libmariadbclient18
  Section: libs

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/pkg-mariadb.git