Merge lp:~mterry/evince/ubuntu-2.32.0 into lp:~ubuntu-desktop/evince/ubuntu

[Michael Terry]

GNOME 2.32.0 merge

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-13 22:02:34 +0000
+++ debian/changelog	2010-09-27 19:49:39 +0000
@@ -1,3 +1,11 @@
+evince (2.32.0-0ubuntu1) maverick; urgency=low
+
+  * New upstream version
+  * 02_fix_ftbfs_with_disable_dbus.patch:
+    - Dropped, applied upstream
+
+ -- Michael Terry <[e-mail]>  Mon, 27 Sep 2010 15:41:55 -0400
+
 evince (2.31.92-0ubuntu2) maverick; urgency=low
 
   * debian/rules:

=== modified file 'debian/control'
--- debian/control	2010-09-06 21:43:04 +0000
+++ debian/control	2010-09-27 19:49:39 +0000
@@ -8,7 +8,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Josselin Mouette <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/evince/ubuntu
 Build-Depends: cdbs,
                debhelper (>= 7.4.20ubuntu5),

=== removed file 'debian/patches/02_fix_ftbfs_with_disable_dbus.patch'
--- debian/patches/02_fix_ftbfs_with_disable_dbus.patch	2010-09-13 10:44:20 +0000
+++ debian/patches/02_fix_ftbfs_with_disable_dbus.patch	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-# Description: condition ev_window_emit_doc_loaded to #ifdef ENABLE_DBUS as the
-# signal is added only with dbus activated (and calling function is called with
-# or without disable-dbus)
-# Author: Didier Roche <[e-mail]>
-# Origin: Ubuntu
-# Bug: https://bugzilla.gnome.org/show_bug.cgi?id=629498
-# Bug-Ubuntu: https://bugs.launchpad.net/evince/+bug/636971
-Index: evince-2.31.92/shell/ev-window.c
-===================================================================
---- evince-2.31.92.orig/shell/ev-window.c	2010-09-13 12:39:53.524780001 +0200
-+++ evince-2.31.92/shell/ev-window.c	2010-09-13 12:40:41.284780000 +0200
-@@ -1547,7 +1547,9 @@
- 	if (!ev_job_is_failed (job)) {
- 		ev_document_model_set_document (ev_window->priv->model, document);
- 
-+		#ifdef ENABLE_DBUS
- 		ev_window_emit_doc_loaded (ev_window);
-+		#endif
- 		setup_chrome_from_metadata (ev_window);
- 		update_chrome_actions (ev_window);
- 		setup_document_from_metadata (ev_window);

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-13 10:44:20 +0000
+++ debian/patches/series	2010-09-27 19:49:39 +0000
@@ -1,3 +1,2 @@
 01_lpi.patch
 
-02_fix_ftbfs_with_disable_dbus.patch