From jaq at spacepants.org  Mon Jun 19 04:53:29 2006
From: jaq at spacepants.org (Jamie Wilkinson)
Date: Mon Jun 19 04:53:42 2006
Subject: [libannodex-dev] fwd: Bug#372275: libannodex 0.7.3-3.1 NMU
Message-ID: <20060619045328.GI9137@spacepants.org>

Hey,

Years ago you promised me a fresh libannodex that could build against the
lastest libcmml; in the meantime it's failing autobuilds in Debian and
someone's decided to patch it (attached).  Thought you'd be interested to
see how it's being worked around.

P.S. hurry up with the official fix!

----- Forwarded message from Matej Vela <vela@debian.org> -----

Date: Mon, 19 Jun 2006 06:03:11 +0200
From: Matej Vela <vela@debian.org>
Subject: Bug#372275: libannodex 0.7.3-3.1 NMU
Reply-To: Matej Vela <vela@debian.org>, 372275@bugs.debian.org
To: 372275@bugs.debian.org
X-Debian-PR-Message: report 372275
X-Debian-PR-Package: libannodex
X-Debian-PR-Keywords: 
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux)
X-Scanned-By: MIMEDefang 2.51 on 161.53.22.8

Hello,

I'm doing an NMU of libannodex to fix #372275; diff attached.

Thanks,

Matej

diff -u libannodex-0.7.3/debian/changelog libannodex-0.7.3/debian/changelog
--- libannodex-0.7.3/debian/changelog
+++ libannodex-0.7.3/debian/changelog
@@ -1,3 +1,13 @@
+libannodex (0.7.3-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build against libcmml1-dev.  Closes: #372275.
+  * src/importers/anx_import_cmml.c: CMML_LinkElement::class has been
+    renamed to CMML_LinkElement::link_class; CMML_Clip::class has been
+    renamed to CMML_Clip::clip_class.
+
+ -- Matej Vela <vela@debian.org>  Mon, 19 Jun 2006 05:56:52 +0200
+
 libannodex (0.7.3-3) unstable; urgency=low
 
   * Build against libcmml0-dev 0.9.0 (libcmml API changed at 0.9.1 and
diff -u libannodex-0.7.3/debian/control libannodex-0.7.3/debian/control
--- libannodex-0.7.3/debian/control
+++ libannodex-0.7.3/debian/control
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Jamie Wilkinson <jaq@debian.org>
-Build-Depends: debhelper (>> 4.0.0), liboggz1-dev (>= 0.9.1), libcmml0-dev (>= 0.9.0), pkg-config, libsndfile1-dev, doxygen, docbook-to-man
+Build-Depends: debhelper (>> 4.0.0), liboggz1-dev (>= 0.9.1), libcmml1-dev, pkg-config, libsndfile1-dev, doxygen, docbook-to-man
 Standards-Version: 3.6.2
 
 Package: libannodex0
only in patch2:
unchanged:
--- libannodex-0.7.3.orig/src/importers/anx_import_cmml.c
+++ libannodex-0.7.3/src/importers/anx_import_cmml.c
@@ -99,7 +99,7 @@
 
   new_link = (AnxLinkElement* ) anx_malloc (sizeof (AnxLinkElement));
   new_link->id = anxcmml_strdup (link->id);
-  new_link->class = anxcmml_strdup (link->class);
+  new_link->class = anxcmml_strdup (link->link_class);
   new_link->title = anxcmml_strdup (link->title);
   new_link->lang = anxcmml_strdup (link->lang);
   new_link->dir = anxcmml_strdup (link->dir);
@@ -258,7 +258,7 @@
 
   /* copy clip data across */
   a->clip_id = anxcmml_strdup (clip->clip_id);
-  a->class = anxcmml_strdup (clip->class);
+  a->class = anxcmml_strdup (clip->clip_class);
   a->title = anxcmml_strdup (clip->title);
   a->lang = anxcmml_strdup (clip->lang);
   a->dir = anxcmml_strdup (clip->dir);


----- End forwarded message -----