diff -u pornview-0.2pre1/debian/control pornview-0.2pre1/debian/control
--- pornview-0.2pre1/debian/control
+++ pornview-0.2pre1/debian/control
@@ -9,7 +9,7 @@
 
 Package: pornview
 Architecture: any
-Depends: ${shlibs:Depends}, libxine1-x | libxine1 (<< 1.1.8-2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxine1-x | libxine1 (<< 1.1.8-2)
 Description: Image and movie viewer/manager
  PornView is an image and movie viewer/manager with thumbnail previews.
  Additional features includes thumbnail caching, directory tree views,
diff -u pornview-0.2pre1/debian/changelog pornview-0.2pre1/debian/changelog
--- pornview-0.2pre1/debian/changelog
+++ pornview-0.2pre1/debian/changelog
@@ -1,3 +1,22 @@
+pornview (0.2pre1-11.1ubuntu1) precise; urgency=low
+
+  * Merged from Debian testing. Remaining changes:
+    - Preferred Ubuntu's --no-add-needed patch.
+    - Bumped libxine-dev build-dependency.
+    - Installed upstream's changelog.
+    - Added Homepage field.
+
+ -- Ubuntu Merge-o-Matic <mom@ubuntu.com>  Wed, 01 Feb 2012 05:20:04 +0000
+
+pornview (0.2pre1-11.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with gold or ld --no-add-needed": new patch
+    615765-gold-no-add-needed: pass -lm to linker.
+    (Closes: #615765)
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 19 Jan 2012 17:37:24 +0100
+
 pornview (0.2pre1-11ubuntu2) oneiric; urgency=low
 
   * debian/patches/change-libs-param-order-with-ld.patch: reordered
only in patch2:
unchanged:
--- pornview-0.2pre1.orig/debian/patches/615765-gold-no-add-needed
+++ pornview-0.2pre1/debian/patches/615765-gold-no-add-needed
@@ -0,0 +1,25 @@
+Description: pass -lm to linker to avoid FTBFS with binutils-gold or --no-add-needed
+Origin:      vendor
+Bug-Debian:  http://bugs.debian.org/615765
+Forwarded:   no
+Author:      gregor herrmann <gregoa@debian.org>
+Last-Update: 2012-01-19
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -55,4 +55,4 @@
+ pornview_LDADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(PNG_LIBS) $(MOVIELIB_LIBS) \
+ 	$(INTLLIBS) $(LIBICONV) $(LIBCHARSET) $(X_LIBS) $(XINERAMA_LIBS) \
+ 	prefs_ui/libprefs_ui.la  support/widgets/libsupport_widgets.la \
+-	support/libsupport_utils.la $(LIBEXIF)
++	support/libsupport_utils.la $(LIBEXIF) -lm
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -144,7 +144,7 @@
+ pornview_LDFLAGS =  	-export-dynamic
+ 
+ 
+-pornview_LDADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(PNG_LIBS) $(MOVIELIB_LIBS) 	$(INTLLIBS) $(LIBICONV) $(LIBCHARSET) $(X_LIBS) $(XINERAMA_LIBS) 	prefs_ui/libprefs_ui.la  support/widgets/libsupport_widgets.la 	support/libsupport_utils.la $(LIBEXIF)
++pornview_LDADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(PNG_LIBS) $(MOVIELIB_LIBS) 	$(INTLLIBS) $(LIBICONV) $(LIBCHARSET) $(X_LIBS) $(XINERAMA_LIBS) 	prefs_ui/libprefs_ui.la  support/widgets/libsupport_widgets.la 	support/libsupport_utils.la $(LIBEXIF) -lm
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h