diff -Nru guile-gnome-platform-2.16.1/debian/changelog guile-gnome-platform-2.16.1/debian/changelog --- guile-gnome-platform-2.16.1/debian/changelog 2011-08-14 11:17:51.000000000 +0000 +++ guile-gnome-platform-2.16.1/debian/changelog 2011-09-01 15:16:05.000000000 +0000 @@ -1,3 +1,9 @@ +guile-gnome-platform (2.16.1-6ubuntu2) oneiric; urgency=low + + * Link libguile-gnome-corba against libORBit (LP: #832914). + + -- Colin Watson Thu, 01 Sep 2011 16:16:04 +0100 + guile-gnome-platform (2.16.1-6ubuntu1) oneiric; urgency=low * Merge with Debian; remaining changes: diff -Nru guile-gnome-platform-2.16.1/debian/patches/fixes/link-with-orbit.diff guile-gnome-platform-2.16.1/debian/patches/fixes/link-with-orbit.diff --- guile-gnome-platform-2.16.1/debian/patches/fixes/link-with-orbit.diff 1970-01-01 00:00:00.000000000 +0000 +++ guile-gnome-platform-2.16.1/debian/patches/fixes/link-with-orbit.diff 2011-09-01 15:16:03.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Link libguile-gnome-corba against libORBit +Author: Colin Watson +Bug-Ubuntu: https://bugs.launchpad.net/bugs/832914 +Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=657947 +Last-Update: 2011-09-01 + +Index: b/corba/gnome/corba/Makefile.am +=================================================================== +--- a/corba/gnome/corba/Makefile.am ++++ b/corba/gnome/corba/Makefile.am +@@ -15,7 +15,8 @@ + libguile_gnome_corba_@API_VERSION@_la_CFLAGS = $(CORBA_CFLAGS) \ + $(AM_CFLAGS) $(GUILE_GLIB_CFLAGS) $(GUILE_CFLAGS) -DORBIT2_STUBS_API + +-libguile_gnome_corba_@API_VERSION@_la_LIBADD = $(GUILE_GLIB_LIBS) $(GUILE_LIBS) ++libguile_gnome_corba_@API_VERSION@_la_LIBADD = $(CORBA_LIBS) \ ++ $(GUILE_GLIB_LIBS) $(GUILE_LIBS) + libguile_gnome_corba_@API_VERSION@_la_LDFLAGS = -export-dynamic # FIXME: version info + + guile_gnome_includedir = $(includedir)/guile-gnome-@API_VERSION@ diff -Nru guile-gnome-platform-2.16.1/debian/patches/series guile-gnome-platform-2.16.1/debian/patches/series --- guile-gnome-platform-2.16.1/debian/patches/series 2011-05-02 23:36:03.000000000 +0000 +++ guile-gnome-platform-2.16.1/debian/patches/series 2011-09-01 14:52:32.000000000 +0000 @@ -2,3 +2,4 @@ fixes/gtk-2.18-build.diff -p1 fixes/link-with-guile-cairo.diff -p1 fixes/snarf-newer-cpp.diff -p1 +fixes/link-with-orbit.diff -p1