Merge lp:~rodrigo-moya/ubuntu/maverick/gnome-settings-daemon/2_30_2_release into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Rodrigo Moya]

Release 2.30.2

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-10 03:30:52 +0000
+++ debian/changelog	2010-06-22 10:20:45 +0000
@@ -1,3 +1,11 @@
+gnome-settings-daemon (2.30.2-1ubuntu1) maverick; urgency=low
+
+  * New upstream release
+  * debian/patches/30_pkgconfig-path.patch:
+    - Fixed for latest upstream
+
+ -- Rodrigo Moya <[e-mail]>  Tue, 22 Jun 2010 12:08:23 +0200
+
 gnome-settings-daemon (2.30.1-1ubuntu2) maverick; urgency=low
 
   * debian/control.in:

=== modified file 'debian/patches/30_pkgconfig-path.patch'
--- debian/patches/30_pkgconfig-path.patch	2010-06-10 03:02:38 +0000
+++ debian/patches/30_pkgconfig-path.patch	2010-06-22 10:20:45 +0000
@@ -3,9 +3,9 @@
 --- gnome-settings-daemon-2.30.1.orig/data/gnome-settings-daemon.pc.in	2010-03-10 12:58:29.000000000 +0100
 +++ gnome-settings-daemon-2.30.1/data/gnome-settings-daemon.pc.in	2010-04-27 19:54:02.974028223 +0200
 @@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
  includedir=@includedir@
  libexecdir=@libexecdir@
+ plugindir=@plugindir@
 +binary=${libexecdir}/gnome-settings-daemon
  
  Name: gnome-settings-daemon