Ubuntu
libcanberra package

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

  1. Maverick (10.10)
  2. ubuntugtk3
  3. Merge into ubuntu
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 106
Proposed branch: lp:~rodrigo-moya/ubuntu/maverick/libcanberra/ubuntugtk3
Merge into: lp:~ubuntu-desktop/libcanberra/ubuntu
Diff against target: 1076 lines (+336/-186)
19 files modified
README (+78/-72)
configure (+12/-12)
configure.ac (+2/-2)
debian/changelog (+19/-0)
debian/control (+84/-13)
debian/libcanberra-gtk3-0.install (+2/-0)
debian/libcanberra-gtk3-0.symbols (+9/-0)
debian/libcanberra-gtk3-dev.install (+4/-0)
debian/libcanberra-gtk3-module.install (+3/-0)
debian/patches/90-patch-theme-for-ubuntu.patch (+15/-0)
debian/patches/series (+1/-0)
debian/rules (+7/-5)
doc/README (+78/-72)
doc/README.html (+8/-4)
doc/README.html.in (+5/-1)
gtkdoc/html/libcanberra-canberra-gtk.html (+2/-2)
src/canberra-gtk.c (+4/-0)
src/canberra.h (+1/-1)
src/sound-theme-spec.c (+2/-2)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/maverick/libcanberra/ubuntugtk3
Reviewer Review Type Date Requested Status
Michael Terry Approve
Ubuntu Development Team Pending
Review via email: mp+39997@code.launchpad.net

Description of the change

0.26 upstream release + GTK3 module

To post a comment you must log in.
lp:~rodrigo-moya/ubuntu/maverick/libcanberra/ubuntugtk3 updated
108. By Rodrigo Moya

Remove leftover comment in debian/changelog

109. By Rodrigo Moya

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

110. By Rodrigo Moya

Document changes in debian/rules

111. By Rodrigo Moya

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

112. By Rodrigo Moya

Merge patch from Rico

113. By Rodrigo Moya

Add missing files

Revision history for this message
Michael Terry (mterry) wrote :

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 updated
114. By Rodrigo Moya

Sign changelog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README'
--- README 2010-07-13 05:08:44 +0000
+++ README 2010-11-04 15:37:42 +0000
@@ -1,4 +1,4 @@
1 libcanberra 0.251 libcanberra 0.26
22
3 Copyright 2008-2010 Lennart Poettering <mzyvopnaoreen (at) 0pointer3 Copyright 2008-2010 Lennart Poettering <mzyvopnaoreen (at) 0pointer
4 (dot) de>4 (dot) de>
@@ -26,104 +26,108 @@
2626
27News27News
2828
29 Mon 4 Oct 2010:
30
31 [10]Version 0.26 released; Gtk+ 3.x fixes.
32
29 Sun 13 Jun 2010:33 Sun 13 Jun 2010:
3034
31 [10]Version 0.25 released; Optionally build with Gtk+ 3.x in addition35 [11]Version 0.25 released; Optionally build with Gtk+ 3.x in addition
32 to Gtk+ 2.x.36 to Gtk+ 2.x.
3337
34 Mon 19 Apr 2010:38 Mon 19 Apr 2010:
3539
36 [11]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes40 [12]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
37 in the PulseAudio backend, other fixes.41 in the PulseAudio backend, other fixes.
3842
39 Sat 20 Feb 2010:43 Sat 20 Feb 2010:
4044
41 [12]Version 0.23 released; various minor fixes in the pulse and45 [13]Version 0.23 released; various minor fixes in the pulse and
42 gstreamer backends as well in the Vala API. Support for the recently46 gstreamer backends as well in the Vala API. Support for the recently
43 standardized Vorbis 6.1/7.1 multichannel modes.47 standardized Vorbis 6.1/7.1 multichannel modes.
4448
45 Tue 20 Oct 2009:49 Tue 20 Oct 2009:
4650
47 [13]Version 0.22 released; small fix to make sure we don't dereference51 [14]Version 0.22 released; small fix to make sure we don't dereference
48 a null pointer.52 a null pointer.
4953
50 Fri 16 Oct 2009:54 Fri 16 Oct 2009:
5155
52 [14]Version 0.21 released; suppress casting warning56 [15]Version 0.21 released; suppress casting warning
5357
54 Thu 15 Oct 2009:58 Thu 15 Oct 2009:
5559
56 [15]Version 0.20 released; minor casting fix60 [16]Version 0.20 released; minor casting fix
5761
58 Wed 14 Oct 2009:62 Wed 14 Oct 2009:
5963
60 [16]Version 0.19 released; some important fixes for the Gtk support64 [17]Version 0.19 released; some important fixes for the Gtk support
6165
62 Sun 20 Sep 2009:66 Sun 20 Sep 2009:
6367
64 [17]Version 0.18 released; numerous updates for the Gtk support68 [18]Version 0.18 released; numerous updates for the Gtk support
6569
66 Fri 12 Sep 2009:70 Fri 12 Sep 2009:
6771
68 [18]Version 0.17 released; add vala vapi file; numerous updates to Gtk72 [19]Version 0.17 released; add vala vapi file; numerous updates to Gtk
69 support73 support
7074
71 Thu 27 Aug 2009:75 Thu 27 Aug 2009:
7276
73 [19]Version 0.16 released; add new ca_context_playing() call77 [20]Version 0.16 released; add new ca_context_playing() call
7478
75 Wed 5 Aug 2009:79 Wed 5 Aug 2009:
7680
77 [20]Version 0.15 released; bug fixes81 [21]Version 0.15 released; bug fixes
7882
79 Thu 2 Jul 2009:83 Thu 2 Jul 2009:
8084
81 [21]Version 0.14 released; bug fixes85 [22]Version 0.14 released; bug fixes
8286
83 Tue 23 Jun 2009:87 Tue 23 Jun 2009:
8488
85 [22]Version 0.13 released; multichannel support; gtk multihead support;89 [23]Version 0.13 released; multichannel support; gtk multihead support;
86 bug fixes90 bug fixes
8791
88 Mon 13 Apr 2009:92 Mon 13 Apr 2009:
8993
90 [23]Version 0.12 released; changes include: various fixes and updates94 [24]Version 0.12 released; changes include: various fixes and updates
91 for the PulseAudio backend; detect forks and return an error for all95 for the PulseAudio backend; detect forks and return an error for all
92 functions in that case96 functions in that case
9397
94 Wed 21 Jan 2009:98 Wed 21 Jan 2009:
9599
96 [24]Version 0.11 released; changes include: major GStreamer backend100 [25]Version 0.11 released; changes include: major GStreamer backend
97 fixes; update to libtool 2.2; a few other fixes101 fixes; update to libtool 2.2; a few other fixes
98102
99 Mon 6 Oct 2008:103 Mon 6 Oct 2008:
100104
101 [25]Version 0.10 released; changes include: install Gtk+ module using105 [26]Version 0.10 released; changes include: install Gtk+ module using
102 GConf; a few other fixes106 GConf; a few other fixes
103107
104 Tue 9 Sep 2008:108 Tue 9 Sep 2008:
105109
106 [26]Version 0.9 released; changes include: GStreamer fixes, include110 [27]Version 0.9 released; changes include: GStreamer fixes, include
107 (optional) libtdb based lookup cache.111 (optional) libtdb based lookup cache.
108112
109 Thu 28 Aug 2008:113 Thu 28 Aug 2008:
110114
111 [27]Version 0.8 released; changes include: new OSS and GStreamer115 [28]Version 0.8 released; changes include: new OSS and GStreamer
112 backend; portability fixes for FreeBSD/Solaris; the multi backend works116 backend; portability fixes for FreeBSD/Solaris; the multi backend works
113 now117 now
114118
115 Thu 14 Aug 2008:119 Thu 14 Aug 2008:
116120
117 [28]Version 0.7 released; changes include: documentation updates;121 [29]Version 0.7 released; changes include: documentation updates;
118 various bug fixes; add this web site/README; allow playback of event122 various bug fixes; add this web site/README; allow playback of event
119 sounds with only a sound file path specified; other changes123 sounds with only a sound file path specified; other changes
120124
121Overview125Overview
122126
123 libcanberra is an implementation of the [29]XDG Sound Theme and Name127 libcanberra is an implementation of the [30]XDG Sound Theme and Name
124 Specifications, for generating event sounds on free desktops, such as128 Specifications, for generating event sounds on free desktops, such as
125 [30]GNOME. It comes with several backends ([31]ALSA, [32]PulseAudio,129 [31]GNOME. It comes with several backends ([32]ALSA, [33]PulseAudio,
126 OSS, [33]GStreamer, null) and is designed to be portable. It consists130 OSS, [34]GStreamer, null) and is designed to be portable. It consists
127 of the following parts:131 of the following parts:
128 1. libcanberra: the main library132 1. libcanberra: the main library
129 2. libcanberra-gtk: some glue code to make it easier to use133 2. libcanberra-gtk: some glue code to make it easier to use
@@ -131,14 +135,14 @@
131 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to135 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
132 trigger input feedback event sounds136 trigger input feedback event sounds
133137
134 For more information see [34]the original announcement.138 For more information see [35]the original announcement.
135139
136Current Status140Current Status
137141
138 libcanberra is mostly feature complete. For now however it includes142 libcanberra is mostly feature complete. For now however it includes
139 backends only for ALSA, PulseAudio, OSS and GStreamer.143 backends only for ALSA, PulseAudio, OSS and GStreamer.
140144
141 libcanberra has been declared [35]a blessed GNOME dependency.145 libcanberra has been declared [36]a blessed GNOME dependency.
142146
143 The OSS driver is incomplete: only sound files that are in a format147 The OSS driver is incomplete: only sound files that are in a format
144 natively understood by the sound card are supported. If the sample148 natively understood by the sound card are supported. If the sample
@@ -160,7 +164,7 @@
160164
161Documentation165Documentation
162166
163 You may browse the [36]gtkdoc generated [37]programing documentation of167 You may browse the [37]gtkdoc generated [38]programing documentation of
164 the API.168 the API.
165169
166Requirements170Requirements
@@ -195,25 +199,26 @@
195Download199Download
196200
197 The newest release is always available from201 The newest release is always available from
198 [38]http://0pointer.de/lennart/projects/libcanberra/202 [39]http://0pointer.de/lennart/projects/libcanberra/
199203
200 The current release is [39]0.25204 The current release is [40]0.26
201205
202 Get libcanberra's development sources from the [40]GIT [41]repository206 Get libcanberra's development sources from the [41]GIT [42]repository
203 ([42]gitweb):207 ([43]gitweb):
204git clone git://git.0pointer.de/libcanberra208git clone git://git.0pointer.de/libcanberra
205209
206 If you want to report bugs, have questions or want to be notified about210 If you want to report bugs, have questions or want to be notified about
207 new releases, please join the [43]libcanberra-discuss mailing list.211 new releases, please join the [44]libcanberra-discuss mailing list.
208212
209 If you want to be notified about new git commits, please join the213 If you want to be notified about new git commits, please join the
210 [44]libcanberra-commits mailing list.214 [45]libcanberra-commits mailing list.
211215
212 libcanberra's bugs are tracked at [45]bugs.freedesktop.org.216 libcanberra's bugs are tracked at [46]bugs.freedesktop.org.
213 __________________________________________________________________217 __________________________________________________________________
214218
215219
216 Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, June 2010220 Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, October
221 2010
217222
218References223References
219224
@@ -226,39 +231,40 @@
226 7. README#installation231 7. README#installation
227 8. README#acks232 8. README#acks
228 9. README#download233 9. README#download
229 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz234 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz
230 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz235 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
231 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz236 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
232 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz237 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
233 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz238 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
234 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz239 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
235 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz240 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
236 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz241 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
237 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz242 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
238 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz243 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
239 20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz244 20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
240 21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz245 21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
241 22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz246 22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
242 23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz247 23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
243 24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz248 24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
244 25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz249 25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
245 26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz250 26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
246 27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz251 27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
247 28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz252 28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
248 29. http://freedesktop.org/wiki/Specifications/sound-theme-spec253 29. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
249 30. http://www.gnome.org/254 30. http://freedesktop.org/wiki/Specifications/sound-theme-spec
250 31. http://alsa-project.org/255 31. http://www.gnome.org/
251 32. http://pulseaudio.org/256 32. http://alsa-project.org/
252 33. http://gstreamer.org/257 33. http://pulseaudio.org/
253 34. http://0pointer.de/blog/projects/sixfold-announcement.html258 34. http://gstreamer.org/
254 35. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html259 35. http://0pointer.de/blog/projects/sixfold-announcement.html
255 36. http://www.gtk.org/gtk-doc/260 36. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
256 37. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/261 37. http://www.gtk.org/gtk-doc/
257 38. http://0pointer.de/lennart/projects/libcanberra/262 38. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
258 39. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz263 39. http://0pointer.de/lennart/projects/libcanberra/
259 40. http://git-scm.com/264 40. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz
260 41. git://git.0pointer.de/libcanberra265 41. http://git-scm.com/
261 42. http://git.0pointer.de/?p=libcanberra.git266 42. git://git.0pointer.de/libcanberra
262 43. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/267 43. http://git.0pointer.de/?p=libcanberra.git
263 44. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/268 44. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
264 45. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra269 45. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
270 46. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
265271
=== modified file 'configure'
--- configure 2010-07-13 05:08:44 +0000
+++ configure 2010-11-04 15:37:42 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.65 for libcanberra 0.25.3# Generated by GNU Autoconf 2.65 for libcanberra 0.26.
4#4#
5# Report bugs to <mzyvopnaoreen (at) 0pointer (dot) de>.5# Report bugs to <mzyvopnaoreen (at) 0pointer (dot) de>.
6#6#
@@ -701,8 +701,8 @@
701# Identity of this package.701# Identity of this package.
702PACKAGE_NAME='libcanberra'702PACKAGE_NAME='libcanberra'
703PACKAGE_TARNAME='libcanberra'703PACKAGE_TARNAME='libcanberra'
704PACKAGE_VERSION='0.25'704PACKAGE_VERSION='0.26'
705PACKAGE_STRING='libcanberra 0.25'705PACKAGE_STRING='libcanberra 0.26'
706PACKAGE_BUGREPORT='mzyvopnaoreen (at) 0pointer (dot) de'706PACKAGE_BUGREPORT='mzyvopnaoreen (at) 0pointer (dot) de'
707PACKAGE_URL=''707PACKAGE_URL=''
708708
@@ -1564,7 +1564,7 @@
1564 # Omit some internal or obsolete options to make the list less imposing.1564 # Omit some internal or obsolete options to make the list less imposing.
1565 # This message is too long to be a string in the A/UX 3.1 sh.1565 # This message is too long to be a string in the A/UX 3.1 sh.
1566 cat <<_ACEOF1566 cat <<_ACEOF
1567\`configure' configures libcanberra 0.25 to adapt to many kinds of systems.1567\`configure' configures libcanberra 0.26 to adapt to many kinds of systems.
15681568
1569Usage: $0 [OPTION]... [VAR=VALUE]...1569Usage: $0 [OPTION]... [VAR=VALUE]...
15701570
@@ -1634,7 +1634,7 @@
16341634
1635if test -n "$ac_init_help"; then1635if test -n "$ac_init_help"; then
1636 case $ac_init_help in1636 case $ac_init_help in
1637 short | recursive ) echo "Configuration of libcanberra 0.25:";;1637 short | recursive ) echo "Configuration of libcanberra 0.26:";;
1638 esac1638 esac
1639 cat <<\_ACEOF1639 cat <<\_ACEOF
16401640
@@ -1776,7 +1776,7 @@
1776test -n "$ac_init_help" && exit $ac_status1776test -n "$ac_init_help" && exit $ac_status
1777if $ac_init_version; then1777if $ac_init_version; then
1778 cat <<\_ACEOF1778 cat <<\_ACEOF
1779libcanberra configure 0.251779libcanberra configure 0.26
1780generated by GNU Autoconf 2.651780generated by GNU Autoconf 2.65
17811781
1782Copyright (C) 2009 Free Software Foundation, Inc.1782Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2322,7 +2322,7 @@
2322This file contains any messages produced by compilers while2322This file contains any messages produced by compilers while
2323running configure, to aid debugging if configure makes a mistake.2323running configure, to aid debugging if configure makes a mistake.
23242324
2325It was created by libcanberra $as_me 0.25, which was2325It was created by libcanberra $as_me 0.26, which was
2326generated by GNU Autoconf 2.65. Invocation command line was2326generated by GNU Autoconf 2.65. Invocation command line was
23272327
2328 $ $0 $@2328 $ $0 $@
@@ -3135,7 +3135,7 @@
31353135
3136# Define the identity of the package.3136# Define the identity of the package.
3137 PACKAGE='libcanberra'3137 PACKAGE='libcanberra'
3138 VERSION='0.25'3138 VERSION='0.26'
31393139
31403140
3141cat >>confdefs.h <<_ACEOF3141cat >>confdefs.h <<_ACEOF
@@ -3180,7 +3180,7 @@
31803180
3181LIBCANBERRA_VERSION_INFO=2:4:23181LIBCANBERRA_VERSION_INFO=2:4:2
31823182
3183LIBCANBERRA_GTK_VERSION_INFO=1:6:13183LIBCANBERRA_GTK_VERSION_INFO=1:7:1
31843184
31853185
3186# Make sure we can run config.sub.3186# Make sure we can run config.sub.
@@ -18363,7 +18363,7 @@
1836318363
18364CA_MAJOR=018364CA_MAJOR=0
1836518365
18366CA_MINOR=2518366CA_MINOR=26
1836718367
1836818368
1836918369
@@ -19238,7 +19238,7 @@
19238# report actual input values of CONFIG_FILES etc. instead of their19238# report actual input values of CONFIG_FILES etc. instead of their
19239# values after options handling.19239# values after options handling.
19240ac_log="19240ac_log="
19241This file was extended by libcanberra $as_me 0.25, which was19241This file was extended by libcanberra $as_me 0.26, which was
19242generated by GNU Autoconf 2.65. Invocation command line was19242generated by GNU Autoconf 2.65. Invocation command line was
1924319243
19244 CONFIG_FILES = $CONFIG_FILES19244 CONFIG_FILES = $CONFIG_FILES
@@ -19304,7 +19304,7 @@
19304cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=119304cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
19305ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"19305ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
19306ac_cs_version="\\19306ac_cs_version="\\
19307libcanberra config.status 0.2519307libcanberra config.status 0.26
19308configured by $0, generated by GNU Autoconf 2.65,19308configured by $0, generated by GNU Autoconf 2.65,
19309 with options \\"\$ac_cs_config\\"19309 with options \\"\$ac_cs_config\\"
1931019310
1931119311
=== 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 @@
20# <http://www.gnu.org/licenses/>.20# <http://www.gnu.org/licenses/>.
2121
22m4_define([ca_major],[0])22m4_define([ca_major],[0])
23m4_define([ca_minor],[25])23m4_define([ca_minor],[26])
24m4_define([ca_version],[ca_major.ca_minor])24m4_define([ca_version],[ca_major.ca_minor])
2525
26AC_PREREQ(2.63)26AC_PREREQ(2.63)
@@ -34,7 +34,7 @@
3434
35AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libcanberra/])35AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libcanberra/])
36AC_SUBST(LIBCANBERRA_VERSION_INFO, [2:4:2])36AC_SUBST(LIBCANBERRA_VERSION_INFO, [2:4:2])
37AC_SUBST(LIBCANBERRA_GTK_VERSION_INFO, [1:6:1])37AC_SUBST(LIBCANBERRA_GTK_VERSION_INFO, [1:7:1])
3838
39AC_CANONICAL_HOST39AC_CANONICAL_HOST
40AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])40AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])
4141
=== 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 @@
1libcanberra (0.26-0ubuntu2~ppa1) natty; urgency=low
2
3 [ Rodrigo Moya ]
4 * New upstream release
5 * debian/control:
6 - Depend on libgtk3.0-dev also, to build GTK3 module
7 - Increment Standards-version
8 - Add GTK3 packages
9 * debian/libcanberra-gtk3*.install:
10 - Add GTK3 module packages
11 * debian/rules:
12 - Remove versioning directives from DEB_DH_MAKESHLIBS_ARGS*
13
14 [ Rico Tzschichholz ]
15 * debian/patches
16 - add 90-patch-theme-for-ubuntu.patch
17
18 -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 04 Nov 2010 07:56:34 +0100
19
1libcanberra (0.26-0ubuntu1) natty; urgency=low20libcanberra (0.26-0ubuntu1) natty; urgency=low
221
3 * New upstream release22 * New upstream release
423
=== 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 @@
12 libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],12 libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
13 libvorbis-dev,13 libvorbis-dev,
14 libgtk2.0-dev (>= 2.20),14 libgtk2.0-dev (>= 2.20),
15 tdb-dev (> 1.1),15 libgtk3.0-dev (>= 2.91.0),
16 tdb-dev (>> 1.1),
16 gtk-doc-tools,17 gtk-doc-tools,
17 libpulse-dev (>= 0.9.11),18 libpulse-dev (>= 0.9.11),
18 libgstreamer0.10-dev (>= 0.10.15),19 libgstreamer0.10-dev (>= 0.10.15),
20 libgconf2-dev,
19 quilt21 quilt
20Standards-Version: 3.8.422Standards-Version: 3.9.1
21Vcs-Bzr: http://launchpad.net/~ubuntu-desktop/libcanberra/ubuntu23Vcs-Bzr: http://launchpad.net/~ubuntu-desktop/libcanberra/ubuntu
2224
23Package: libcanberra025Package: libcanberra0
@@ -156,6 +158,53 @@
156 This package contains headers and libraries for developing158 This package contains headers and libraries for developing
157 applications that play event sounds with libcanberra-gtk.159 applications that play event sounds with libcanberra-gtk.
158160
161Package: libcanberra-gtk3-0
162Architecture: any
163Depends: ${shlibs:Depends}, ${misc:Depends}
164Recommends: libcanberra-gtk3-module
165Description: Gtk+ 3.0 helper for playing widget event sounds with libcanberra
166 libcanberra-gtk provides a few functions that simplify libcanberra
167 usage from Gtk+ 3.0.
168 .
169 Contextual informations are needed to play event sound. This library
170 can help to compile directly event sounds property lists based on
171 active GtkWidget objects or GdkEvent events.
172
173Package: libcanberra-gtk3-0-dbg
174Architecture: any
175Priority: extra
176Section: debug
177Depends: ${misc:Depends}, libcanberra-gtk3-0 (= ${binary:Version})
178Description: libcanberra-gtk libraries detached debugging symbols
179 libcanberra-gtk provides a few functions that simplify libcanberra
180 usage from Gtk+ 3.0.
181 .
182 Contextual informations are needed to play event sound. This library
183 can help to compile directly event sounds property lists based on
184 active GtkWidget objects or GdkEvent events.
185 .
186 This package contains detached debugging symbols for it.
187
188Package: libcanberra-gtk3-dev
189Section: libdevel
190Architecture: any
191Depends: ${shlibs:Depends},
192 ${misc:Depends},
193 libcanberra-gtk3-0 (= ${binary:Version}),
194 libcanberra-dev (= ${binary:Version}),
195 libcanberra-gtk-dev (= ${binary:Version}),
196 libgtk3.0-dev (>= 2.91.0)
197Description: a simple abstract interface for playing event sounds
198 libcanberra-gtk provides a few functions that simplify
199 libcanberra usage from Gtk+ 3.0.
200 .
201 Contextual informations are needed to play event sound. This library
202 can help to compile directly event sounds property lists based on
203 active GtkWidget objects or GdkEvent events.
204 .
205 This package contains headers and libraries for developing
206 applications that play event sounds with libcanberra-gtk.
207
159Package: libcanberra-gtk-module208Package: libcanberra-gtk-module
160Architecture: any209Architecture: any
161Depends: ${shlibs:Depends}, ${misc:Depends}210Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -163,6 +212,39 @@
163 A GtkModule which will automatically hook into all kinds of events212 A GtkModule which will automatically hook into all kinds of events
164 inside a Gtk+ program and generate sound events from them.213 inside a Gtk+ program and generate sound events from them.
165214
215Package: libcanberra-gtk-module-dbg
216Architecture: any
217Priority: extra
218Section: debug
219Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
220Description: libcanberra GtkModule detached debugging symbols
221 A GtkModule which will automatically hook into all kinds of events
222 inside a Gtk+ program and generate sound events from them.
223 .
224 This package contains detached debugging symbols for it.
225
226Package: libcanberra-gtk3-module
227Architecture: any
228Priority: extra
229Section: debug
230Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
231Description: libcanberra GtkModule detached debugging symbols
232 A GtkModule which will automatically hook into all kinds of events
233 inside a Gtk+ 3.0 program and generate sound events from them.
234 .
235 This package contains detached debugging symbols for it.
236
237Package: libcanberra-gtk3-module-dbg
238Architecture: any
239Priority: extra
240Section: debug
241Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
242Description: libcanberra GtkModule detached debugging symbols
243 A GtkModule which will automatically hook into all kinds of events
244 inside a Gtk+ 3.0 program and generate sound events from them.
245 .
246 This package contains detached debugging symbols for it.
247
166Package: gnome-session-canberra248Package: gnome-session-canberra
167Architecture: all249Architecture: all
168Depends: ${misc:Depends}, ${shlibs:Depends}, libcanberra-gtk0250Depends: ${misc:Depends}, ${shlibs:Depends}, libcanberra-gtk0
@@ -174,17 +256,6 @@
174 .256 .
175 This package is using canberra-gtk-play from libcanberra.257 This package is using canberra-gtk-play from libcanberra.
176258
177Package: libcanberra-gtk-module-dbg
178Architecture: any
179Priority: extra
180Section: debug
181Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
182Description: libcanberra GtkModule detached debugging symbols
183 A GtkModule which will automatically hook into all kinds of events
184 inside a Gtk+ program and generate sound events from them.
185 .
186 This package contains detached debugging symbols for it.
187
188Package: libcanberra-doc259Package: libcanberra-doc
189Section: doc260Section: doc
190Architecture: all261Architecture: all
191262
=== 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 @@
1debian/tmp/usr/lib/libcanberra-gtk3.so.*
2#debian/tmp/usr/bin/canberra-gtk-play
03
=== 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 @@
1libcanberra-gtk3.so.0 libcanberra-gtk3-0 #MINVER#
2 ca_gtk_context_get@Base 0.25
3 ca_gtk_context_get_for_screen@Base 0.25
4 ca_gtk_play_for_event@Base 0.25
5 ca_gtk_play_for_widget@Base 0.25
6 ca_gtk_proplist_set_for_event@Base 0.25
7 ca_gtk_proplist_set_for_widget@Base 0.25
8 ca_gtk_widget_disable_sounds@Base 0.25
9
010
=== 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 @@
1#debian/tmp/usr/include/canberra-gtk.h
2debian/tmp/usr/lib/libcanberra-gtk3.so
3debian/tmp/usr/lib/pkgconfig/libcanberra-gtk3.pc
4#debian/tmp/usr/share/vala/vapi/libcanberra-gtk.vapi
05
=== 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 @@
1debian/tmp/usr/lib/gtk-3.0/modules/libcanberra-gtk-module.so
2debian/tmp/usr/lib/gtk-3.0/modules/libcanberra-gtk3-module.so
3#debian/52libcanberra-gtk-module_add-to-gtk-modules /etc/X11/Xsession.d
04
=== 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 @@
1Index: libcanberra-0.26/src/sound-theme-spec.c
2===================================================================
3--- libcanberra-0.26.orig/src/sound-theme-spec.c
4+++ libcanberra-0.26/src/sound-theme-spec.c
5@@ -34,8 +34,8 @@
6 #include "llist.h"
7 #include "cache.h"
8
9-#define DEFAULT_THEME "freedesktop"
10-#define FALLBACK_THEME "freedesktop"
11+#define DEFAULT_THEME "ubuntu"
12+#define FALLBACK_THEME "ubuntu"
13 #define DEFAULT_OUTPUT_PROFILE "stereo"
14 #define N_THEME_DIR_MAX 8
15
016
=== 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 @@
190-patch-theme-for-ubuntu.patch
02
=== 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 @@
3include /usr/share/cdbs/1/rules/debhelper.mk3include /usr/share/cdbs/1/rules/debhelper.mk
4include /usr/share/cdbs/1/class/autotools.mk4include /usr/share/cdbs/1/class/autotools.mk
5include /usr/share/cdbs/1/rules/utils.mk5include /usr/share/cdbs/1/rules/utils.mk
6#include /usr/share/cdbs/1/rules/patchsys-quilt.mk6include /usr/share/cdbs/1/rules/patchsys-quilt.mk
77
8DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)8DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
99
@@ -37,7 +37,9 @@
37DEB_CONFIGURE_EXTRA_FLAGS += --disable-alsa --enable-oss37DEB_CONFIGURE_EXTRA_FLAGS += --disable-alsa --enable-oss
38endif38endif
3939
40DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/gtk-2.0/modules40DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/gtk-2.0/modules
41DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/libcanberra-0.2441DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/gtk-3.0/modules
42DEB_DH_MAKESHLIBS_ARGS_libcanberra0 += -V "libcanberra0 (>= 0.20)" -- -c442DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/libcanberra-0.26
43DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk0 += -V "libcanberra-gtk0 (>= 0.20)" -- -c443DEB_DH_MAKESHLIBS_ARGS_libcanberra0 += -- -c4
44DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk0 += -- -c4
45DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk3-0 += -- -c4
4446
=== 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 @@
1 libcanberra 0.251 libcanberra 0.26
22
3 Copyright 2008-2010 Lennart Poettering <mzyvopnaoreen (at) 0pointer3 Copyright 2008-2010 Lennart Poettering <mzyvopnaoreen (at) 0pointer
4 (dot) de>4 (dot) de>
@@ -26,104 +26,108 @@
2626
27News27News
2828
29 Mon 4 Oct 2010:
30
31 [10]Version 0.26 released; Gtk+ 3.x fixes.
32
29 Sun 13 Jun 2010:33 Sun 13 Jun 2010:
3034
31 [10]Version 0.25 released; Optionally build with Gtk+ 3.x in addition35 [11]Version 0.25 released; Optionally build with Gtk+ 3.x in addition
32 to Gtk+ 2.x.36 to Gtk+ 2.x.
3337
34 Mon 19 Apr 2010:38 Mon 19 Apr 2010:
3539
36 [11]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes40 [12]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
37 in the PulseAudio backend, other fixes.41 in the PulseAudio backend, other fixes.
3842
39 Sat 20 Feb 2010:43 Sat 20 Feb 2010:
4044
41 [12]Version 0.23 released; various minor fixes in the pulse and45 [13]Version 0.23 released; various minor fixes in the pulse and
42 gstreamer backends as well in the Vala API. Support for the recently46 gstreamer backends as well in the Vala API. Support for the recently
43 standardized Vorbis 6.1/7.1 multichannel modes.47 standardized Vorbis 6.1/7.1 multichannel modes.
4448
45 Tue 20 Oct 2009:49 Tue 20 Oct 2009:
4650
47 [13]Version 0.22 released; small fix to make sure we don't dereference51 [14]Version 0.22 released; small fix to make sure we don't dereference
48 a null pointer.52 a null pointer.
4953
50 Fri 16 Oct 2009:54 Fri 16 Oct 2009:
5155
52 [14]Version 0.21 released; suppress casting warning56 [15]Version 0.21 released; suppress casting warning
5357
54 Thu 15 Oct 2009:58 Thu 15 Oct 2009:
5559
56 [15]Version 0.20 released; minor casting fix60 [16]Version 0.20 released; minor casting fix
5761
58 Wed 14 Oct 2009:62 Wed 14 Oct 2009:
5963
60 [16]Version 0.19 released; some important fixes for the Gtk support64 [17]Version 0.19 released; some important fixes for the Gtk support
6165
62 Sun 20 Sep 2009:66 Sun 20 Sep 2009:
6367
64 [17]Version 0.18 released; numerous updates for the Gtk support68 [18]Version 0.18 released; numerous updates for the Gtk support
6569
66 Fri 12 Sep 2009:70 Fri 12 Sep 2009:
6771
68 [18]Version 0.17 released; add vala vapi file; numerous updates to Gtk72 [19]Version 0.17 released; add vala vapi file; numerous updates to Gtk
69 support73 support
7074
71 Thu 27 Aug 2009:75 Thu 27 Aug 2009:
7276
73 [19]Version 0.16 released; add new ca_context_playing() call77 [20]Version 0.16 released; add new ca_context_playing() call
7478
75 Wed 5 Aug 2009:79 Wed 5 Aug 2009:
7680
77 [20]Version 0.15 released; bug fixes81 [21]Version 0.15 released; bug fixes
7882
79 Thu 2 Jul 2009:83 Thu 2 Jul 2009:
8084
81 [21]Version 0.14 released; bug fixes85 [22]Version 0.14 released; bug fixes
8286
83 Tue 23 Jun 2009:87 Tue 23 Jun 2009:
8488
85 [22]Version 0.13 released; multichannel support; gtk multihead support;89 [23]Version 0.13 released; multichannel support; gtk multihead support;
86 bug fixes90 bug fixes
8791
88 Mon 13 Apr 2009:92 Mon 13 Apr 2009:
8993
90 [23]Version 0.12 released; changes include: various fixes and updates94 [24]Version 0.12 released; changes include: various fixes and updates
91 for the PulseAudio backend; detect forks and return an error for all95 for the PulseAudio backend; detect forks and return an error for all
92 functions in that case96 functions in that case
9397
94 Wed 21 Jan 2009:98 Wed 21 Jan 2009:
9599
96 [24]Version 0.11 released; changes include: major GStreamer backend100 [25]Version 0.11 released; changes include: major GStreamer backend
97 fixes; update to libtool 2.2; a few other fixes101 fixes; update to libtool 2.2; a few other fixes
98102
99 Mon 6 Oct 2008:103 Mon 6 Oct 2008:
100104
101 [25]Version 0.10 released; changes include: install Gtk+ module using105 [26]Version 0.10 released; changes include: install Gtk+ module using
102 GConf; a few other fixes106 GConf; a few other fixes
103107
104 Tue 9 Sep 2008:108 Tue 9 Sep 2008:
105109
106 [26]Version 0.9 released; changes include: GStreamer fixes, include110 [27]Version 0.9 released; changes include: GStreamer fixes, include
107 (optional) libtdb based lookup cache.111 (optional) libtdb based lookup cache.
108112
109 Thu 28 Aug 2008:113 Thu 28 Aug 2008:
110114
111 [27]Version 0.8 released; changes include: new OSS and GStreamer115 [28]Version 0.8 released; changes include: new OSS and GStreamer
112 backend; portability fixes for FreeBSD/Solaris; the multi backend works116 backend; portability fixes for FreeBSD/Solaris; the multi backend works
113 now117 now
114118
115 Thu 14 Aug 2008:119 Thu 14 Aug 2008:
116120
117 [28]Version 0.7 released; changes include: documentation updates;121 [29]Version 0.7 released; changes include: documentation updates;
118 various bug fixes; add this web site/README; allow playback of event122 various bug fixes; add this web site/README; allow playback of event
119 sounds with only a sound file path specified; other changes123 sounds with only a sound file path specified; other changes
120124
121Overview125Overview
122126
123 libcanberra is an implementation of the [29]XDG Sound Theme and Name127 libcanberra is an implementation of the [30]XDG Sound Theme and Name
124 Specifications, for generating event sounds on free desktops, such as128 Specifications, for generating event sounds on free desktops, such as
125 [30]GNOME. It comes with several backends ([31]ALSA, [32]PulseAudio,129 [31]GNOME. It comes with several backends ([32]ALSA, [33]PulseAudio,
126 OSS, [33]GStreamer, null) and is designed to be portable. It consists130 OSS, [34]GStreamer, null) and is designed to be portable. It consists
127 of the following parts:131 of the following parts:
128 1. libcanberra: the main library132 1. libcanberra: the main library
129 2. libcanberra-gtk: some glue code to make it easier to use133 2. libcanberra-gtk: some glue code to make it easier to use
@@ -131,14 +135,14 @@
131 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to135 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
132 trigger input feedback event sounds136 trigger input feedback event sounds
133137
134 For more information see [34]the original announcement.138 For more information see [35]the original announcement.
135139
136Current Status140Current Status
137141
138 libcanberra is mostly feature complete. For now however it includes142 libcanberra is mostly feature complete. For now however it includes
139 backends only for ALSA, PulseAudio, OSS and GStreamer.143 backends only for ALSA, PulseAudio, OSS and GStreamer.
140144
141 libcanberra has been declared [35]a blessed GNOME dependency.145 libcanberra has been declared [36]a blessed GNOME dependency.
142146
143 The OSS driver is incomplete: only sound files that are in a format147 The OSS driver is incomplete: only sound files that are in a format
144 natively understood by the sound card are supported. If the sample148 natively understood by the sound card are supported. If the sample
@@ -160,7 +164,7 @@
160164
161Documentation165Documentation
162166
163 You may browse the [36]gtkdoc generated [37]programing documentation of167 You may browse the [37]gtkdoc generated [38]programing documentation of
164 the API.168 the API.
165169
166Requirements170Requirements
@@ -195,25 +199,26 @@
195Download199Download
196200
197 The newest release is always available from201 The newest release is always available from
198 [38]http://0pointer.de/lennart/projects/libcanberra/202 [39]http://0pointer.de/lennart/projects/libcanberra/
199203
200 The current release is [39]0.25204 The current release is [40]0.26
201205
202 Get libcanberra's development sources from the [40]GIT [41]repository206 Get libcanberra's development sources from the [41]GIT [42]repository
203 ([42]gitweb):207 ([43]gitweb):
204git clone git://git.0pointer.de/libcanberra208git clone git://git.0pointer.de/libcanberra
205209
206 If you want to report bugs, have questions or want to be notified about210 If you want to report bugs, have questions or want to be notified about
207 new releases, please join the [43]libcanberra-discuss mailing list.211 new releases, please join the [44]libcanberra-discuss mailing list.
208212
209 If you want to be notified about new git commits, please join the213 If you want to be notified about new git commits, please join the
210 [44]libcanberra-commits mailing list.214 [45]libcanberra-commits mailing list.
211215
212 libcanberra's bugs are tracked at [45]bugs.freedesktop.org.216 libcanberra's bugs are tracked at [46]bugs.freedesktop.org.
213 __________________________________________________________________217 __________________________________________________________________
214218
215219
216 Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, June 2010220 Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, October
221 2010
217222
218References223References
219224
@@ -226,39 +231,40 @@
226 7. README#installation231 7. README#installation
227 8. README#acks232 8. README#acks
228 9. README#download233 9. README#download
229 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz234 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz
230 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz235 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
231 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz236 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
232 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz237 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
233 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz238 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
234 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz239 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
235 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz240 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
236 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz241 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
237 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz242 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
238 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz243 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
239 20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz244 20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
240 21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz245 21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
241 22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz246 22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
242 23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz247 23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
243 24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz248 24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
244 25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz249 25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
245 26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz250 26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
246 27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz251 27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
247 28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz252 28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
248 29. http://freedesktop.org/wiki/Specifications/sound-theme-spec253 29. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
249 30. http://www.gnome.org/254 30. http://freedesktop.org/wiki/Specifications/sound-theme-spec
250 31. http://alsa-project.org/255 31. http://www.gnome.org/
251 32. http://pulseaudio.org/256 32. http://alsa-project.org/
252 33. http://gstreamer.org/257 33. http://pulseaudio.org/
253 34. http://0pointer.de/blog/projects/sixfold-announcement.html258 34. http://gstreamer.org/
254 35. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html259 35. http://0pointer.de/blog/projects/sixfold-announcement.html
255 36. http://www.gtk.org/gtk-doc/260 36. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
256 37. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/261 37. http://www.gtk.org/gtk-doc/
257 38. http://0pointer.de/lennart/projects/libcanberra/262 38. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
258 39. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz263 39. http://0pointer.de/lennart/projects/libcanberra/
259 40. http://git-scm.com/264 40. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz
260 41. git://git.0pointer.de/libcanberra265 41. http://git-scm.com/
261 42. http://git.0pointer.de/?p=libcanberra.git266 42. git://git.0pointer.de/libcanberra
262 43. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/267 43. http://git.0pointer.de/?p=libcanberra.git
263 44. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/268 44. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
264 45. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra269 45. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
270 46. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
265271
=== 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 @@
3<html xmlns="http://www.w3.org/1999/xhtml">3<html xmlns="http://www.w3.org/1999/xhtml">
44
5<head>5<head>
6<title>libcanberra 0.25</title>6<title>libcanberra 0.26</title>
7<link rel="stylesheet" type="text/css" href="style.css" />7<link rel="stylesheet" type="text/css" href="style.css" />
8</head>8</head>
99
10<body>10<body>
11<h1><a name="top">libcanberra 0.25</a></h1>11<h1><a name="top">libcanberra 0.26</a></h1>
1212
13<p><i>Copyright 2008-2010 Lennart Poettering &lt;mzyvopnaoreen (at) 0pointer (dot) de&gt;</i></p>13<p><i>Copyright 2008-2010 Lennart Poettering &lt;mzyvopnaoreen (at) 0pointer (dot) de&gt;</i></p>
1414
@@ -38,6 +38,10 @@
3838
39<h2><a name="news">News</a></h2>39<h2><a name="news">News</a></h2>
4040
41<div class="news-date">Mon 4 Oct
422010: </div> <p class="news-text"><a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz">Version
430.26</a> released; Gtk+ 3.x fixes.</p>
44
41<div class="news-date">Sun 13 Jun45<div class="news-date">Sun 13 Jun
422010: </div> <p class="news-text"><a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz">Version462010: </div> <p class="news-text"><a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz">Version
430.25</a> released; Optionally build with Gtk+ 3.x in addition to Gtk+ 2.x.</p>470.25</a> released; Optionally build with Gtk+ 3.x in addition to Gtk+ 2.x.</p>
@@ -212,7 +216,7 @@
212216
213<p>The newest release is always available from <a href="http://0pointer.de/lennart/projects/libcanberra/">http://0pointer.de/lennart/projects/libcanberra/</a></p>217<p>The newest release is always available from <a href="http://0pointer.de/lennart/projects/libcanberra/">http://0pointer.de/lennart/projects/libcanberra/</a></p>
214218
215<p>The current release is <a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz">0.25</a></p>219<p>The current release is <a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.26.tar.gz">0.26</a></p>
216220
217<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>221<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>
218222
@@ -225,7 +229,7 @@
225<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>229<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>
226230
227<hr/>231<hr/>
228<address class="grey">Lennart Poettering &lt;mzyvopnaoreen (at) 0pointer (dot) de&gt;, June 2010</address>232<address class="grey">Lennart Poettering &lt;mzyvopnaoreen (at) 0pointer (dot) de&gt;, October 2010</address>
229233
230</body>234</body>
231</html>235</html>
232236
=== 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 @@
3838
39<h2><a name="news">News</a></h2>39<h2><a name="news">News</a></h2>
4040
41<div class="news-date">Mon 4 Oct
422010: </div> <p class="news-text"><a href="@PACKAGE_URL@libcanberra-0.26.tar.gz">Version
430.26</a> released; Gtk+ 3.x fixes.</p>
44
41<div class="news-date">Sun 13 Jun45<div class="news-date">Sun 13 Jun
422010: </div> <p class="news-text"><a href="@PACKAGE_URL@libcanberra-0.25.tar.gz">Version462010: </div> <p class="news-text"><a href="@PACKAGE_URL@libcanberra-0.25.tar.gz">Version
430.25</a> released; Optionally build with Gtk+ 3.x in addition to Gtk+ 2.x.</p>470.25</a> released; Optionally build with Gtk+ 3.x in addition to Gtk+ 2.x.</p>
@@ -225,7 +229,7 @@
225<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>229<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>
226230
227<hr/>231<hr/>
228<address class="grey">Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;, June 2010</address>232<address class="grey">Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;, October 2010</address>
229233
230</body>234</body>
231</html>235</html>
232236
=== 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 @@
48 <em class="parameter"><code><span class="type">uint32_t</span> id</code></em>,48 <em class="parameter"><code><span class="type">uint32_t</span> id</code></em>,
49 <em class="parameter"><code>...</code></em>);49 <em class="parameter"><code>...</code></em>);
50<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>,50<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>,
51 <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>);51 <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>);
52</pre>52</pre>
53</div>53</div>
54<div class="refsect1" title="Description">54<div class="refsect1" title="Description">
@@ -239,7 +239,7 @@
239<div class="refsect2" title="ca_gtk_widget_disable_sounds ()">239<div class="refsect2" title="ca_gtk_widget_disable_sounds ()">
240<a name="ca-gtk-widget-disable-sounds"></a><h3>ca_gtk_widget_disable_sounds ()</h3>240<a name="ca-gtk-widget-disable-sounds"></a><h3>ca_gtk_widget_disable_sounds ()</h3>
241<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>,241<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>,
242 <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>242 <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>
243<p>243<p>
244By default sound events are automatically generated for all kinds244By default sound events are automatically generated for all kinds
245of input events. Use this function to disable this. This is245of input events. Use this function to disable this. This is
246246
=== 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 @@
505 goto fail;505 goto fail;
506506
507 if (e->any.window)507 if (e->any.window)
508#if GTK_CHECK_VERSION (2, 90, 7)
509 s = gdk_window_get_screen(e->any.window);
510#else
508 s = gdk_drawable_get_screen(GDK_DRAWABLE(e->any.window));511 s = gdk_drawable_get_screen(GDK_DRAWABLE(e->any.window));
512#endif
509 else513 else
510 s = gdk_screen_get_default();514 s = gdk_screen_get_default();
511515
512516
=== 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 @@
48 *48 *
49 * Evaluates to the minor version number of libcanberra.49 * Evaluates to the minor version number of libcanberra.
50 */50 */
51#define CA_MINOR (25)51#define CA_MINOR (26)
5252
53/**53/**
54 * CA_CHECK_VERSION:54 * CA_CHECK_VERSION:
5555
=== 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 @@
34#include "llist.h"34#include "llist.h"
35#include "cache.h"35#include "cache.h"
3636
37#define DEFAULT_THEME "ubuntu"37#define DEFAULT_THEME "freedesktop"
38#define FALLBACK_THEME "ubuntu"38#define FALLBACK_THEME "freedesktop"
39#define DEFAULT_OUTPUT_PROFILE "stereo"39#define DEFAULT_OUTPUT_PROFILE "stereo"
40#define N_THEME_DIR_MAX 840#define N_THEME_DIR_MAX 8
4141

Subscribers

People subscribed via source and target branches

to all changes: