[Pkg-mysql-commits] r901 - in branches/sid-5.0/debian: . patches

[Sean Finney]

Author: seanius
Date: 2007-07-17 12:55:14 +0000 (Tue, 17 Jul 2007)
New Revision: 901

Added:
   branches/sid-5.0/debian/patches/90_upstreamdebiandir.dpatch
Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/patches/00list
Log:
remove ref to ./debian in configure script

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-07-17 11:30:16 UTC (rev 900)
+++ branches/sid-5.0/debian/changelog	2007-07-17 12:55:14 UTC (rev 901)
@@ -5,6 +5,9 @@
   * removed patches that are incorporated into the latest release:
     - 70_cpuid_on_i486.dpatch
     - 91_SECURITY_CVE-2007-2691_alter-drop
+  * new patch 90_upstreamdebiandir.dpatch to keep a few lingering references
+    to the upstream ./debian dir out of the build, at least until we find
+    a nice way to collaborate on sharing the directory.
 
  -- sean finney <seanius at debian.org>  Tue, 17 Jul 2007 10:12:07 +0200
 

Modified: branches/sid-5.0/debian/patches/00list
===================================================================
--- branches/sid-5.0/debian/patches/00list	2007-07-17 11:30:16 UTC (rev 900)
+++ branches/sid-5.0/debian/patches/00list	2007-07-17 12:55:14 UTC (rev 901)
@@ -11,3 +11,4 @@
 86_PATH_MAX.dpatch
 88_mctype_attrib.dpatch
 89_ndb__staticlib.dpatch
+90_upstreamdebiandir.dpatch

Added: branches/sid-5.0/debian/patches/90_upstreamdebiandir.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/90_upstreamdebiandir.dpatch	                        (rev 0)
+++ branches/sid-5.0/debian/patches/90_upstreamdebiandir.dpatch	2007-07-17 12:55:14 UTC (rev 901)
@@ -0,0 +1,29 @@
+#! /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@
+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 @@
+ 
+ 
+ # 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_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" ;;
+-  "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" ;;


Property changes on: branches/sid-5.0/debian/patches/90_upstreamdebiandir.dpatch
___________________________________________________________________
Name: svn:executable
   + *