[Pkg-mysql-commits] r1241 - in trunk/debian: . patches

Norbert Tretkowski nobse at alioth.debian.org
Mon May 26 19:56:07 UTC 2008


Author: nobse
Date: 2008-05-26 19:56:05 +0000 (Mon, 26 May 2008)
New Revision: 1241

Removed:
   trunk/debian/patches/90_upstreamdebiandir.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
One more patch to drop.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-26 19:19:11 UTC (rev 1240)
+++ trunk/debian/changelog	2008-05-26 19:56:05 UTC (rev 1241)
@@ -11,6 +11,7 @@
     + debian/patches/55_testsuite-2008.dpatch
     + debian/patches/56_fix_order_by.dpatch
     + debian/patches/57_fix_mysql_replication.dpatch
+    + debian/patches/90_upstreamdebiandir.dpatch
     + debian/patches/91_SECURITY_CVE-2007-5925.dpatch
   * SECURITY:
     Fix for CVE-2008-2079: It was possible to circumvent privileges through

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-05-26 19:19:11 UTC (rev 1240)
+++ trunk/debian/patches/00list	2008-05-26 19:56:05 UTC (rev 1241)
@@ -8,4 +8,3 @@
 45_warn-CLI-passwords.dpatch
 86_PATH_MAX.dpatch
 89_ndb__staticlib.dpatch
-90_upstreamdebiandir.dpatch

Deleted: trunk/debian/patches/90_upstreamdebiandir.dpatch
===================================================================
--- trunk/debian/patches/90_upstreamdebiandir.dpatch	2008-05-26 19:19:11 UTC (rev 1240)
+++ trunk/debian/patches/90_upstreamdebiandir.dpatch	2008-05-26 19:56:05 UTC (rev 1241)
@@ -1,73 +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@
-diff -urNad mysql-dfsg-5.0-5.0.51a~/Makefile.am mysql-dfsg-5.0-5.0.51a/Makefile.am
---- mysql-dfsg-5.0-5.0.51a~/Makefile.am	2008-01-11 12:43:18.000000000 -0200
-+++ mysql-dfsg-5.0-5.0.51a/Makefile.am	2008-02-19 16:38:21.948929495 -0300
-@@ -33,7 +33,7 @@
- 			@thread_dirs@ pstack \
- 			@sql_union_dirs@ scripts @man_dirs@ tests SSL\
- 			BUILD netware os2 @libmysqld_dirs@ \
--			@bench_dirs@ support-files @tools_dirs@ win debian
-+			@bench_dirs@ support-files @tools_dirs@ win
- 
- # Run these targets before any others, also make part of clean target,
- # to make sure we create new links after a clean.
-diff -urNad mysql-dfsg-5.0-5.0.51a~/Makefile.in mysql-dfsg-5.0-5.0.51a/Makefile.in
---- mysql-dfsg-5.0-5.0.51a~/Makefile.in	2008-02-19 16:34:10.506600613 -0300
-+++ mysql-dfsg-5.0-5.0.51a/Makefile.in	2008-02-19 16:37:53.079284308 -0300
-@@ -386,7 +386,7 @@
- 			@thread_dirs@ pstack \
- 			@sql_union_dirs@ scripts @man_dirs@ tests SSL\
- 			BUILD netware os2 @libmysqld_dirs@ \
--			@bench_dirs@ support-files @tools_dirs@ win debian
-+			@bench_dirs@ support-files @tools_dirs@ win 
- 
- 
- # Run these targets before any others, also make part of clean target,
-@@ -594,7 +594,7 @@
- distdir: $(DISTFILES)
- 	$(am__remove_distdir)
- 	mkdir $(distdir)
--	$(mkdir_p) $(distdir)/bdb $(distdir)/config/ac-macros $(distdir)/debian $(distdir)/include $(distdir)/libmysql $(distdir)/ndb/include $(distdir)/ndb/src
-+	$(mkdir_p) $(distdir)/bdb $(distdir)/config/ac-macros $(distdir)/include $(distdir)/libmysql $(distdir)/ndb/include $(distdir)/ndb/src
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
-diff -urNad mysql-dfsg-5.0-5.0.51a~/configure mysql-dfsg-5.0-5.0.51a/configure
---- mysql-dfsg-5.0-5.0.51a~/configure	2008-02-19 16:34:14.378821279 -0300
-+++ mysql-dfsg-5.0-5.0.51a/configure	2008-02-19 16:34:53.177032263 -0300
-@@ -41886,7 +41886,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"
- 
-@@ -42612,9 +42612,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" ;;
-diff -urNad mysql-dfsg-5.0-5.0.51a~/configure.in mysql-dfsg-5.0-5.0.51a/configure.in
---- mysql-dfsg-5.0-5.0.51a~/configure.in	2008-02-19 16:34:15.042859120 -0300
-+++ mysql-dfsg-5.0-5.0.51a/configure.in	2008-02-19 16:38:06.916072821 -0300
-@@ -3000,7 +3000,6 @@
-  cmd-line-utils/libedit/Makefile dnl
-  win/Makefile dnl
-  zlib/Makefile dnl
-- debian/Makefile debian/defs.mk debian/control dnl
-  cmd-line-utils/readline/Makefile)
-  AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
-  AC_OUTPUT




More information about the Pkg-mysql-commits mailing list