Merge lp:~rodrigo-moya/ubuntu/maverick/libcanberra/ubuntugtk3 into lp:~ubuntu-desktop/libcanberra/ubuntu

[Rodrigo Moya]

0.26 upstream release + GTK3 module

[lp:~rodrigo-moya/ubuntu/maverick/libcanberra/ubuntugtk3]

108. By Rodrigo Moya on 2010-11-03

Remove leftover comment in debian/changelog

109. By Rodrigo Moya on 2010-11-03

Made gtk3-dev package depend on the same libgtk3.0-dev version

110. By Rodrigo Moya on 2010-11-03

Document changes in debian/rules

111. By Rodrigo Moya on 2010-11-03

Made -gtk3-dev package depend on libcanberra-gtk-dev for header file

112. By Rodrigo Moya on 2010-11-04

Merge patch from Rico

113. By Rodrigo Moya on 2010-11-04

Add missing files

[Michael Terry (mterry)]

Looks good, per discussion yesterday. debian/changelog should be signed at the bottom with your name though. (running dch and making an edit should fix that)

And the targeted distribution should be maverick if it's PPA-bound.

review: Approve

[lp:~rodrigo-moya/ubuntu/maverick/libcanberra/ubuntugtk3]

114. By Rodrigo Moya on 2010-11-04

Sign changelog

=== modified file 'README'
--- README	2010-07-13 05:08:44 +0000
+++ README	2010-11-04 15:37:42 +0000
@@ -1,4 +1,4 @@
-                                libcanberra 0.25
+                                libcanberra 0.26
 
    Copyright 2008-2010 Lennart Poettering <mzyvopnaoreen (at) 0pointer
    (dot) de>
@@ -26,104 +26,108 @@
 
 News
 
+   Mon 4 Oct 2010:
+
+   [10]Version 0.26 released; Gtk+ 3.x fixes.
+
    Sun 13 Jun 2010:
 
-   [10]Version 0.25 released; Optionally build with Gtk+ 3.x in addition
+   [11]Version 0.25 released; Optionally build with Gtk+ 3.x in addition
    to Gtk+ 2.x.
 
    Mon 19 Apr 2010:
 
-   [11]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
+   [12]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
    in the PulseAudio backend, other fixes.
 
    Sat 20 Feb 2010:
 
-   [12]Version 0.23 released; various minor fixes in the pulse and
+   [13]Version 0.23 released; various minor fixes in the pulse and
    gstreamer backends as well in the Vala API. Support for the recently
    standardized Vorbis 6.1/7.1 multichannel modes.
 
    Tue 20 Oct 2009:
 
-   [13]Version 0.22 released; small fix to make sure we don't dereference
+   [14]Version 0.22 released; small fix to make sure we don't dereference
    a null pointer.
 
    Fri 16 Oct 2009:
 
-   [14]Version 0.21 released; suppress casting warning
+   [15]Version 0.21 released; suppress casting warning
 
    Thu 15 Oct 2009:
 
-   [15]Version 0.20 released; minor casting fix
+   [16]Version 0.20 released; minor casting fix
 
    Wed 14 Oct 2009:
 
-   [16]Version 0.19 released; some important fixes for the Gtk support
+   [17]Version 0.19 released; some important fixes for the Gtk support
 
    Sun 20 Sep 2009:
 
-   [17]Version 0.18 released; numerous updates for the Gtk support
+   [18]Version 0.18 released; numerous updates for the Gtk support
 
    Fri 12 Sep 2009:
 
-   [18]Version 0.17 released; add vala vapi file; numerous updates to Gtk
+   [19]Version 0.17 released; add vala vapi file; numerous updates to Gtk
    support
 
    Thu 27 Aug 2009:
 
-   [19]Version 0.16 released; add new ca_context_playing() call
+   [20]Version 0.16 released; add new ca_context_playing() call
 
    Wed 5 Aug 2009:
 
-   [20]Version 0.15 released; bug fixes
+   [21]Version 0.15 released; bug fixes
 
    Thu 2 Jul 2009:
 
-   [21]Version 0.14 released; bug fixes
+   [22]Version 0.14 released; bug fixes
 
    Tue 23 Jun 2009:
 
-   [22]Version 0.13 released; multichannel support; gtk multihead support;
+   [23]Version 0.13 released; multichannel support; gtk multihead support;
    bug fixes
 
    Mon 13 Apr 2009:
 
-   [23]Version 0.12 released; changes include: various fixes and updates
+   [24]Version 0.12 released; changes include: various fixes and updates
    for the PulseAudio backend; detect forks and return an error for all
    functions in that case
 
    Wed 21 Jan 2009:
 
-   [24]Version 0.11 released; changes include: major GStreamer backend
+   [25]Version 0.11 released; changes include: major GStreamer backend
    fixes; update to libtool 2.2; a few other fixes
 
    Mon 6 Oct 2008:
 
-   [25]Version 0.10 released; changes include: install Gtk+ module using
+   [26]Version 0.10 released; changes include: install Gtk+ module using
    GConf; a few other fixes
 
    Tue 9 Sep 2008:
 
-   [26]Version 0.9 released; changes include: GStreamer fixes, include
+   [27]Version 0.9 released; changes include: GStreamer fixes, include
    (optional) libtdb based lookup cache.
 
    Thu 28 Aug 2008:
 
-   [27]Version 0.8 released; changes include: new OSS and GStreamer
+   [28]Version 0.8 released; changes include: new OSS and GStreamer
    backend; portability fixes for FreeBSD/Solaris; the multi backend works
    now
 
    Thu 14 Aug 2008:
 
-   [28]Version 0.7 released; changes include: documentation updates;
+   [29]Version 0.7 released; changes include: documentation updates;
    various bug fixes; add this web site/README; allow playback of event
    sounds with only a sound file path specified; other changes
 
 Overview
 
-   libcanberra is an implementation of the [29]XDG Sound Theme and Name
+   libcanberra is an implementation of the [30]XDG Sound Theme and Name
    Specifications, for generating event sounds on free desktops, such as
-   [30]GNOME. It comes with several backends ([31]ALSA, [32]PulseAudio,
-   OSS, [33]GStreamer, null) and is designed to be portable. It consists
+   [31]GNOME. It comes with several backends ([32]ALSA, [33]PulseAudio,
+   OSS, [34]GStreamer, null) and is designed to be portable. It consists
    of the following parts:
     1. libcanberra: the main library
     2. libcanberra-gtk: some glue code to make it easier to use
@@ -131,14 +135,14 @@
     3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
        trigger input feedback event sounds
 
-   For more information see [34]the original announcement.
+   For more information see [35]the original announcement.
 
 Current Status
 
    libcanberra is mostly feature complete. For now however it includes
    backends only for ALSA, PulseAudio, OSS and GStreamer.
 
-   libcanberra has been declared [35]a blessed GNOME dependency.
+   libcanberra has been declared [36]a blessed GNOME dependency.
 
    The OSS driver is incomplete: only sound files that are in a format
    natively understood by the sound card are supported. If the sample
@@ -160,7 +164,7 @@
 
 Documentation
 
-   You may browse the [36]gtkdoc generated [37]programing documentation of
+   You may browse the [37]gtkdoc generated [38]programing documentation of
    the API.
 
 Requirements
@@ -195,25 +199,26 @@
 Download
 
    The newest release is always available from
-   [38]http://0pointer.de/lennart/projects/libcanberra/
-
-   The current release is [39]0.25
-
-   Get libcanberra's development sources from the [40]GIT [41]repository
-   ([42]gitweb):
+   [39]http://0pointer.de/lennart/projects/libcanberra/
+
+   The current release is [40]0.26
+
+   Get libcanberra's development sources from the [41]GIT [42]repository
+   ([43]gitweb):
 git clone git://git.0pointer.de/libcanberra
 
    If you want to report bugs, have questions or want to be notified about
-   new releases, please join the [43]libcanberra-discuss mailing list.
+   new releases, please join the [44]libcanberra-discuss mailing list.
 
    If you want to be notified about new git commits, please join the
-   [44]libcanberra-commits mailing list.
+   [45]libcanberra-commits mailing list.
 
-   libcanberra's bugs are tracked at [45]bugs.freedesktop.org.
+   libcanberra's bugs are tracked at [46]bugs.freedesktop.org.
      __________________________________________________________________
 
 
-    Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, June 2010
+    Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, October
+    2010
 
 References
 
@@ -226,39 +231,40 @@
    7. README#installation
    8. README#acks
    9. README#download
-  10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
-  11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
-  12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
-  13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
-  14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
-  15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
-  16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
-  17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
-  18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
-  19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
-  20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
-  21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
-  22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
-  23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
-  24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
-  25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
-  26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
-  27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
-  28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
-  29. http://freedesktop.org/wiki/Specifications/sound-theme-spec
-  30. http://www.gnome.org/
-  31. http://alsa-project.org/
-  32. http://pulseaudio.org/
-  33. http://gstreamer.org/
-  34. http://0pointer.de/blog/projects/sixfold-announcement.html
-  35. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
-  36. http://www.gtk.org/gtk-doc/
-  37. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
-  38. http://0pointer.de/lennart/projects/libcanberra/
-  39. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
-  40. http://git-scm.com/
-  41. git://git.0pointer.de/libcanberra
-  42. http://git.0pointer.de/?p=libcanberra.git
-  43. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
-  44. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
-  45. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
+  10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz
+  11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
+  12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
+  13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
+  14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
+  15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
+  16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
+  17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
+  18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
+  19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
+  20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
+  21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
+  22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
+  23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
+  24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
+  25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
+  26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
+  27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
+  28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
+  29. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
+  30. http://freedesktop.org/wiki/Specifications/sound-theme-spec
+  31. http://www.gnome.org/
+  32. http://alsa-project.org/
+  33. http://pulseaudio.org/
+  34. http://gstreamer.org/
+  35. http://0pointer.de/blog/projects/sixfold-announcement.html
+  36. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
+  37. http://www.gtk.org/gtk-doc/
+  38. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
+  39. http://0pointer.de/lennart/projects/libcanberra/
+  40. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz
+  41. http://git-scm.com/
+  42. git://git.0pointer.de/libcanberra
+  43. http://git.0pointer.de/?p=libcanberra.git
+  44. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
+  45. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
+  46. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra

=== modified file 'configure'
--- configure	2010-07-13 05:08:44 +0000
+++ configure	2010-11-04 15:37:42 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for libcanberra 0.25.
+# Generated by GNU Autoconf 2.65 for libcanberra 0.26.
 #
 # Report bugs to <mzyvopnaoreen (at) 0pointer (dot) de>.
 #
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='libcanberra'
 PACKAGE_TARNAME='libcanberra'
-PACKAGE_VERSION='0.25'
-PACKAGE_STRING='libcanberra 0.25'
+PACKAGE_VERSION='0.26'
+PACKAGE_STRING='libcanberra 0.26'
 PACKAGE_BUGREPORT='mzyvopnaoreen (at) 0pointer (dot) de'
 PACKAGE_URL=''
 
@@ -1564,7 +1564,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libcanberra 0.25 to adapt to many kinds of systems.
+\`configure' configures libcanberra 0.26 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1634,7 +1634,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libcanberra 0.25:";;
+     short | recursive ) echo "Configuration of libcanberra 0.26:";;
    esac
   cat <<\_ACEOF
 
@@ -1776,7 +1776,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libcanberra configure 0.25
+libcanberra configure 0.26
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2322,7 +2322,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libcanberra $as_me 0.25, which was
+It was created by libcanberra $as_me 0.26, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3135,7 +3135,7 @@
 
 # Define the identity of the package.
  PACKAGE='libcanberra'
- VERSION='0.25'
+ VERSION='0.26'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3180,7 +3180,7 @@
 
 LIBCANBERRA_VERSION_INFO=2:4:2
 
-LIBCANBERRA_GTK_VERSION_INFO=1:6:1
+LIBCANBERRA_GTK_VERSION_INFO=1:7:1
 
 
 # Make sure we can run config.sub.
@@ -18363,7 +18363,7 @@
 
 CA_MAJOR=0
 
-CA_MINOR=25
+CA_MINOR=26
 
 
 
@@ -19238,7 +19238,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libcanberra $as_me 0.25, which was
+This file was extended by libcanberra $as_me 0.26, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19304,7 +19304,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libcanberra config.status 0.25
+libcanberra config.status 0.26
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2010-07-13 05:08:44 +0000
+++ configure.ac	2010-11-04 15:37:42 +0000
@@ -20,7 +20,7 @@
 # <http://www.gnu.org/licenses/>.
 
 m4_define([ca_major],[0])
-m4_define([ca_minor],[25])
+m4_define([ca_minor],[26])
 m4_define([ca_version],[ca_major.ca_minor])
 
 AC_PREREQ(2.63)
@@ -34,7 +34,7 @@
 
 AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libcanberra/])
 AC_SUBST(LIBCANBERRA_VERSION_INFO, [2:4:2])
-AC_SUBST(LIBCANBERRA_GTK_VERSION_INFO, [1:6:1])
+AC_SUBST(LIBCANBERRA_GTK_VERSION_INFO, [1:7:1])
 
 AC_CANONICAL_HOST
 AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-02 05:38:17 +0000
+++ debian/changelog	2010-11-04 15:37:42 +0000
@@ -1,3 +1,22 @@
+libcanberra (0.26-0ubuntu2~ppa1) natty; urgency=low
+
+  [ Rodrigo Moya ]
+  * New upstream release
+  * debian/control:
+    - Depend on libgtk3.0-dev also, to build GTK3 module
+    - Increment Standards-version
+    - Add GTK3 packages
+  * debian/libcanberra-gtk3*.install:
+    - Add GTK3 module packages
+  * debian/rules:
+    - Remove versioning directives from DEB_DH_MAKESHLIBS_ARGS*
+
+  [ Rico Tzschichholz ]
+  * debian/patches
+    - add 90-patch-theme-for-ubuntu.patch
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 04 Nov 2010 07:56:34 +0100
+
 libcanberra (0.26-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2010-11-02 05:38:17 +0000
+++ debian/control	2010-11-04 15:37:42 +0000
@@ -12,12 +12,14 @@
                libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libvorbis-dev,
                libgtk2.0-dev (>= 2.20),
-               tdb-dev (> 1.1),
+               libgtk3.0-dev (>= 2.91.0),
+               tdb-dev (>> 1.1),
                gtk-doc-tools,
                libpulse-dev (>= 0.9.11),
                libgstreamer0.10-dev (>= 0.10.15),
+               libgconf2-dev,
                quilt
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Bzr: http://launchpad.net/~ubuntu-desktop/libcanberra/ubuntu
 
 Package: libcanberra0
@@ -156,6 +158,53 @@
  This package contains headers and libraries for developing
  applications that play event sounds with libcanberra-gtk.
 
+Package: libcanberra-gtk3-0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libcanberra-gtk3-module
+Description: Gtk+ 3.0 helper for playing widget event sounds with libcanberra
+ libcanberra-gtk provides a few functions that simplify libcanberra
+ usage from Gtk+ 3.0.
+ .
+ Contextual informations are needed to play event sound. This library
+ can help to compile directly event sounds property lists based on
+ active GtkWidget objects or GdkEvent events.
+
+Package: libcanberra-gtk3-0-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, libcanberra-gtk3-0 (= ${binary:Version})
+Description: libcanberra-gtk libraries detached debugging symbols
+ libcanberra-gtk provides a few functions that simplify libcanberra
+ usage from Gtk+ 3.0.
+ .
+ Contextual informations are needed to play event sound. This library
+ can help to compile directly event sounds property lists based on
+ active GtkWidget objects or GdkEvent events.
+ .
+ This package contains detached debugging symbols for it.
+
+Package: libcanberra-gtk3-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+        ${misc:Depends},
+        libcanberra-gtk3-0 (= ${binary:Version}),
+        libcanberra-dev (= ${binary:Version}),
+        libcanberra-gtk-dev (= ${binary:Version}),
+        libgtk3.0-dev (>= 2.91.0)
+Description: a simple abstract interface for playing event sounds
+ libcanberra-gtk provides a few functions that simplify
+ libcanberra usage from Gtk+ 3.0.
+ .
+ Contextual informations are needed to play event sound. This library
+ can help to compile directly event sounds property lists based on
+ active GtkWidget objects or GdkEvent events.
+ .
+ This package contains headers and libraries for developing
+ applications that play event sounds with libcanberra-gtk.
+
 Package: libcanberra-gtk-module
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -163,6 +212,39 @@
  A GtkModule which will automatically hook into all kinds of events
  inside a Gtk+ program and generate sound events from them.
 
+Package: libcanberra-gtk-module-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
+Description: libcanberra GtkModule detached debugging symbols
+ A GtkModule which will automatically hook into all kinds of events
+ inside a Gtk+ program and generate sound events from them.
+ .
+ This package contains detached debugging symbols for it.
+
+Package: libcanberra-gtk3-module
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
+Description: libcanberra GtkModule detached debugging symbols
+ A GtkModule which will automatically hook into all kinds of events
+ inside a Gtk+ 3.0 program and generate sound events from them.
+  .
+ This package contains detached debugging symbols for it.
+
+Package: libcanberra-gtk3-module-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
+Description: libcanberra GtkModule detached debugging symbols
+ A GtkModule which will automatically hook into all kinds of events
+ inside a Gtk+ 3.0 program and generate sound events from them.
+ .
+ This package contains detached debugging symbols for it.
+
 Package: gnome-session-canberra
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}, libcanberra-gtk0
@@ -174,17 +256,6 @@
  .
  This package is using canberra-gtk-play from libcanberra.
 
-Package: libcanberra-gtk-module-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
-Description: libcanberra GtkModule detached debugging symbols
- A GtkModule which will automatically hook into all kinds of events
- inside a Gtk+ program and generate sound events from them.
- .
- This package contains detached debugging symbols for it.
-
 Package: libcanberra-doc
 Section: doc
 Architecture: all

=== added file 'debian/libcanberra-gtk3-0.install'
--- debian/libcanberra-gtk3-0.install	1970-01-01 00:00:00 +0000
+++ debian/libcanberra-gtk3-0.install	2010-11-04 15:37:42 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libcanberra-gtk3.so.*
+#debian/tmp/usr/bin/canberra-gtk-play

=== added file 'debian/libcanberra-gtk3-0.symbols'
--- debian/libcanberra-gtk3-0.symbols	1970-01-01 00:00:00 +0000
+++ debian/libcanberra-gtk3-0.symbols	2010-11-04 15:37:42 +0000
@@ -0,0 +1,9 @@
+libcanberra-gtk3.so.0 libcanberra-gtk3-0 #MINVER#
+ ca_gtk_context_get@Base 0.25
+ ca_gtk_context_get_for_screen@Base 0.25
+ ca_gtk_play_for_event@Base 0.25
+ ca_gtk_play_for_widget@Base 0.25
+ ca_gtk_proplist_set_for_event@Base 0.25
+ ca_gtk_proplist_set_for_widget@Base 0.25
+ ca_gtk_widget_disable_sounds@Base 0.25
+

=== added file 'debian/libcanberra-gtk3-dev.install'
--- debian/libcanberra-gtk3-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libcanberra-gtk3-dev.install	2010-11-04 15:37:42 +0000
@@ -0,0 +1,4 @@
+#debian/tmp/usr/include/canberra-gtk.h
+debian/tmp/usr/lib/libcanberra-gtk3.so
+debian/tmp/usr/lib/pkgconfig/libcanberra-gtk3.pc
+#debian/tmp/usr/share/vala/vapi/libcanberra-gtk.vapi

=== added file 'debian/libcanberra-gtk3-module.install'
--- debian/libcanberra-gtk3-module.install	1970-01-01 00:00:00 +0000
+++ debian/libcanberra-gtk3-module.install	2010-11-04 15:37:42 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/gtk-3.0/modules/libcanberra-gtk-module.so
+debian/tmp/usr/lib/gtk-3.0/modules/libcanberra-gtk3-module.so
+#debian/52libcanberra-gtk-module_add-to-gtk-modules /etc/X11/Xsession.d

=== added directory 'debian/patches'
=== added file 'debian/patches/90-patch-theme-for-ubuntu.patch'
--- debian/patches/90-patch-theme-for-ubuntu.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/90-patch-theme-for-ubuntu.patch	2010-11-04 15:37:42 +0000
@@ -0,0 +1,15 @@
+Index: libcanberra-0.26/src/sound-theme-spec.c
+===================================================================
+--- libcanberra-0.26.orig/src/sound-theme-spec.c
++++ libcanberra-0.26/src/sound-theme-spec.c
+@@ -34,8 +34,8 @@
+ #include "llist.h"
+ #include "cache.h"
+ 
+-#define DEFAULT_THEME "freedesktop"
+-#define FALLBACK_THEME "freedesktop"
++#define DEFAULT_THEME "ubuntu"
++#define FALLBACK_THEME "ubuntu"
+ #define DEFAULT_OUTPUT_PROFILE "stereo"
+ #define N_THEME_DIR_MAX 8
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2010-11-04 15:37:42 +0000
@@ -0,0 +1,1 @@
+90-patch-theme-for-ubuntu.patch

=== modified file 'debian/rules'
--- debian/rules	2010-05-28 01:06:21 +0000
+++ debian/rules	2010-11-04 15:37:42 +0000
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
@@ -37,7 +37,9 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-alsa --enable-oss
 endif
 
-DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/gtk-2.0/modules
-DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/libcanberra-0.24
-DEB_DH_MAKESHLIBS_ARGS_libcanberra0 += -V "libcanberra0 (>= 0.20)" -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk0 += -V "libcanberra-gtk0 (>= 0.20)" -- -c4
+DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/gtk-2.0/modules
+DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/gtk-3.0/modules
+DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/libcanberra-0.26
+DEB_DH_MAKESHLIBS_ARGS_libcanberra0 += -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk0 += -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk3-0 += -- -c4

=== modified file 'doc/README'
--- doc/README	2010-07-13 05:08:44 +0000
+++ doc/README	2010-11-04 15:37:42 +0000
@@ -1,4 +1,4 @@
-                                libcanberra 0.25
+                                libcanberra 0.26
 
    Copyright 2008-2010 Lennart Poettering <mzyvopnaoreen (at) 0pointer
    (dot) de>
@@ -26,104 +26,108 @@
 
 News
 
+   Mon 4 Oct 2010:
+
+   [10]Version 0.26 released; Gtk+ 3.x fixes.
+
    Sun 13 Jun 2010:
 
-   [10]Version 0.25 released; Optionally build with Gtk+ 3.x in addition
+   [11]Version 0.25 released; Optionally build with Gtk+ 3.x in addition
    to Gtk+ 2.x.
 
    Mon 19 Apr 2010:
 
-   [11]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
+   [12]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
    in the PulseAudio backend, other fixes.
 
    Sat 20 Feb 2010:
 
-   [12]Version 0.23 released; various minor fixes in the pulse and
+   [13]Version 0.23 released; various minor fixes in the pulse and
    gstreamer backends as well in the Vala API. Support for the recently
    standardized Vorbis 6.1/7.1 multichannel modes.
 
    Tue 20 Oct 2009:
 
-   [13]Version 0.22 released; small fix to make sure we don't dereference
+   [14]Version 0.22 released; small fix to make sure we don't dereference
    a null pointer.
 
    Fri 16 Oct 2009:
 
-   [14]Version 0.21 released; suppress casting warning
+   [15]Version 0.21 released; suppress casting warning
 
    Thu 15 Oct 2009:
 
-   [15]Version 0.20 released; minor casting fix
+   [16]Version 0.20 released; minor casting fix
 
    Wed 14 Oct 2009:
 
-   [16]Version 0.19 released; some important fixes for the Gtk support
+   [17]Version 0.19 released; some important fixes for the Gtk support
 
    Sun 20 Sep 2009:
 
-   [17]Version 0.18 released; numerous updates for the Gtk support
+   [18]Version 0.18 released; numerous updates for the Gtk support
 
    Fri 12 Sep 2009:
 
-   [18]Version 0.17 released; add vala vapi file; numerous updates to Gtk
+   [19]Version 0.17 released; add vala vapi file; numerous updates to Gtk
    support
 
    Thu 27 Aug 2009:
 
-   [19]Version 0.16 released; add new ca_context_playing() call
+   [20]Version 0.16 released; add new ca_context_playing() call
 
    Wed 5 Aug 2009:
 
-   [20]Version 0.15 released; bug fixes
+   [21]Version 0.15 released; bug fixes
 
    Thu 2 Jul 2009:
 
-   [21]Version 0.14 released; bug fixes
+   [22]Version 0.14 released; bug fixes
 
    Tue 23 Jun 2009:
 
-   [22]Version 0.13 released; multichannel support; gtk multihead support;
+   [23]Version 0.13 released; multichannel support; gtk multihead support;
    bug fixes
 
    Mon 13 Apr 2009:
 
-   [23]Version 0.12 released; changes include: various fixes and updates
+   [24]Version 0.12 released; changes include: various fixes and updates
    for the PulseAudio backend; detect forks and return an error for all
    functions in that case
 
    Wed 21 Jan 2009:
 
-   [24]Version 0.11 released; changes include: major GStreamer backend
+   [25]Version 0.11 released; changes include: major GStreamer backend
    fixes; update to libtool 2.2; a few other fixes
 
    Mon 6 Oct 2008:
 
-   [25]Version 0.10 released; changes include: install Gtk+ module using
+   [26]Version 0.10 released; changes include: install Gtk+ module using
    GConf; a few other fixes
 
    Tue 9 Sep 2008:
 
-   [26]Version 0.9 released; changes include: GStreamer fixes, include
+   [27]Version 0.9 released; changes include: GStreamer fixes, include
    (optional) libtdb based lookup cache.
 
    Thu 28 Aug 2008:
 
-   [27]Version 0.8 released; changes include: new OSS and GStreamer
+   [28]Version 0.8 released; changes include: new OSS and GStreamer
    backend; portability fixes for FreeBSD/Solaris; the multi backend works
    now
 
    Thu 14 Aug 2008:
 
-   [28]Version 0.7 released; changes include: documentation updates;
+   [29]Version 0.7 released; changes include: documentation updates;
    various bug fixes; add this web site/README; allow playback of event
    sounds with only a sound file path specified; other changes
 
 Overview
 
-   libcanberra is an implementation of the [29]XDG Sound Theme and Name
+   libcanberra is an implementation of the [30]XDG Sound Theme and Name
    Specifications, for generating event sounds on free desktops, such as
-   [30]GNOME. It comes with several backends ([31]ALSA, [32]PulseAudio,
-   OSS, [33]GStreamer, null) and is designed to be portable. It consists
+   [31]GNOME. It comes with several backends ([32]ALSA, [33]PulseAudio,
+   OSS, [34]GStreamer, null) and is designed to be portable. It consists
    of the following parts:
     1. libcanberra: the main library
     2. libcanberra-gtk: some glue code to make it easier to use
@@ -131,14 +135,14 @@
     3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
        trigger input feedback event sounds
 
-   For more information see [34]the original announcement.
+   For more information see [35]the original announcement.
 
 Current Status
 
    libcanberra is mostly feature complete. For now however it includes
    backends only for ALSA, PulseAudio, OSS and GStreamer.
 
-   libcanberra has been declared [35]a blessed GNOME dependency.
+   libcanberra has been declared [36]a blessed GNOME dependency.
 
    The OSS driver is incomplete: only sound files that are in a format
    natively understood by the sound card are supported. If the sample
@@ -160,7 +164,7 @@
 
 Documentation
 
-   You may browse the [36]gtkdoc generated [37]programing documentation of
+   You may browse the [37]gtkdoc generated [38]programing documentation of
    the API.
 
 Requirements
@@ -195,25 +199,26 @@
 Download
 
    The newest release is always available from
-   [38]http://0pointer.de/lennart/projects/libcanberra/
-
-   The current release is [39]0.25
-
-   Get libcanberra's development sources from the [40]GIT [41]repository
-   ([42]gitweb):
+   [39]http://0pointer.de/lennart/projects/libcanberra/
+
+   The current release is [40]0.26
+
+   Get libcanberra's development sources from the [41]GIT [42]repository
+   ([43]gitweb):
 git clone git://git.0pointer.de/libcanberra
 
    If you want to report bugs, have questions or want to be notified about
-   new releases, please join the [43]libcanberra-discuss mailing list.
+   new releases, please join the [44]libcanberra-discuss mailing list.
 
    If you want to be notified about new git commits, please join the
-   [44]libcanberra-commits mailing list.
+   [45]libcanberra-commits mailing list.
 
-   libcanberra's bugs are tracked at [45]bugs.freedesktop.org.
+   libcanberra's bugs are tracked at [46]bugs.freedesktop.org.
      __________________________________________________________________
 
 
-    Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, June 2010
+    Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, October
+    2010
 
 References
 
@@ -226,39 +231,40 @@
    7. README#installation
    8. README#acks
    9. README#download
-  10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
-  11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
-  12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
-  13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
-  14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
-  15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
-  16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
-  17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
-  18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
-  19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
-  20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
-  21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
-  22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
-  23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
-  24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
-  25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
-  26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
-  27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
-  28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
-  29. http://freedesktop.org/wiki/Specifications/sound-theme-spec
-  30. http://www.gnome.org/
-  31. http://alsa-project.org/
-  32. http://pulseaudio.org/
-  33. http://gstreamer.org/
-  34. http://0pointer.de/blog/projects/sixfold-announcement.html
-  35. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
-  36. http://www.gtk.org/gtk-doc/
-  37. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
-  38. http://0pointer.de/lennart/projects/libcanberra/
-  39. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
-  40. http://git-scm.com/
-  41. git://git.0pointer.de/libcanberra
-  42. http://git.0pointer.de/?p=libcanberra.git
-  43. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
-  44. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
-  45. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
+  10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz
+  11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
+  12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
+  13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
+  14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
+  15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
+  16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
+  17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
+  18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
+  19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
+  20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
+  21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
+  22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
+  23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
+  24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
+  25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
+  26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
+  27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
+  28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
+  29. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
+  30. http://freedesktop.org/wiki/Specifications/sound-theme-spec
+  31. http://www.gnome.org/
+  32. http://alsa-project.org/
+  33. http://pulseaudio.org/
+  34. http://gstreamer.org/
+  35. http://0pointer.de/blog/projects/sixfold-announcement.html
+  36. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
+  37. http://www.gtk.org/gtk-doc/
+  38. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
+  39. http://0pointer.de/lennart/projects/libcanberra/
+  40. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz
+  41. http://git-scm.com/
+  42. git://git.0pointer.de/libcanberra
+  43. http://git.0pointer.de/?p=libcanberra.git
+  44. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
+  45. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
+  46. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra

=== modified file 'doc/README.html'
--- doc/README.html	2010-07-13 05:08:44 +0000
+++ doc/README.html	2010-11-04 15:37:42 +0000
@@ -3,12 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>libcanberra 0.25</title>
+<title>libcanberra 0.26</title>
 <link rel="stylesheet" type="text/css" href="style.css" />
 </head>
 
 <body>
-<h1><a name="top">libcanberra 0.25</a></h1>
+<h1><a name="top">libcanberra 0.26</a></h1>
 
 <p><i>Copyright 2008-2010 Lennart Poettering &lt;mzyvopnaoreen (at) 0pointer (dot) de&gt;</i></p>
 
@@ -38,6 +38,10 @@
 
 <h2><a name="news">News</a></h2>
 
+<div class="news-date">Mon 4 Oct
+2010: </div> <p class="news-text"><a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz">Version
+0.26</a> released; Gtk+ 3.x fixes.</p>
+
 <div class="news-date">Sun 13 Jun
 2010: </div> <p class="news-text"><a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz">Version
 0.25</a> released; Optionally build with Gtk+ 3.x in addition to Gtk+ 2.x.</p>
@@ -212,7 +216,7 @@
 
 <p>The newest release is always available from <a href="http://0pointer.de/lennart/projects/libcanberra/">http://0pointer.de/lennart/projects/libcanberra/</a></p>
 
-<p>The current release is <a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz">0.25</a></p>
+<p>The current release is <a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz">0.26</a></p>
 
 <p>Get <tt>libcanberra</tt>'s development sources from the <a href="http://git-scm.com/">GIT</a> <a href="git://git.0pointer.de/libcanberra">repository</a> (<a href="http://git.0pointer.de/?p=libcanberra.git">gitweb</a>): </p>
 
@@ -225,7 +229,7 @@
 <p><tt>libcanberra</tt>'s bugs are tracked at <a href="http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&amp;product=libcanberra">bugs.freedesktop.org</a>.</p>
 
 <hr/>
-<address class="grey">Lennart Poettering &lt;mzyvopnaoreen (at) 0pointer (dot) de&gt;, June 2010</address>
+<address class="grey">Lennart Poettering &lt;mzyvopnaoreen (at) 0pointer (dot) de&gt;, October 2010</address>
 
 </body>
 </html>

=== modified file 'doc/README.html.in'
--- doc/README.html.in	2010-07-13 05:08:44 +0000
+++ doc/README.html.in	2010-11-04 15:37:42 +0000
@@ -38,6 +38,10 @@
 
 <h2><a name="news">News</a></h2>
 
+<div class="news-date">Mon 4 Oct
+2010: </div> <p class="news-text"><a href="@[e-mail]">Version
+0.26</a> released; Gtk+ 3.x fixes.</p>
+
 <div class="news-date">Sun 13 Jun
 2010: </div> <p class="news-text"><a href="@[e-mail]">Version
 0.25</a> released; Optionally build with Gtk+ 3.x in addition to Gtk+ 2.x.</p>
@@ -225,7 +229,7 @@
 <p><tt>libcanberra</tt>'s bugs are tracked at <a href="http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&amp;product=libcanberra">bugs.freedesktop.org</a>.</p>
 
 <hr/>
-<address class="grey">Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;, June 2010</address>
+<address class="grey">Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;, October 2010</address>
 
 </body>
 </html>

=== modified file 'gtkdoc/html/libcanberra-canberra-gtk.html'
--- gtkdoc/html/libcanberra-canberra-gtk.html	2010-07-13 05:08:44 +0000
+++ gtkdoc/html/libcanberra-canberra-gtk.html	2010-11-04 15:37:42 +0000
@@ -48,7 +48,7 @@
                                                          <em class="parameter"><code><span class="type">uint32_t</span> id</code></em>,
                                                          <em class="parameter"><code>...</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-widget-disable-sounds" title="ca_gtk_widget_disable_sounds ()">ca_gtk_widget_disable_sounds</a>        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enable</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enable</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -239,7 +239,7 @@
 <div class="refsect2" title="ca_gtk_widget_disable_sounds ()">
 <a name="ca-gtk-widget-disable-sounds"></a><h3>ca_gtk_widget_disable_sounds ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                ca_gtk_widget_disable_sounds        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enable</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enable</code></em>);</pre>
 <p>
 By default sound events are automatically generated for all kinds
 of input events. Use this function to disable this. This is

=== modified file 'src/canberra-gtk.c'
--- src/canberra-gtk.c	2010-05-28 01:06:21 +0000
+++ src/canberra-gtk.c	2010-11-04 15:37:42 +0000
@@ -505,7 +505,11 @@
                 goto fail;
 
         if (e->any.window)
+#if GTK_CHECK_VERSION (2, 90, 7)
+                s = gdk_window_get_screen(e->any.window);
+#else
                 s = gdk_drawable_get_screen(GDK_DRAWABLE(e->any.window));
+#endif
         else
                 s = gdk_screen_get_default();
 

=== modified file 'src/canberra.h'
--- src/canberra.h	2010-07-13 05:08:44 +0000
+++ src/canberra.h	2010-11-04 15:37:42 +0000
@@ -48,7 +48,7 @@
  *
  * Evaluates to the minor version number of libcanberra.
  */
-#define CA_MINOR (25)
+#define CA_MINOR (26)
 
 /**
  * CA_CHECK_VERSION:

=== modified file 'src/sound-theme-spec.c'
--- src/sound-theme-spec.c	2010-05-28 01:06:21 +0000
+++ src/sound-theme-spec.c	2010-11-04 15:37:42 +0000
@@ -34,8 +34,8 @@
 #include "llist.h"
 #include "cache.h"
 
-#define DEFAULT_THEME "ubuntu"
-#define FALLBACK_THEME "ubuntu"
+#define DEFAULT_THEME "freedesktop"
+#define FALLBACK_THEME "freedesktop"
 #define DEFAULT_OUTPUT_PROFILE "stereo"
 #define N_THEME_DIR_MAX 8