diff -u nspluginwrapper-0.9.91.5/debian/patches/series nspluginwrapper-0.9.91.5/debian/patches/series
--- nspluginwrapper-0.9.91.5/debian/patches/series
+++ nspluginwrapper-0.9.91.5/debian/patches/series
@@ -4,0 +5 @@
+004_fix_threading.diff
diff -u nspluginwrapper-0.9.91.5/debian/changelog nspluginwrapper-0.9.91.5/debian/changelog
--- nspluginwrapper-0.9.91.5/debian/changelog
+++ nspluginwrapper-0.9.91.5/debian/changelog
@@ -1,3 +1,28 @@
+nspluginwrapper (0.9.91.5-2ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. (LP: #196540) Remaining Ubuntu changes:
+  * debian/control:
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+    - Removed ia32-libs-gtk and util-linux from depends
+    - Changed Xs-Vcs-Bzr field to Xs-Vcs-Bzr:
+      http://code.launchpad.net/~ubuntu-core-dev/nspluginwrapper/ubuntu
+
+ -- Stefan Ebner <hellboy195@gmail.com>  Tue, 29 Jan 2008 22:31:46 +0100
+
+nspluginwrapper (0.9.91.5-2) unstable; urgency=low
+
+  * linux32 is now provided by util-linux, so remove runtime dep on
+    linux32 (no longer installable)
+  * Fix issues on SMP by initialising and using gthreads in glib
+    - patch is 004_fix_threading.diff (Closes: #458584)
+  * Enable 003_update_help_info.diff, which for some reason I forgot to
+    put into the quilt series file
+  * Add a shlibs.local file for ia32-libs-gtk dep generation - in the
+    absence of a ia32-libs-gtk-dev package, this fixes the FTBFS
+    Thanks to Dan Callahan (Closes: #462198)
+
+ -- Rob Andrews <rob@choralone.org>  Mon, 28 Jan 2008 23:27:29 +0000
+
 nspluginwrapper (0.9.91.5-1ubuntu1) gutsy; urgency=low
 
   [ Scott Kitterman ]
only in patch2:
unchanged:
--- nspluginwrapper-0.9.91.5.orig/debian/patches/004_fix_threading.diff
+++ nspluginwrapper-0.9.91.5/debian/patches/004_fix_threading.diff
@@ -0,0 +1,29 @@
+Patch from svn r480, fixes SMP breakage.
+
+ -- Rob Andrews <rob@choralone.org>  Sat, 26 Jan 2008 03:01:31 +0000
+
+Index: trunk/src/npw-viewer.c
+===================================================================
+--- trunk/src/npw-viewer.c	(revision 479)
++++ trunk/src/npw-viewer.c	(revision 480)
+@@ -3006,6 +3006,7 @@
+   XtToolkitInitialize();
+   x_app_context = XtCreateApplicationContext();
+   x_display = XtOpenDisplay(x_app_context, NULL, "npw-viewer", "npw-viewer", NULL, 0, &argc, argv);
++  g_thread_init(NULL);
+   gtk_init(&argc, &argv);
+ 
+   // Initialize RPC communication channel
+Index: trunk/Makefile
+===================================================================
+--- trunk/Makefile	(revision 479)
++++ trunk/Makefile	(revision 480)
+@@ -101,7 +101,7 @@
+ npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0
+ npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0
+ npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
+-npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt
++npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lX11 -lXt
+ else
+ npviewer_CFLAGS += $(GTK_CFLAGS)
+ npviewer_LDFLAGS = $(GTK_LDFLAGS) $(X_LDFLAGS)
only in patch2:
unchanged:
--- nspluginwrapper-0.9.91.5.orig/debian/shlibs.local
+++ nspluginwrapper-0.9.91.5/debian/shlibs.local
@@ -0,0 +1,6 @@
+# Fix FTBFS due to ia32-libs-gtk not shipping a shlibs file (#460737)
+libgthread-2.0		0			ia32-libs-gtk
+libgobject-2.0		0			ia32-libs-gtk
+libgtk-x11-2.0		0			ia32-libs-gtk
+libglib-2.0		0			ia32-libs-gtk
+libgdk-x11-2.0		0			ia32-libs-gtk