tags 339162 patch
thanks

Hi Michael,

I've prepared an NMU to also fix this bug in eris.  The patch for this 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.

Thanks,
-- 
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/
diff -u eris-1.3.8/debian/control eris-1.3.8/debian/control
--- eris-1.3.8/debian/control
+++ eris-1.3.8/debian/control
@@ -2,14 +2,14 @@
 Section: libs
 Priority: optional
 Maintainer: Michael Koch <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>> 4.0.0), libsigc++-1.2-dev (>= 1.2.5-5), 
doxygen, libglib2.0-dev, libatlas-cpp-0.6-0-dev (>= 0.5.97-1), 
libskstream-0.3-dev (>= 0.3.5-1), libwfmath-0.3-dev (>= 0.3.4-2)
+Build-Depends: cdbs, debhelper (>> 4.0.0), libsigc++-1.2-dev (>= 1.2.5-5), 
doxygen, libglib2.0-dev, libatlas-cpp-0.6-dev (>= 0.5.98-2), 
libskstream-0.3-dev (>= 0.3.5-1), libwfmath-0.3-dev (>= 0.3.4-3)
 Build-Conflicts: libsigcperl-dev, libsigc-perl, libsigc++-2.0-dev
 Standards-Version: 3.6.2
 
 Package: liberis-1.3-dev
 Section: libdevel
 Architecture: any
-Depends: liberis-1.3-7 (= ${Source-Version}), libatlas-cpp-0.6-0-dev (>= 
0.5.97-1), libskstream-0.3-dev (>= 0.3.5-1), libwfmath-0.3-dev (>= 0.3.4-2), 
libsigc++-1.2-dev (>= 1.2.5-5), libglib2.0-dev
+Depends: liberis-1.3-7c2a (= ${Source-Version}), libatlas-cpp-0.6-0-dev (>= 
0.5.97-1), libskstream-0.3-dev (>= 0.3.5-1), libwfmath-0.3-dev (>= 0.3.4-2), 
libsigc++-1.2-dev (>= 1.2.5-5), libglib2.0-dev
 Description: The WorldForge client entity library - development files
  Eris is designed to simplify client development (and avoid repeating the
  same work several times), by providing a common system to deal with the
@@ -37,10 +37,12 @@
  This package contains the development files for compiling software
  depending on Eris.
 
-Package: liberis-1.3-7
+Package: liberis-1.3-7c2a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: liberis-1.3-7
+Replaces: liberis-1.3-7
 Description: The WorldForge client entity library
  Eris is designed to simplify client development (and avoid repeating the
  same work several times), by providing a common system to deal with the
@@ -69,7 +71,7 @@
 Section: libdevel
 Architecture: any
 Priority: extra
-Depends: liberis-1.3-7 (= ${Source-Version})
+Depends: liberis-1.3-7c2a (= ${Source-Version})
 Description: The WorldForge client entity library - debugging library
  Eris is designed to simplify client development (and avoid repeating the
  same work several times), by providing a common system to deal with the
diff -u eris-1.3.8/debian/changelog eris-1.3.8/debian/changelog
--- eris-1.3.8/debian/changelog
+++ eris-1.3.8/debian/changelog
@@ -1,3 +1,15 @@
+eris (1.3.8-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Medium-urgency upload for RC bugfix.
+  * Rename liberis-1.3-7 to liberis-1.3-7c2a for the C++ mt allocator
+    ABI transition, and conflict/replace with liberis-1.3-7 accordingly.
+    Closes: #339162.
+  * Build-depend on libatlas-cpp-0.6-dev (>= 0.5.98-2) and
+    libwfmath-0.3-dev (>= 0.3.4-3).
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Mon, 28 Nov 2005 07:09:42 -0800
+
 eris (1.3.8-1) unstable; urgency=low
 
   * New upstream release
reverted:
--- eris-1.3.8/debian/liberis-1.3-7.install
+++ eris-1.3.8.orig/debian/liberis-1.3-7.install
@@ -1,2 +0,0 @@
-usr/lib/liberis-1.3.so.7
-usr/lib/liberis-1.3.so.7.0.0
only in patch2:
unchanged:
--- eris-1.3.8.orig/debian/liberis-1.3-7c2a.install
+++ eris-1.3.8/debian/liberis-1.3-7c2a.install
@@ -0,0 +1,2 @@
+usr/lib/liberis-1.3.so.7
+usr/lib/liberis-1.3.so.7.0.0

Attachment: signature.asc
Description: Digital signature

Reply via email to