Ubuntu libgnome 2.15.1-0ubuntu2

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Tue, 18 Jul 2006 15:19:06 +0200
Source: libgnome
Binary: libgnome2-common libgnome2-0 libgnome2-doc libgnome2-dev
Architecture: source
Version: 2.15.1-0ubuntu2
Distribution: edgy
Urgency: low
Maintainer: Ondřej Surý <ondrej at debian.org>
Changed-By: Sebastien Bacher <seb128 at canonical.com>
Description: 
 libgnome2-0 - The GNOME 2 library - runtime files
 libgnome2-common - The GNOME 2 library - common files
 libgnome2-dev - The GNOME 2 library - development files
 libgnome2-doc - The GNOME 2 library - documentation files
Changes: 
 libgnome (2.15.1-0ubuntu2) edgy; urgency=low
 .
   * reapply Ubuntu changes dropped with the previous upload
   * debian/libgnome2-common.gconf-defaults:
     - changes to default configuration for Ubuntu
   * debian/patches/04_gnome-score.c.patch:
     - dropped, it's not required with the new version
   * debian/patches/09_run_app_message_fix.patch:
     - bug fix for Malone: #29005
   * debian/patches/10_sounds_event_list.patch:
     - no sound event out of the login one for the default configuration
Files: 
 c3f91fd88d13f32b8200121fcbb03a60 1687 devel optional libgnome_2.15.1-0ubuntu2.dsc
 a7dc309c49fc431fc3f2c5fd402f7f1e 9881 devel optional libgnome_2.15.1-0ubuntu2.diff.gz
-------------- next part --------------
diff -pruN 2.15.1-0ubuntu1/debian/changelog 2.15.1-0ubuntu2/debian/changelog
--- 2.15.1-0ubuntu1/debian/changelog	2006-07-18 16:07:43.000000000 +0100
+++ 2.15.1-0ubuntu2/debian/changelog	2006-07-18 16:07:43.000000000 +0100
@@ -1,3 +1,17 @@
+libgnome (2.15.1-0ubuntu2) edgy; urgency=low
+
+  * reapply Ubuntu changes dropped with the previous upload
+  * debian/libgnome2-common.gconf-defaults:
+    - changes to default configuration for Ubuntu 
+  * debian/patches/04_gnome-score.c.patch:
+    - dropped, it's not required with the new version
+  * debian/patches/09_run_app_message_fix.patch:
+    - bug fix for Malone: #29005
+  * debian/patches/10_sounds_event_list.patch:
+    - no sound event out of the login one for the default configuration
+
+ -- Sebastien Bacher <seb128 at canonical.com>  Tue, 18 Jul 2006 15:19:06 +0200
+
 libgnome (2.15.1-0ubuntu1) edgy; urgency=low
 
   * New upstream release:
diff -pruN 2.15.1-0ubuntu1/debian/libgnome2-common.gconf-defaults 2.15.1-0ubuntu2/debian/libgnome2-common.gconf-defaults
--- 2.15.1-0ubuntu1/debian/libgnome2-common.gconf-defaults	2006-07-18 16:07:43.000000000 +0100
+++ 2.15.1-0ubuntu2/debian/libgnome2-common.gconf-defaults	2006-07-18 16:07:43.000000000 +0100
@@ -1,3 +1,9 @@
-/desktop/gnome/background/picture_filename	/usr/share/images/desktop-base/debian-background.svg
-/desktop/gnome/background/picture_options	stretched
-/desktop/gnome/applications/browser/exec	epiphany
+/desktop/gnome/background/picture_options 	stretched
+/desktop/gnome/background/picture_filename	/usr/share/backgrounds/warty-final-ubuntu.png
+/desktop/gnome/interface/gtk_theme	Human
+/desktop/gnome/interface/icon_theme	Human
+/desktop/gnome/applications/browser/exec	firefox
+/desktop/gnome/sound/enable_esd		true
+/desktop/gnome/sound/event_sounds	true
+/desktop/gnome/background/primary_color		#4E3E29
+/desktop/gnome/peripherals/mouse/cursor_theme	Human
diff -pruN 2.15.1-0ubuntu1/debian/patches/09_run_app_message_fix.patch 2.15.1-0ubuntu2/debian/patches/09_run_app_message_fix.patch
--- 2.15.1-0ubuntu1/debian/patches/09_run_app_message_fix.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2.15.1-0ubuntu2/debian/patches/09_run_app_message_fix.patch	2006-07-18 16:07:43.000000000 +0100
@@ -0,0 +1,11 @@
+diff -Nur libgnome-2.13.90/libgnome/gnome-url.c libgnome-2.13.90.new/libgnome/gnome-url.c
+--- libgnome-2.13.90/libgnome/gnome-url.c	2006-02-14 11:45:11.000000000 +0100
++++ libgnome-2.13.90.new/libgnome/gnome-url.c	2006-02-28 12:25:09.000000000 +0100
+@@ -148,6 +148,7 @@
+ 		break;
+ 
+ 	case GNOME_VFS_ERROR_INVALID_URI:
++	case GNOME_VFS_ERROR_NOT_FOUND:
+ 		g_set_error (error,
+ 		             GNOME_URL_ERROR,
+ 			     GNOME_URL_ERROR_VFS,
diff -pruN 2.15.1-0ubuntu1/debian/patches/10_sounds_event_list.patch 2.15.1-0ubuntu2/debian/patches/10_sounds_event_list.patch
--- 2.15.1-0ubuntu1/debian/patches/10_sounds_event_list.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2.15.1-0ubuntu2/debian/patches/10_sounds_event_list.patch	2006-07-18 16:07:43.000000000 +0100
@@ -0,0 +1,50 @@
+diff -Nur libgnome-2.13.90/gnome-data/gnome-2.soundlist.in libgnome-2.13.90.new/gnome-data/gnome-2.soundlist.in
+--- libgnome-2.13.90/gnome-data/gnome-2.soundlist.in	2003-07-11 21:49:10.000000000 +0200
++++ libgnome-2.13.90.new/gnome-data/gnome-2.soundlist.in	2006-03-03 16:04:28.000000000 +0100
+@@ -10,21 +10,21 @@
+ _description=Log out
+ 
+ [info]
+-file=info.wav
++file=
+ _description=Informational message
+ 
+ [warning]
+-file=warning.wav
++file=
+ _description=Warning message
+ 
+ [error]
+-file=error.wav
++file=
+ _description=Error message
+ 
+ [question]
+-file=question.wav
++file=
+ _description=Question dialog
+ 
+ [generic]
+-file=generic.wav
++file=
+ _description=Miscellaneous message
+diff -Nur libgnome-2.13.90/gnome-data/gtk-events-2.soundlist.in libgnome-2.13.90.new/gnome-data/gtk-events-2.soundlist.in
+--- libgnome-2.13.90/gnome-data/gtk-events-2.soundlist.in	2003-07-11 21:49:10.000000000 +0200
++++ libgnome-2.13.90.new/gnome-data/gtk-events-2.soundlist.in	2006-03-03 16:04:18.000000000 +0100
+@@ -2,13 +2,13 @@
+ _description=User interface events
+ 
+ [clicked]
+-file=gtk-events/clicked.wav
++file=
+ _description=Click on command button
+ 
+ [activate]
+-file=gtk-events/activate.wav
++file=
+ _description=Choose menu item
+ 
+ [toggled]
+-file=gtk-events/toggled.wav
++file=
+ _description=Select check box