[Pkg-mysql-commits] [mariadb-5.5] 05/05: Convert CR/LF line endings to LF only (Windows to Unix)

[Otto Kekäläinen]

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

ottok-guest pushed a commit to branch ubuntu-14.10
in repository mariadb-5.5.

commit aa126ce01a1717d26758f19ec0ebc64b17853c01
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Sat Jun 13 22:47:37 2015 +0300

    Convert CR/LF line endings to LF only (Windows to Unix)
---
 debian/patches/75_man_syntax_fixes.diff | 40 ++++++++++++++++-----------------
 debian/po/nl.po                         | 12 +++++-----
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/debian/patches/75_man_syntax_fixes.diff b/debian/patches/75_man_syntax_fixes.diff
index c5d1ee3..2ef81e4 100644
--- a/debian/patches/75_man_syntax_fixes.diff
+++ b/debian/patches/75_man_syntax_fixes.diff
@@ -1,20 +1,20 @@
-Author: Colin Watson <cjwatson at debian.org>
-Description: Fix man page syntax to make package Lintian clean
-
---- a/man/mysqldump.1
-+++ b/man/mysqldump.1
-@@ -2041,12 +2041,12 @@ T}
- T{
- \'\' (\fIempty string\fR)
- T}:T{
--<field name="\fIcolumn_name\fR"></field>
-+<field name="\fIcolumn_name\fR">\:</field>
- T}
- T{
- \'NULL\' (\fIstring value\fR)
- T}:T{
--<field name="\fIcolumn_name\fR">NULL</field>
-+<field name="\fIcolumn_name\fR">\:NULL</field>
- T}
- .TE
- .sp 1
+Author: Colin Watson <cjwatson at debian.org>
+Description: Fix man page syntax to make package Lintian clean
+
+--- a/man/mysqldump.1
++++ b/man/mysqldump.1
+@@ -2041,12 +2041,12 @@ T}
+ T{
+ \'\' (\fIempty string\fR)
+ T}:T{
+-<field name="\fIcolumn_name\fR"></field>
++<field name="\fIcolumn_name\fR">\:</field>
+ T}
+ T{
+ \'NULL\' (\fIstring value\fR)
+ T}:T{
+-<field name="\fIcolumn_name\fR">NULL</field>
++<field name="\fIcolumn_name\fR">\:NULL</field>
+ T}
+ .TE
+ .sp 1
diff --git a/debian/po/nl.po b/debian/po/nl.po
index eaf3fa1..c70fa54 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -1,9 +1,9 @@
-# Dutch mariadb po-debconf translation,
-# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the mariadb package.
-# Vincent Zweije <zweije at xs4all.nl>, 2006.
-# Frans Spiesschaert <Frans.Spiesschaert at yucom.be>, 2014.
-# 
+# Dutch mariadb po-debconf translation,
+# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mariadb package.
+# Vincent Zweije <zweije at xs4all.nl>, 2006.
+# Frans Spiesschaert <Frans.Spiesschaert at yucom.be>, 2014.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: mariadb-5.5_5.5.39-2\n"

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