diff -Nru xmp-3.4.0/debian/changelog xmp-3.4.0/debian/changelog
--- xmp-3.4.0/debian/changelog	2012-03-05 21:51:15.000000000 +1000
+++ xmp-3.4.0/debian/changelog	2012-10-15 22:21:35.000000000 +1000
@@ -1,3 +1,11 @@
+xmp (3.4.0-1ubuntu2.1) precise; urgency=low
+
+  * Non-maintainer upload.
+  * Try fixing the XMP plugin for Audacious 3.2.
+  * Update tuple_associate_[string/int] to tuple_set_[str/int]
+
+ -- root <root@nymphaea>  Mon, 15 Oct 2012 22:21:12 +1000
+
 xmp (3.4.0-1ubuntu2) precise; urgency=low
 
   * Add patch from Fedora to fix build with Audacious 3.2 (LP: #935492).
diff -Nru xmp-3.4.0/debian/patches/fix-audacious-xmp-plugin.patch xmp-3.4.0/debian/patches/fix-audacious-xmp-plugin.patch
--- xmp-3.4.0/debian/patches/fix-audacious-xmp-plugin.patch	1970-01-01 10:00:00.000000000 +1000
+++ xmp-3.4.0/debian/patches/fix-audacious-xmp-plugin.patch	2012-10-15 22:24:11.000000000 +1000
@@ -0,0 +1,58 @@
+Index: xmp-3.4.0/src/plugin/audacious.c
+===================================================================
+--- xmp-3.4.0.orig/src/plugin/audacious.c	2011-08-07 23:18:33.000000000 +1000
++++ xmp-3.4.0/src/plugin/audacious.c	2012-10-15 22:24:03.663068917 +1000
+@@ -21,8 +21,8 @@
+ #else
+ #include <gtk/gtk.h>
+ #define aud_tuple_new_from_filename	tuple_new_from_filename
+-#define aud_tuple_associate_string	tuple_associate_string
+-#define aud_tuple_associate_int		tuple_associate_int
++#define aud_tuple_set_str		tuple_set_str
++#define aud_tuple_set_int		tuple_set_int
+ #endif
+ 
+ #include "xmp.h"
+@@ -499,9 +499,9 @@
+ 
+ 	xmp_get_module_info(ctx2, &mi);
+ 
+-	aud_tuple_associate_string(tuple, FIELD_TITLE, NULL, mi.name);
+-	aud_tuple_associate_string(tuple, FIELD_CODEC, NULL, mi.type);
+-	aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, lret);
++	aud_tuple_set_str(tuple, FIELD_TITLE, NULL, mi.name);
++	aud_tuple_set_str(tuple, FIELD_CODEC, NULL, mi.type);
++	aud_tuple_set_int(tuple, FIELD_LENGTH, NULL, lret);
+ 
+ 	xmp_release_module(ctx2);
+ 	xmp_free_context(ctx2);
+Index: xmp-3.4.0/src/plugin/audacious3.c
+===================================================================
+--- xmp-3.4.0.orig/src/plugin/audacious3.c	2012-10-15 22:19:24.000000000 +1000
++++ xmp-3.4.0/src/plugin/audacious3.c	2012-10-15 22:23:14.951068342 +1000
+@@ -250,9 +250,9 @@
+ 	xmp_get_module_info(ctx, &mi);
+ 
+ 	tuple = tuple_new_from_filename(filename);
+-	tuple_associate_string(tuple, FIELD_TITLE, NULL, mi.name);
+-	tuple_associate_string(tuple, FIELD_CODEC, NULL, mi.type);
+-	tuple_associate_int(tuple, FIELD_LENGTH, NULL, len);
++	tuple_set_str(tuple, FIELD_TITLE, NULL, mi.name);
++	tuple_set_str(tuple, FIELD_CODEC, NULL, mi.type);
++	tuple_set_int(tuple, FIELD_LENGTH, NULL, len);
+ 
+ 	xmp_release_module(ctx);
+ 	xmp_free_context(ctx);
+@@ -351,9 +351,9 @@
+ 	xmp_get_module_info(ctx, &xmp_cfg.mod_info);
+ 
+ 	tuple = tuple_new_from_filename(filename);
+-	tuple_associate_string(tuple, FIELD_TITLE, NULL, xmp_cfg.mod_info.name);
+-	tuple_associate_string(tuple, FIELD_CODEC, NULL, xmp_cfg.mod_info.type);
+-	tuple_associate_int(tuple, FIELD_LENGTH, NULL, lret);
++	tuple_set_str(tuple, FIELD_TITLE, NULL, xmp_cfg.mod_info.name);
++	tuple_set_str(tuple, FIELD_CODEC, NULL, xmp_cfg.mod_info.type);
++	tuple_set_int(tuple, FIELD_LENGTH, NULL, lret);
+ 	ipb->set_tuple(ipb, tuple);
+ 
+ 	ipb->set_params(ipb, xmp_cfg.mod_info.chn * 1000, opt->freq, channelcnt);
diff -Nru xmp-3.4.0/debian/patches/series xmp-3.4.0/debian/patches/series
--- xmp-3.4.0/debian/patches/series	2012-03-05 21:32:40.000000000 +1000
+++ xmp-3.4.0/debian/patches/series	2012-10-15 22:22:28.000000000 +1000
@@ -1 +1,2 @@
 audacious-3.1.patch
+fix-audacious-xmp-plugin.patch
diff -Nru xmp-3.4.0/debian/.pc/.quilt_patches xmp-3.4.0/debian/.pc/.quilt_patches
--- xmp-3.4.0/debian/.pc/.quilt_patches	1970-01-01 10:00:00.000000000 +1000
+++ xmp-3.4.0/debian/.pc/.quilt_patches	2012-10-15 22:21:45.000000000 +1000
@@ -0,0 +1 @@
+patches
diff -Nru xmp-3.4.0/debian/.pc/.quilt_series xmp-3.4.0/debian/.pc/.quilt_series
--- xmp-3.4.0/debian/.pc/.quilt_series	1970-01-01 10:00:00.000000000 +1000
+++ xmp-3.4.0/debian/.pc/.quilt_series	2012-10-15 22:21:45.000000000 +1000
@@ -0,0 +1 @@
+series
diff -Nru xmp-3.4.0/debian/.pc/.version xmp-3.4.0/debian/.pc/.version
--- xmp-3.4.0/debian/.pc/.version	1970-01-01 10:00:00.000000000 +1000
+++ xmp-3.4.0/debian/.pc/.version	2012-10-15 22:21:45.000000000 +1000
@@ -0,0 +1 @@
+2