[Pkg-mysql-commits] r954 - in branches/sid-5.1/debian: . patches

[Monty Taylor]

Author: mtaylor-guest
Date: 2007-10-12 00:27:14 +0000 (Fri, 12 Oct 2007)
New Revision: 954

Removed:
   branches/sid-5.1/debian/patches/85_ndb__staticlib.dpatch
Modified:
   branches/sid-5.1/debian/changelog
   branches/sid-5.1/debian/patches/00list
Log:
Removed 85_ndb__staticlib.dpatch since we have a real shared lib now.


Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog	2007-10-10 01:37:17 UTC (rev 953)
+++ branches/sid-5.1/debian/changelog	2007-10-12 00:27:14 UTC (rev 954)
@@ -1,5 +1,6 @@
 mysql-dfsg-5.1 (5.1.22rc-2) experimental; urgency=low
 
+  [ Christian Hammers ]
   * Added PIC support for NDB libraries on amd64 (thanks to Monty Taylor).
     Closes: #29791
   * Added extra information when aborting due to a detected downgrade (thanks
@@ -7,8 +8,11 @@
   * Moved libndbclient.so.3 to its own package as it now has a version != 0
     (thanks to Raphael Pinson for reminding me).
 
- -- Christian Hammers <ch at debian.org>  Tue, 10 Oct 2007 03:13:07 +0200
+  [ Monty Taylor ]
+  * Removed 85_ndb__staticlib.dpatch since we have a libndbclient package now.
 
+ -- Monty Taylor <mtaylor at mysql.com>  Thu, 11 Oct 2007 17:25:16 -0700
+
 mysql-dfsg-5.1 (5.1.22rc-1) experimental; urgency=low
 
   * New upstream version.

Modified: branches/sid-5.1/debian/patches/00list
===================================================================
--- branches/sid-5.1/debian/patches/00list	2007-10-10 01:37:17 UTC (rev 953)
+++ branches/sid-5.1/debian/patches/00list	2007-10-12 00:27:14 UTC (rev 954)
@@ -6,5 +6,4 @@
 44_scripts__mysql_config__libs.dpatch
 70_upstream_debian__configure.dpatch
 71_upstream_debian__Makefile.in.dpatch
-85_ndb__staticlib.dpatch
 99_TEMP_minmax.dpatch

Deleted: branches/sid-5.1/debian/patches/85_ndb__staticlib.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/85_ndb__staticlib.dpatch	2007-10-10 01:37:17 UTC (rev 953)
+++ branches/sid-5.1/debian/patches/85_ndb__staticlib.dpatch	2007-10-12 00:27:14 UTC (rev 954)
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 85_ndb__staticlib.dpatch by  <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to remove any dynamic link dependencies to libndbclient.so.0.0.0
-
- at DPATCH@
-
-diff -Nur OLD/ndb/src/cw/cpcd/Makefile.in mysql-dfsg-5.0-5.0.13rc/ndb/src/cw/cpcd/Makefile.in
---- old/storage/ndb/src/cw/cpcd/Makefile.in	2005-09-22 21:47:53.000000000 +0200
-+++ new/storage/ndb/src/cw/cpcd/Makefile.in	2005-09-27 17:37:25.569232020 +0200
-@@ -380,7 +380,7 @@
- zlib_dir = @zlib_dir@
- ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
- LDADD_LOC = \
--            $(top_builddir)/storage/ndb/src/libndbclient.la      \
-+            $(top_builddir)/storage/ndb/src/.libs/libndbclient.a      \
-             $(top_builddir)/dbug/libdbug.a \
-             $(top_builddir)/mysys/libmysys.a \
-             $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
---- old/storage/ndb/src/mgmsrv/Makefile.in	2007-08-25 14:48:43.000000000 +0200
-+++ new/storage/ndb/src/mgmsrv/Makefile.in	2007-08-25 14:49:23.000000000 +0200
-@@ -453,7 +453,7 @@
-                -I$(top_srcdir)/storage/ndb/src/mgmclient
- 
- LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \
--            $(top_builddir)/storage/ndb/src/libndbclient.la \
-+            $(top_builddir)/storage/ndb/src/.libs/libndbclient.a \
-             $(top_builddir)/dbug/libdbug.a \
-             $(top_builddir)/mysys/libmysys.a \
-             $(top_builddir)/strings/libmystrings.a \
-diff -Nur OLD/ndb/tools/Makefile.in mysql-dfsg-5.0-5.0.13rc/ndb/tools/Makefile.in
---- old/storage/ndb/tools/Makefile.in.orig	2006-05-03 23:06:44.000000000 +0200
-+++ new/storage/ndb/tools/Makefile.in	2006-05-03 23:07:36.000000000 +0200
-@@ -544,7 +544,7 @@
- 	-I$(top_srcdir)/storage/ndb/test/include \
- 	-I$(top_srcdir)/storage/ndb/include/mgmapi \
- 	-I$(top_srcdir)/storage/ndb/include/kernel
--LDADD = $(LDADD_LOC) $(top_builddir)/storage/ndb/src/libndbclient.la \
-+LDADD = $(LDADD_LOC) $(top_builddir)/storage/ndb/src/.libs/libndbclient.a \
- 	$(top_builddir)/dbug/libdbug.a \
- 	$(top_builddir)/mysys/libmysys.a \
- 	$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@