[Pkg-mysql-commits] [mariadb-5.5] 01/01: Added patch to exclude backup files created during tests

[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 mariadb-5.5.

commit 5e18159961282d8a638b3a9bfa2e0f2f0071feaa
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Mon Feb 10 11:06:22 2014 +0200

    Added patch to exclude backup files created during tests
---
 .../patches/80_skip_socket_test_if_user_undefined.diff   |  1 -
 debian/patches/81_clean_up_also_backup_files.diff        | 16 ++++++++++++++++
 debian/patches/series                                    |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/patches/80_skip_socket_test_if_user_undefined.diff b/debian/patches/80_skip_socket_test_if_user_undefined.diff
index a5319eb..694c8de 100755
--- a/debian/patches/80_skip_socket_test_if_user_undefined.diff
+++ b/debian/patches/80_skip_socket_test_if_user_undefined.diff
@@ -4,7 +4,6 @@
 
 @DPATCH@
 === modified file 'mysql-test/suite/plugins/t/unix_socket.test'
-=== modified file 'mysql-test/suite/plugins/t/unix_socket.test'
 --- old/mysql-test/suite/plugins/t/unix_socket.test	2013-05-14 12:49:52 +0000
 +++ new/mysql-test/suite/plugins/t/unix_socket.test	2014-02-05 10:25:37 +0000
 @@ -3,10 +3,23 @@
diff --git a/debian/patches/81_clean_up_also_backup_files.diff b/debian/patches/81_clean_up_also_backup_files.diff
new file mode 100644
index 0000000..5bb100c
--- /dev/null
+++ b/debian/patches/81_clean_up_also_backup_files.diff
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 81_clean_up_also_backup_files <otto at seravo.fi>
+##
+
+ at DPATCH@
+=== modified file 'cmake/install_macros.cmake'
+--- old/cmake/install_macros.cmake	2014-01-22 23:02:37 +0000
++++ new/cmake/install_macros.cmake	2014-02-10 09:00:11 +0000
+@@ -397,6 +397,7 @@
+       PATTERN "*.vcxproj.filters" EXCLUDE
+       PATTERN "*.vcxproj.user" EXCLUDE
+       PATTERN "CTest" EXCLUDE
++      PATTERN "*~" EXCLUDE
+     )
+   ENDIF()
+ ENDFUNCTION()
diff --git a/debian/patches/series b/debian/patches/series
index 351c0bd..469de57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,5 @@
 50_mysql-test__db_test.diff
 61_replace_dash_with_bash_mbug675185.diff
 80_skip_socket_test_if_user_undefined.diff
+81_clean_up_also_backup_files.diff
 99_rename_mariadb-server_files_in.diff

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