summaryrefslogtreecommitdiff
path: root/debian/dist/Ubuntu/control
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-03-26 14:27:24 -0400
committerNirbhay Choubey <nirbhay@skysql.com>2014-03-26 14:27:24 -0400
commit90e4f7f9d3f2669ac99f2817f884315bfc86b0a7 (patch)
tree60a10a515a9f5656e797d8142f97b94f89f4e797 /debian/dist/Ubuntu/control
parent586fab72f01e1c7f0f8bf363fa6b06a2f10965b4 (diff)
parent5b7cab82195268f7657504d0b53995654748cefa (diff)
downloadmariadb-git-90e4f7f9d3f2669ac99f2817f884315bfc86b0a7.tar.gz
* bzr merge -rtag:mariadb-10.0.9 maria/10.0
* Fix for post-merge build failures.
Diffstat (limited to 'debian/dist/Ubuntu/control')
-rw-r--r--debian/dist/Ubuntu/control2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 42eeadd7e8a..1d07dffb50e 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -73,4 +73,4 @@ Depends: mariadb-test-10.0 (= ${source:Version})
Description: MariaDB database regression test suite (metapackage depending on the latest version)
This is an empty package that depends on the current "best" version of
mariadb-test (currently mariadb-test-10.0), as determined by the MariaDB
- maintainers. \ No newline at end of file
+ maintainers.