[Pkg-mysql-commits] r1163 - in branches/sid-5.1/debian: . patches
Norbert Tretkowski
nobse at alioth.debian.org
Thu Feb 28 09:11:49 UTC 2008
Author: nobse
Date: 2008-02-28 09:11:48 +0000 (Thu, 28 Feb 2008)
New Revision: 1163
Removed:
branches/sid-5.1/debian/patches/70_upstream_debian__configure.dpatch
branches/sid-5.1/debian/patches/71_upstream_debian__Makefile.in.dpatch
Modified:
branches/sid-5.1/debian/changelog
branches/sid-5.1/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch
Log:
Update/drop patches, first round.
Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog 2008-02-27 19:34:04 UTC (rev 1162)
+++ branches/sid-5.1/debian/changelog 2008-02-28 09:11:48 UTC (rev 1163)
@@ -20,10 +20,15 @@
* Added libndbclient-dev package to go with libndbclient3.
[ Norbert Tretkowski ]
+ * Update patches:
+ + patches/41_scripts__mysql_install_db.sh__no_test.dpatch
+ * Drop patches:
+ + patches/70_upstream_debian__configure.dpatch
+ + patches/71_upstream_debian__Makefile.in.dpatch
* Disabled testsuite, I guess the reason why it currently fails is a bug in
the testsuite itself.
- -- Norbert Tretkowski <nobse at debian.org> Sun, 17 Feb 2008 12:52:23 +0100
+ -- Norbert Tretkowski <nobse at debian.org> Thu, 28 Feb 2008 10:10:19 +0100
mysql-dfsg-5.1 (5.1.22rc-1) experimental; urgency=low
Modified: branches/sid-5.1/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch 2008-02-27 19:34:04 UTC (rev 1162)
+++ branches/sid-5.1/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch 2008-02-28 09:11:48 UTC (rev 1163)
@@ -7,12 +7,12 @@
@DPATCH@
---- old/scripts/mysql_install_db.sh 2007-06-11 23:31:22.000000000 +0200
-+++ new/scripts/mysql_install_db.sh 2007-06-11 23:31:48.000000000 +0200
-@@ -345,7 +345,7 @@
+--- 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
+@@ -306,7 +306,7 @@
fi
- # Create database directories mysql & test
+ # Create database directories
-for dir in $ldata $ldata/mysql $ldata/test
+for dir in $ldata $ldata/mysql
do
Deleted: branches/sid-5.1/debian/patches/70_upstream_debian__configure.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/70_upstream_debian__configure.dpatch 2008-02-27 19:34:04 UTC (rev 1162)
+++ branches/sid-5.1/debian/patches/70_upstream_debian__configure.dpatch 2008-02-28 09:11:48 UTC (rev 1163)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_upstreamdebiandir.dpatch by <sean at rangda.stickybit.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
---- 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 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"
-@@ -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" ;;
- "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" ;;
Deleted: branches/sid-5.1/debian/patches/71_upstream_debian__Makefile.in.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/71_upstream_debian__Makefile.in.dpatch 2008-02-27 19:34:04 UTC (rev 1162)
+++ branches/sid-5.1/debian/patches/71_upstream_debian__Makefile.in.dpatch 2008-02-28 09:11:48 UTC (rev 1163)
@@ -1,29 +0,0 @@
-#! /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: Temporarily remove the changes that the upstream package wants to make
-## DP: to our debian/ directory. Have to investigte this more thouroughly.
-
- at DPATCH@
-
---- old/Makefile.in 2007-06-12 01:26:57.000000000 +0200
-+++ new/Makefile.in 2007-06-12 01:27:18.000000000 +0200
-@@ -405,7 +405,7 @@
- mysql-test support-files sql-bench @tools_dirs@ \
- win
-
--DIST_SUBDIRS = $(SUBDIRS) BUILD debian
-+DIST_SUBDIRS = $(SUBDIRS) BUILD
- DISTCLEANFILES = ac_available_languages_fragment
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -606,7 +606,7 @@
- distdir: $(DISTFILES)
- $(am__remove_distdir)
- mkdir $(distdir)
-- $(mkdir_p) $(distdir)/config/ac-macros $(distdir)/debian $(distdir)/include $(distdir)/libmysql $(distdir)/sql $(distdir)/storage/ndb/include $(distdir)/storage/ndb/src
-+ $(mkdir_p) $(distdir)/config/ac-macros $(distdir)/include $(distdir)/libmysql $(distdir)/sql $(distdir)/storage/ndb/include $(distdir)/storage/ndb/src
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
More information about the Pkg-mysql-commits
mailing list