tags 339233 patch
thanks

Hey Andres,

I've prepared an NMU to fix this bug in mysql++.  The patch for the NMU is
attached, and I'll be uploading the package shortly to the NEW queue.  If
you disagree with any of the changes made, please make a maintainer upload
in its place; or since IIRC your key is still in limbo, feel free to grab me
to sponsor any fixes.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
reverted:
--- mysql++-2.0.6/debian/libmysql++2.dirs
+++ mysql++-2.0.6.orig/debian/libmysql++2.dirs
@@ -1 +0,0 @@
-/usr/lib
diff -u mysql++-2.0.6/debian/control mysql++-2.0.6/debian/control
--- mysql++-2.0.6/debian/control
+++ mysql++-2.0.6/debian/control
@@ -8,7 +8,7 @@
 Package: libmysql++-dev
 Section: libdevel
 Architecture: any
-Depends: libmysql++2 (= ${Source-Version}), libmysqlclient14-dev
+Depends: libmysql++2c2a (= ${Source-Version}), libmysqlclient14-dev
 Replaces: libsqlplus-dev
 Conflicts: libsqlplus-dev
 Description: mysql C++ library bindings (development)
@@ -20,10 +20,12 @@
  .
  Homepage: http://tangentsoft.net/mysql++/.
 
-Package: libmysql++2
+Package: libmysql++2c2a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libmysql++2
+Replaces: libmysql++2
 Description: mysql C++ library bindings (runtime)
  Mysql++ is a complex C++ API for Mysql (And other SQL Databases
  Soon). The goal of this API is too make working with Queries as easy
reverted:
--- mysql++-2.0.6/debian/libmysql++2.docs
+++ mysql++-2.0.6.orig/debian/libmysql++2.docs
@@ -1,2 +0,0 @@
-CREDITS
-HACKERS
reverted:
--- mysql++-2.0.6/debian/libmysql++2.install
+++ mysql++-2.0.6.orig/debian/libmysql++2.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
diff -u mysql++-2.0.6/debian/changelog mysql++-2.0.6/debian/changelog
--- mysql++-2.0.6/debian/changelog
+++ mysql++-2.0.6/debian/changelog
@@ -1,3 +1,13 @@
+mysql++ (2.0.6-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Medium-urgency upload for RC bugfix.
+  * Rename libmysql++2 to libmysql++2c2a for the C++ mt allocator ABI
+    transition, and conflict/replace libmysql++2 accordingly
+    (closes: #339233).
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Tue, 13 Dec 2005 06:17:14 -0800
+
 mysql++ (2.0.6-1) unstable; urgency=low
 
   * New upstream release.
diff -u mysql++-2.0.6/Makefile mysql++-2.0.6/Makefile
--- mysql++-2.0.6/Makefile
+++ mysql++-2.0.6/Makefile
@@ -48,8 +48,8 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i386-pc-linux-gnu
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
        $(srcdir)/mysql++.spec.in $(top_srcdir)/configure COPYING \
@@ -98,11 +98,11 @@
 ACLOCAL = aclocal -I config
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /afs/d2702.athenacr.com/users/dilinger/mysql++-2.0.6/missing 
--run tar
+AMTAR = ${SHELL} /home/devel/release/mysql++-2.0.6/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} 
/afs/d2702.athenacr.com/users/dilinger/mysql++-2.0.6/missing --run autoconf
-AUTOHEADER = ${SHELL} 
/afs/d2702.athenacr.com/users/dilinger/mysql++-2.0.6/missing --run autoheader
-AUTOMAKE = ${SHELL} 
/afs/d2702.athenacr.com/users/dilinger/mysql++-2.0.6/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/devel/release/mysql++-2.0.6/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/devel/release/mysql++-2.0.6/missing --run 
autoheader
+AUTOMAKE = ${SHELL} /home/devel/release/mysql++-2.0.6/missing --run 
automake-1.9
 AWK = gawk
 CC = cc
 CCDEPMODE = depmode=gcc3
@@ -122,8 +122,8 @@
 ECHO_T = 
 EGREP = grep -E
 EXEEXT = 
-F77 = 
-FFLAGS = 
+F77 = g77
+FFLAGS = -g -O2
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
@@ -137,7 +137,7 @@
 MAINT = #
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} 
/afs/d2702.athenacr.com/users/dilinger/mysql++-2.0.6/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/devel/release/mysql++-2.0.6/missing --run makeinfo
 MYSQLPP_LIBTOOL_VERSION = 2:6:0
 MYSQLPP_VERSION_BUGFIX = 6
 MYSQLPP_VERSION_MAJOR = 2
@@ -163,7 +163,7 @@
 ac_ct_AR = ar
 ac_ct_CC = cc
 ac_ct_CXX = 
-ac_ct_F77 = 
+ac_ct_F77 = g77
 ac_ct_RANLIB = ranlib
 ac_ct_STRIP = strip
 acx_pthread_config = 
@@ -177,21 +177,21 @@
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
 build_os = linux-gnu
 build_vendor = pc
 datadir = ${prefix}/share
 exec_prefix = ${prefix}
-host = i386-pc-linux-gnu
+host = i486-pc-linux-gnu
 host_alias = 
-host_cpu = i386
+host_cpu = i486
 host_os = linux-gnu
 host_vendor = pc
 includedir = ${prefix}/include
 infodir = ${prefix}/share/info
-install_sh = /afs/d2702.athenacr.com/users/dilinger/mysql++-2.0.6/install-sh
+install_sh = /home/devel/release/mysql++-2.0.6/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${prefix}/lib/mysql++
 localstatedir = /var
only in patch2:
unchanged:
--- mysql++-2.0.6.orig/debian/libmysql++2c2a.dirs
+++ mysql++-2.0.6/debian/libmysql++2c2a.dirs
@@ -0,0 +1 @@
+/usr/lib
only in patch2:
unchanged:
--- mysql++-2.0.6.orig/debian/libmysql++2c2a.docs
+++ mysql++-2.0.6/debian/libmysql++2c2a.docs
@@ -0,0 +1,2 @@
+CREDITS
+HACKERS
only in patch2:
unchanged:
--- mysql++-2.0.6.orig/debian/libmysql++2c2a.install
+++ mysql++-2.0.6/debian/libmysql++2c2a.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*

Attachment: signature.asc
Description: Digital signature

Reply via email to