Bug#319411: nmu patch

[Mike Furr]

Adeodato Simó wrote:

  I can't see this patch in your NMU diff, and it doesn't seem to be in
  the uploaded package either (as found on gluck_delayed/DONE). Just
  mentioning in case it can be useful.
Bah, you are absolutely right.  Sorry about that.  I prepared the 
package and then my chroot broke, so I had to recreate the chroot and 
must have lost that patch along the way.


-mike

Bug#319411: nmu patch

[Mike Furr]

here is the nmu patch

-Mike
diff -urN orig/libmusicbrainz-2.1-2.1.1/debian/changelog 
libmusicbrainz-2.1-2.1.1/debian/changelog
--- orig/libmusicbrainz-2.1-2.1.1/debian/changelog  2005-07-21 
21:38:07.969903697 +
+++ libmusicbrainz-2.1-2.1.1/debian/changelog   2005-07-22 01:13:37.553732007 
+
@@ -1,3 +1,11 @@
+libmusicbrainz-2.1 (2.1.1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Rebuild against g++-4.0 (Closes: #319411)
+  * Applied amd64 g++-4.0 patch (Closes: #316584)
+
+ -- Mike Furr [EMAIL PROTECTED]  Thu, 21 Jul 2005 21:29:05 +
+
 libmusicbrainz-2.1 (2.1.1-3) unstable; urgency=low
 
   * debian/rules: Use simple-patchsys.mk.
diff -urN orig/libmusicbrainz-2.1-2.1.1/debian/control 
libmusicbrainz-2.1-2.1.1/debian/control
--- orig/libmusicbrainz-2.1-2.1.1/debian/control2005-07-21 
21:38:07.972903309 +
+++ libmusicbrainz-2.1-2.1.1/debian/control 2005-07-22 01:12:20.781649092 
+
@@ -8,7 +8,7 @@
 Package: libmusicbrainz4-dev
 Architecture: any
 Section: libdevel
-Depends: libmusicbrainz4 (= ${Source-Version}), libc6-dev
+Depends: libmusicbrainz4c2 (= ${Source-Version}), libc6-dev
 Provides: libmusicbrainz-dev
 Conflicts: libmusicbrainz-dev
 Description: Second generation incarnation of the CD Index - development
@@ -17,11 +17,12 @@
  .
  This package contains the development files (headers, static library).
 
-Package: libmusicbrainz4
+Package: libmusicbrainz4c2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libmusicbrainz1
+Replaces: libmusicbrainz4
+Conflicts: libmusicbrainz1, libmusicbrainz4
 Description: Second generation incarnation of the CD Index - library
  MusicBrainz indexes both digital compressed audio (MP3/Vorbis) and 
  digital audio CDs.
diff -urN orig/libmusicbrainz-2.1-2.1.1/debian/libmusicbrainz4.install 
libmusicbrainz-2.1-2.1.1/debian/libmusicbrainz4.install
--- orig/libmusicbrainz-2.1-2.1.1/debian/libmusicbrainz4.install
2005-07-21 21:38:07.981902144 +
+++ libmusicbrainz-2.1-2.1.1/debian/libmusicbrainz4.install 1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*.so.*
diff -urN orig/libmusicbrainz-2.1-2.1.1/debian/libmusicbrainz4c2.install 
libmusicbrainz-2.1-2.1.1/debian/libmusicbrainz4c2.install
--- orig/libmusicbrainz-2.1-2.1.1/debian/libmusicbrainz4c2.install  
1970-01-01 00:00:00.0 +
+++ libmusicbrainz-2.1-2.1.1/debian/libmusicbrainz4c2.install   2005-07-22 
01:12:20.784648705 +
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*.so.*