[Pkg-mysql-commits] r913 - branches/sid-5.1/debian/patches

[Christian Hammers]

Author: ch
Date: 2007-08-25 18:19:28 +0000 (Sat, 25 Aug 2007)
New Revision: 913

Added:
   branches/sid-5.1/debian/patches/44_scripts__mysql_config__libs.dpatch
Removed:
   branches/sid-5.1/debian/patches/19_man__documentation_reference.dpatch
Modified:
   branches/sid-5.1/debian/patches/00list
Log:
added more old patches and activated the 44er


Modified: branches/sid-5.1/debian/patches/00list
===================================================================
--- branches/sid-5.1/debian/patches/00list	2007-08-25 18:04:47 UTC (rev 912)
+++ branches/sid-5.1/debian/patches/00list	2007-08-25 18:19:28 UTC (rev 913)
@@ -1,8 +1,8 @@
 01_MAKEFILES__Docs_Images_Makefile.in.dpatch
 01_MAKEFILES__Docs_Makefile.in.dpatch
-19_man__documentation_reference.dpatch
 33_scripts__mysql_create_system_tables__no_test.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch
 41_scripts__mysql_install_db.sh__no_test.dpatch
+44_scripts__mysql_config__libs.dpatch
 85_ndb__staticlib.dpatch
 99_TEMP_rm_upstream_debian.dpatch

Deleted: branches/sid-5.1/debian/patches/19_man__documentation_reference.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/19_man__documentation_reference.dpatch	2007-08-25 18:04:47 UTC (rev 912)
+++ branches/sid-5.1/debian/patches/19_man__documentation_reference.dpatch	2007-08-25 18:19:28 UTC (rev 913)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 19_man__documentation_reference.dpatch by  <seanius at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
---- old/man/mysql.1.orig	2005-11-21 23:49:47.380110189 +0100
-+++ new/man/mysql.1	2005-11-21 23:52:11.699034270 +0100
-@@ -958,6 +958,13 @@
- For more information, please refer to the MySQL Reference Manual,
- which may already be installed locally and which is also available
- online at http://dev.mysql.com/doc/.
-+.PP
-+NOTE: Unfortunately this documentation is not
-+released under a license that makes Debian able to redistribute it (not
-+even legally!), so there is no package available with this documentation.
-+Feel free to contact mysql if you'd like to share your opinion on the
-+matter :)
-+
- .SH AUTHOR
- MySQL AB (http://www.mysql.com/).
- This software comes with no warranty.

Added: branches/sid-5.1/debian/patches/44_scripts__mysql_config__libs.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/44_scripts__mysql_config__libs.dpatch	                        (rev 0)
+++ branches/sid-5.1/debian/patches/44_scripts__mysql_config__libs.dpatch	2007-08-25 18:19:28 UTC (rev 913)
@@ -0,0 +1,24 @@
+#! /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: Removes unnecessary library dependencies. See #390692
+
+ at DPATCH@
+
+--- old/scripts/mysql_config.sh	2006-08-25 23:12:10.000000000 +0200
++++ new/scripts/mysql_config.sh	2006-10-02 21:05:52.000000000 +0200
+@@ -98,10 +98,10 @@
+ 
+ # Create options 
+ # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
+-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
++libs=" $ldflags -L$pkglibdir -lmysqlclient"
+ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
+-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
+-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
++libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @openssl_libs@ "
++embedded_libs=" $ldflags -L$pkglibdir -lmysqld @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
+ 
+ cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
+ include="-I$pkgincludedir"


Property changes on: branches/sid-5.1/debian/patches/44_scripts__mysql_config__libs.dpatch
___________________________________________________________________
Name: svn:executable
   + *