[Pkg-mysql-commits] r935 - branches/sid-5.1/debian/patches
Christian Hammers
ch at alioth.debian.org
Tue Oct 2 20:56:32 UTC 2007
Author: ch
Date: 2007-10-02 20:56:32 +0000 (Tue, 02 Oct 2007)
New Revision: 935
Modified:
branches/sid-5.1/debian/patches/00list
branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch
branches/sid-5.1/debian/patches/99_TEMP_rm_upstream_debian.dpatch
Log:
updates for 5.1.22
Modified: branches/sid-5.1/debian/patches/00list
===================================================================
--- branches/sid-5.1/debian/patches/00list 2007-10-02 20:47:07 UTC (rev 934)
+++ branches/sid-5.1/debian/patches/00list 2007-10-02 20:56:32 UTC (rev 935)
@@ -5,4 +5,5 @@
41_scripts__mysql_install_db.sh__no_test.dpatch
44_scripts__mysql_config__libs.dpatch
85_ndb__staticlib.dpatch
+95_TEMP_minmax.dpatch
99_TEMP_rm_upstream_debian.dpatch
Modified: branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch 2007-10-02 20:47:07 UTC (rev 934)
+++ branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch 2007-10-02 20:56:32 UTC (rev 935)
@@ -5,25 +5,24 @@
## DP: No description.
@DPATCH@
-diff -urNad mysql-dfsg-5.0-5.0.45~/configure mysql-dfsg-5.0-5.0.45/configure
---- mysql-dfsg-5.0-5.0.45~/configure 2007-07-04 15:10:10.000000000 +0200
-+++ mysql-dfsg-5.0-5.0.45/configure 2007-07-17 14:55:49.000000000 +0200
-@@ -41876,7 +41876,7 @@
+--- old/configure 2007-10-02 22:50:58.000000000 +0200
++++ new/configure 2007-10-02 22:51:29.000000000 +0200
+@@ -46822,7 +46822,7 @@
# Output results
-- ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile strings/Makefile regex/Makefile heap/Makefile myisam/Makefile myisammrg/Makefile os2/Makefile os2/include/Makefile os2/include/sys/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql-common/Makefile SSL/Makefile dbug/Makefile scripts/Makefile include/Makefile sql-bench/Makefile server-tools/Makefile server-tools/instance-manager/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile netware/Makefile include/mysql_version.h cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile win/Makefile zlib/Makefile debian/Makefile debian/defs.mk debian/control cmd-line-utils/readline/Makefile"
-+ ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile strings/Makefile regex/Makefile heap/Makefile myisam/Makefile myisammrg/Makefile os2/Makefile os2/include/Makefile os2/include/sys/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql-common/Makefile SSL/Makefile dbug/Makefile scripts/Makefile include/Makefile sql-bench/Makefile server-tools/Makefile server-tools/instance-manager/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile netware/Makefile include/mysql_version.h cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile win/Makefile zlib/Makefile cmd-line-utils/readline/Makefile"
+- ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile unittest/mysys/Makefile unittest/examples/Makefile strings/Makefile regex/Makefile storage/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql/sql_builtin.cc sql-common/Makefile dbug/Makefile scripts/Makefile include/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile debian/Makefile debian/defs.mk debian/control mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile include/mysql_version.h plugin/Makefile win/Makefile"
++ ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile unittest/mysys/Makefile unittest/examples/Makefile strings/Makefile regex/Makefile storage/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql/sql_builtin.cc sql-common/Makefile dbug/Makefile scripts/Makefile include/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile include/mysql_version.h plugin/Makefile win/Makefile"
- ac_config_commands="$ac_config_commands default"
-@@ -42602,9 +42602,6 @@
- "cmd-line-utils/libedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd-line-utils/libedit/Makefile" ;;
- "win/Makefile" ) CONFIG_FILES="$CONFIG_FILES win/Makefile" ;;
- "zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;;
+ ac_config_commands="$ac_config_commands default"
+@@ -47548,9 +47548,6 @@
+ "support-files/MacOSX/Makefile" ) CONFIG_FILES="$CONFIG_FILES support-files/MacOSX/Makefile" ;;
+ "support-files/RHEL4-SElinux/Makefile" ) CONFIG_FILES="$CONFIG_FILES support-files/RHEL4-SElinux/Makefile" ;;
+ "mysql-test/Makefile" ) CONFIG_FILES="$CONFIG_FILES mysql-test/Makefile" ;;
- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
- "debian/defs.mk" ) CONFIG_FILES="$CONFIG_FILES debian/defs.mk" ;;
- "debian/control" ) CONFIG_FILES="$CONFIG_FILES debian/control" ;;
- "cmd-line-utils/readline/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd-line-utils/readline/Makefile" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+ "mysql-test/ndb/Makefile" ) CONFIG_FILES="$CONFIG_FILES mysql-test/ndb/Makefile" ;;
+ "netware/Makefile" ) CONFIG_FILES="$CONFIG_FILES netware/Makefile" ;;
+ "sql-bench/Makefile" ) CONFIG_FILES="$CONFIG_FILES sql-bench/Makefile" ;;
Modified: branches/sid-5.1/debian/patches/99_TEMP_rm_upstream_debian.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/99_TEMP_rm_upstream_debian.dpatch 2007-10-02 20:47:07 UTC (rev 934)
+++ branches/sid-5.1/debian/patches/99_TEMP_rm_upstream_debian.dpatch 2007-10-02 20:56:32 UTC (rev 935)
@@ -27,14 +27,3 @@
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
---- old/configure 2007-06-12 01:26:32.000000000 +0200
-+++ new/configure 2007-06-12 01:26:50.000000000 +0200
-@@ -47777,7 +47777,7 @@
-
-
- # Output results
-- ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile unittest/mysys/Makefile unittest/examples/Makefile strings/Makefile regex/Makefile storage/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql/sql_builtin.cc sql-common/Makefile dbug/Makefile scripts/Makefile include/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile debian/Makefile debian/defs.mk debian/control mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile include/mysql_version.h plugin/Makefile win/Makefile"
-+ ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile unittest/mysys/Makefile unittest/examples/Makefile strings/Makefile regex/Makefile storage/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql/sql_builtin.cc sql-common/Makefile dbug/Makefile scripts/Makefile include/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile include/mysql_version.h plugin/Makefile win/Makefile"
-
-
- ac_config_commands="$ac_config_commands default"
More information about the Pkg-mysql-commits
mailing list