diff -Nru xmp-3.4.0/debian/changelog xmp-3.4.0/debian/changelog
--- xmp-3.4.0/debian/changelog	2012-10-19 19:49:20.000000000 +1000
+++ xmp-3.4.0/debian/changelog	2012-03-05 21:51:15.000000000 +1000
@@ -1,10 +1,3 @@
-xmp (3.4.0-1ubuntu2.1) UNRELEASED; urgency=high
-
-  * Non-maintainer upload.
-  * Make Audacious plugin actually work (LP: #1066868).
-
- -- Lem <lem.jjr@gmail.com>  Fri, 19 Oct 2012 19:46:47 +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-plugin.patch xmp-3.4.0/debian/patches/fix-audacious-plugin.patch
--- xmp-3.4.0/debian/patches/fix-audacious-plugin.patch	2012-10-19 19:53:40.000000000 +1000
+++ xmp-3.4.0/debian/patches/fix-audacious-plugin.patch	1970-01-01 10:00:00.000000000 +1000
@@ -1,58 +0,0 @@
-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-19 19:53:29.926219131 +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-19 19:41:31.000000000 +1000
-+++ xmp-3.4.0/src/plugin/audacious3.c	2012-10-19 19:52:44.554218596 +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-10-19 19:51:19.000000000 +1000
+++ xmp-3.4.0/debian/patches/series	2012-03-05 21:32:40.000000000 +1000
@@ -1,2 +1 @@
 audacious-3.1.patch
-fix-audacious-plugin.patch