[Pkg-mysql-commits] [mariadb-5.5] 01/01: Patch headers cleanup

Wed Feb 19 12:59:01 UTC 2014

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 b8a218d745f5981550b98bc1d63308d827334504
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Wed Feb 19 14:58:51 2014 +0200

    Patch headers cleanup
---
 debian/patches/33_scripts__mysql_create_system_tables__no_test.diff | 2 --
 debian/patches/38_scripts__mysqld_safe.sh__signals.diff             | 3 ---
 debian/patches/41_scripts__mysql_install_db.sh__no_test.diff        | 3 ---
 debian/patches/44_scripts__mysql_config__libs.diff                  | 4 +---
 debian/patches/50_mysql-test__db_test.diff                          | 4 ----
 debian/patches/61_replace_dash_with_bash_mbug675185.diff            | 4 ----
 debian/patches/80_skip_socket_test_if_user_undefined.diff           | 6 ------
 debian/patches/81_clean_up_also_backup_files.diff                   | 6 ------
 debian/patches/99_remove_rename_mariadb-server_files_in.diff        | 6 ------
 9 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff b/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff
index a52c198..59e9e39 100755
--- a/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff
+++ b/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff
@@ -1,4 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 33_scripts__mysql_create_system_tables__no_test.dpatch by  <ch at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
@@ -7,7 +6,6 @@
 ## DP: circumstances as it is checked first. See #301741.
 ## DP: http://bugs.mysql.com/bug.php?id=6901
 
- at DPATCH@
 --- old/scripts/mysql_system_tables_data.sql	2008-12-04 22:59:44.000000000 +0100
 +++ new/scripts/mysql_system_tables_data.sql	2008-12-04 23:00:07.000000000 +0100
 @@ -30,8 +30,6 @@ SELECT LOWER( REPLACE((SELECT REPLACE(@@
diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.diff b/debian/patches/38_scripts__mysqld_safe.sh__signals.diff
index 5a9c3a5..7dab872 100755
--- a/debian/patches/38_scripts__mysqld_safe.sh__signals.diff
+++ b/debian/patches/38_scripts__mysqld_safe.sh__signals.diff
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 38_scripts__mysqld_safe.sh__signals.dpatch by  <ch at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Executes /etc/init.d/mysql on signals
 ## DP: Reported as http://bugs.mysql.com/bug.php?id=31361
 
- at DPATCH@
-
 --- a/scripts/mysqld_safe.sh	2013-01-11 16:02:41 +0000
 +++ b/scripts/mysqld_safe.sh	2013-01-11 16:03:14 +0000
 @@ -32,7 +32,6 @@ err_log=
diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff b/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff
index 5ab8ab3..a44fbdb 100755
--- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff
+++ b/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 41_scripts__mysql_install_db.sh__no_test.dpatch by  <ch at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: scripts__mysql_install_db.sh__no_test
 ## DP: http://bugs.mysql.com/bug.php?id=6901
 
- at DPATCH@
-
 --- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh	2008-01-29 22:41:20.000000000 +0100
 +++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh	2008-02-28 10:08:11.000000000 +0100
 @@ -372,7 +372,7 @@ then
diff --git a/debian/patches/44_scripts__mysql_config__libs.diff b/debian/patches/44_scripts__mysql_config__libs.diff
index 93cacff..0c18dc6 100755
--- a/debian/patches/44_scripts__mysql_config__libs.diff
+++ b/debian/patches/44_scripts__mysql_config__libs.diff
@@ -1,10 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 99-unnamed.dpatch by  <ch at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
+
 ## DP: Removes unnecessary library dependencies. See #390692
 
- at DPATCH@
 diff -Nur mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh mysql-dfsg-5.1-5.1.31/scripts/mysql_config.sh
 --- mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh  2009-01-19 17:30:55.000000000 +0100
 +++ mysql-dfsg-5.1-5.1.31/scripts/mysql_config.sh       2009-02-08 17:17:48.000000000 +0100
diff --git a/debian/patches/50_mysql-test__db_test.diff b/debian/patches/50_mysql-test__db_test.diff
index 670afbf..c171747 100755
--- a/debian/patches/50_mysql-test__db_test.diff
+++ b/debian/patches/50_mysql-test__db_test.diff
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 50_mysql-test__db_test.dpatch by Christian Hammers <ch at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Patch 33_scripts__mysql_create_system_tables__no_test removes the
 ## DP: rights for anybody to connect to the test database but the test
 ## DP: suite depends on them.
-
- at DPATCH@
-
 --- old/mysql-test/mysql-test-run.pl	2009-06-16 14:24:09.000000000 +0200
 +++ new/mysql-test/mysql-test-run.pl	2009-07-04 00:03:34.000000000 +0200
 @@ -3578,6 +3578,11 @@ sub mysql_install_db {
diff --git a/debian/patches/61_replace_dash_with_bash_mbug675185.diff b/debian/patches/61_replace_dash_with_bash_mbug675185.diff
index 2a4ee8c..1d920b1 100755
--- a/debian/patches/61_replace_dash_with_bash_mbug675185.diff
+++ b/debian/patches/61_replace_dash_with_bash_mbug675185.diff
@@ -1,4 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 61_replace_dash_with_bash_mbug675185.dpatch by  <knielsen at knielsen-hq.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
@@ -6,9 +5,6 @@
 ## DP: A race in dash causes mysqld_safe to occasionally loop infinitely.
 ## DP: Fix by using bash instead.
 ## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185
-
- at DPATCH@
-=== modified file 'scripts/mysqld_safe.sh'
 --- old/scripts/mysqld_safe.sh	2010-04-09 11:47:18 +0000
 +++ new/scripts/mysqld_safe.sh	2010-11-21 09:40:50 +0000
 @@ -1,4 +1,4 @@
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 694c8de..2298f5c 100755
--- a/debian/patches/80_skip_socket_test_if_user_undefined.diff
+++ b/debian/patches/80_skip_socket_test_if_user_undefined.diff
@@ -1,9 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_skip_socket_test_if_user_undefined <otto at seravo.fi>
-##
-
- at DPATCH@
-=== 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
index 5bb100c..0704358 100644
--- a/debian/patches/81_clean_up_also_backup_files.diff
+++ b/debian/patches/81_clean_up_also_backup_files.diff
@@ -1,9 +1,3 @@
-#! /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 @@
diff --git a/debian/patches/99_remove_rename_mariadb-server_files_in.diff b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
index 05107c0..c08b789 100755
--- a/debian/patches/99_remove_rename_mariadb-server_files_in.diff
+++ b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
@@ -1,9 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_remove_rename_mariadb-server_files_in <otto at seravo.fi>
-##
-
- at DPATCH@
-=== modified file 'CMakeLists.txt'
 --- old/CMakeLists.txt	2014-01-29 20:55:56.499842093 +0200
 +++ new/CMakeLists.txt	2014-01-31 17:12:27.633594128 +0200
 @@ -431,12 +431,6 @@

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

