[Pkg-mysql-commits] r936 - branches/sid-5.1/debian/patches
Christian Hammers
ch at alioth.debian.org
Tue Oct 2 20:58:10 UTC 2007
Author: ch
Date: 2007-10-02 20:58:10 +0000 (Tue, 02 Oct 2007)
New Revision: 936
Added:
branches/sid-5.1/debian/patches/70_upstream_debian__configure.dpatch
branches/sid-5.1/debian/patches/71_upstream_debian__Makefile.in.dpatch
Removed:
branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch
branches/sid-5.1/debian/patches/99_TEMP_rm_upstream_debian.dpatch
Modified:
branches/sid-5.1/debian/patches/00list
Log:
Renamed patches as I doubt that they are temporary...
Modified: branches/sid-5.1/debian/patches/00list
===================================================================
--- branches/sid-5.1/debian/patches/00list 2007-10-02 20:56:32 UTC (rev 935)
+++ branches/sid-5.1/debian/patches/00list 2007-10-02 20:58:10 UTC (rev 936)
@@ -4,6 +4,6 @@
38_scripts__mysqld_safe.sh__signals.dpatch
41_scripts__mysql_install_db.sh__no_test.dpatch
44_scripts__mysql_config__libs.dpatch
+70_upstream_debian__configure.dpatch
+71_upstream_debian__Makefile.in.dpatch
85_ndb__staticlib.dpatch
-95_TEMP_minmax.dpatch
-99_TEMP_rm_upstream_debian.dpatch
Copied: branches/sid-5.1/debian/patches/70_upstream_debian__configure.dpatch (from rev 935, branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch)
===================================================================
--- branches/sid-5.1/debian/patches/70_upstream_debian__configure.dpatch (rev 0)
+++ branches/sid-5.1/debian/patches/70_upstream_debian__configure.dpatch 2007-10-02 20:58:10 UTC (rev 936)
@@ -0,0 +1,28 @@
+#! /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" ;;
Copied: branches/sid-5.1/debian/patches/71_upstream_debian__Makefile.in.dpatch (from rev 935, branches/sid-5.1/debian/patches/99_TEMP_rm_upstream_debian.dpatch)
===================================================================
--- branches/sid-5.1/debian/patches/71_upstream_debian__Makefile.in.dpatch (rev 0)
+++ branches/sid-5.1/debian/patches/71_upstream_debian__Makefile.in.dpatch 2007-10-02 20:58:10 UTC (rev 936)
@@ -0,0 +1,29 @@
+#! /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 \
Deleted: branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch 2007-10-02 20:56:32 UTC (rev 935)
+++ branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch 2007-10-02 20:58:10 UTC (rev 936)
@@ -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/99_TEMP_rm_upstream_debian.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/99_TEMP_rm_upstream_debian.dpatch 2007-10-02 20:56:32 UTC (rev 935)
+++ branches/sid-5.1/debian/patches/99_TEMP_rm_upstream_debian.dpatch 2007-10-02 20:58:10 UTC (rev 936)
@@ -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