Changeset 4908 for pkg/boss/main/libcanberra/trunk

Timestamp:

01/16/09 04:25:03 (4 years ago)

Author:

alanbach-guest

Message:

• Merged updates from Ubuntu 0.10-1ubuntu3
  • Do not build with Pulse-Audio

Location:

pkg/boss/main/libcanberra/trunk/debian

Files:

• 52libcanberra-gtk-module_add-to-gtk-modules (added)
• README.Debian (modified) (2 diffs)
• changelog (modified) (2 diffs)
• control (modified) (6 diffs)
• gnome-session-canberra.install (added)
• libcanberra-gtk-module.install (modified) (1 diff)
• libcanberra-gtk0.install (modified) (1 diff)
• libcanberra0.symbols (modified) (2 diffs)
• patches/0001-Remove-debug-warning-about-GtkSettings-from-2.13.4.patch (added)
• patches/0002-autofoo.patch (added)
• patches/0003-fix-logout-script.patch (added)
• patches/0004-use-ubuntu-theme.patch (added)
• patches/fix-logout-script.patch (deleted)
• patches/series (added)
• rules (modified) (2 diffs)
• watch (modified) (1 diff)

pkg/boss/main/libcanberra/trunk/debian/README.Debian

@@ -2 +2 @@
 ----------------------
 
-libcanberra can use different backends: null, ALSA or PulseAudio.
+libcanberra can use different backends: null, ALSA, PulseAudio, OSS,
+GStreamer.
+
 Since the PulseAudio backend requires PulseAudio >= 0.9.11, this
 package uses ALSA for testing purposes. It is planned to use
@@ -10 +12 @@
 configurable backend installation.
 
-The backend are loaded with the DSO builtin, in this order "pulse"
-then "alsa".
+The GTK+ module is loaded when the GTK_MODULES environment variable
+contains the string "canberra-gtk-module". Lennart proposed to enable
+this by default when the package is installed. I have to figure out
+how to do it correctly in Debian.
 
-The GTK+ module is loaded when the GTK_MODULES environment variable
-contains the string "canberra-gtk-module".
+This package target "experimental": libcanberra-gtk requires GTK+
+2.13.4 in order to take the XSETTINGS configuration. However, GTK+
+2.13 is not available in Debian. But the package still compile with
+older version. A patch is included to avoid spurious debug messages.
 
- -- Marc-Andre Lureau <marc-andre.lureau@nokia.com>, Thu, 12 Jun 2008 12:57:16 +0300
+ -- Marc-Andre Lureau <marcandre.lureau@gmail.com>, Thu, 28 Aug 2008 19:55:54 +0300

pkg/boss/main/libcanberra/trunk/debian/changelog

@@ -1 @@
-libcanberra (0.6-parsix1) unstable; urgency=low
+libcanberra (0.10-parsix1) unstable; urgency=low
 
-  * Merged updates from Ubuntu 0.6-0ubuntu3
+  * Merged updates from Ubuntu 0.10-1ubuntu3
+  * Do not build with Pulse-Audio
 
- -- Alan Baghumian <alan@technotux.org>  Tue, 18 Nov 2008 10:19:08 -0800
+ -- Alan Baghumian <alan@technotux.org>  Thu, 15 Jan 2009 17:38:03 -0800
+
+libcanberra (0.10-1ubuntu3) jaunty; urgency=low
+
+  * Let libcanberra-gtk0(-dbg) conflicts/replaces libcanberra-gnome(-dbg)
+    (<< 0.10-1) to allow a clean upgrade from Intrepid (LP: #302251).
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Fri, 28 Nov 2008 20:02:28 +0100
+
+libcanberra (0.10-1ubuntu2) jaunty; urgency=low
+
+  * Ship the libcanberra-pulse.so in the libcanberra0 package.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Thu, 27 Nov 2008 04:23:30 +1100
+
+libcanberra (0.10-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian experimental, Remaining changes:
+    - Use the Ubuntu sound theme as the default and fallback theme.
+    - Update libltdl build dependency.
+  * Build-depend on quilt.
+  * Build against pulseaudio.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Mon, 24 Nov 2008 12:49:10 +1100
+
+libcanberra (0.10-1) experimental; urgency=low
+
+  * New Upstream Version
+  * Move "canberra-gtk-play" from libcanberra-gtk-dev in libcanberra-gtk0.
+  * Add gnome-session-canberra to play log in/out events.
+  * Add 52libcanberra-gtk-module_add-to-gtk-modules to /etc/X11/Xsession.d to load
+    the GTK module.
+  * 0001-Remove-debug-warning-about-GtkSettings-from-2.13.4.patch,
+    debian/control,
+    debian/README:
+    + do not depends on GTK 2.13.4 yet
+    + remove debug message about that from canberra-gtk-module
+  * Add tdb-dev dependency, for lookup caching.
+
+ -- Marc-Andre Lureau <marcandre.lureau@gmail.com>  Wed, 10 Sep 2008 22:16:46 +0300
+
+libcanberra (0.6-0ubuntu3) intrepid; urgency=low
+
+  * debian/patches/use-ubuntu-theme.patch: Use the ubuntu theme as the
+    default and fallback desktop theme, since the freedesktop theme is not
+    in the archive.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Fri, 10 Oct 2008 14:03:05 +1100
+
+libcanberra (0.6-0ubuntu2) intrepid; urgency=low
+
+  * Create new package, libcanberra-gnome, which contains the
+    canberra-gtk-play utility, as well as the startup and shutdown autostart
+    files needed for GNOME sound events.
+  * debian/libcanberra-gtk-dev: Don't ship canberra-gtk-play utility
+  * debian/patches/fix-logout-script.patch: Use logout sound rather than
+    login sound when logging out.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Tue, 23 Sep 2008 16:13:15 +1000
+
+libcanberra (0.6-0ubuntu1) intrepid; urgency=low
+
+  * New upstream version
+  * debian/control:
+    - updated libltdl build-depends
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 05 Aug 2008 15:26:29 +0200
 
 libcanberra (0.4-1) unstable; urgency=low
@@ -17 +84 @@
   * Fix symbol files.
 
- -- Alan Baghumian <alan@technotux.org>  Mon, 03 Nov 2008 09:58:41 -0800
+ -- Sebastian Dröge <slomo@debian.org>  Sun, 27 Jul 2008 11:51:31 +0200
 
 libcanberra (0.3-1) unstable; urgency=low

pkg/boss/main/libcanberra/trunk/debian/control

@@ -2 +2 @@
 Section: libs
 Priority: optional
-Maintainer: Marc-Andre Lureau <marcandre.lureau@gmail.com>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Marc-Andre Lureau <marcandre.lureau@gmail.com>
 Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 5), cdbs, m4, libltdl7-dev, dpkg-dev (>= 1.14.13),
     libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
     libvorbis-dev,
-    libgtk2.0-dev,
-    gtk-doc-tools
+    libgtk2.0-dev (>= 2.12),
+    tdb-dev (> 1.1),
+    gtk-doc-tools, quilt
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/collab-maint/libcanberra.git
@@ -53 +55 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: libcanberra-gtk-module
+Conflicts: libcanberra-gnome (<< 0.10-1)
+Replaces: libcanberra-gnome (<< 0.10-1)
 Description: Gtk+ helper for playing widget event sounds with libcanberra
  libcanberra-gtk provides a few functions that simplify libcanberra
@@ -65 +69 @@
 Priority: extra
 Depends: ${misc:Depends}, libcanberra-gtk0 (= ${binary:Version})
+Conflicts: libcanberra-gnome-dbg (<< 0.10-1)
+Replaces: libcanberra-gnome-dbg (<< 0.10-1)
 Description: libcanberra-gtk libraries detached debugging symbols
  libcanberra-gtk provides a few functions that simplify libcanberra
@@ -79 +85 @@
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libcanberra-gtk0 (= ${binary:Version}),
-         libcanberra-dev (= ${binary:Version}),
-         libgtk2.0-dev (>= 2.10)
+         ${misc:Depends},
+         libcanberra-gtk0 (= ${binary:Version}),
+         libcanberra-dev (= ${binary:Version}),
+         libgtk2.0-dev (>= 2.10)
 Description: a simple abstract interface for playing event sounds
  libcanberra-gtk provides a few functions that simplify
@@ -100 +106 @@
  A GtkModule which will automatically hook into all kinds of events
  inside a Gtk+ program and generate sound events from them.
+
+Package: gnome-session-canberra
+Architecture: all
+Depends: libcanberra-gtk0
+Description: GNOME session log in and log out sound events
+ Produce sound events on GNOME session log in and log out.
+ .
+ This package is using canberra-gtk-play from libcanberra.
 
 Package: libcanberra-gtk-module-dbg
@@ -126 +140 @@
  This package contains the HTML documentation for libcanberra and
  libcanberra-gtk.
-
-Package: libcanberra-gnome
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Gtk+ helper for playing widget event sounds with libcanberra
- libcanberra-gtk provides a few functions that simplify libcanberra
- usage from Gtk+.
- .
- 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 files necessary to get full GNOME sound event
- functionality.
-
-Package: libcanberra-gnome-dbg
-Architecture: any
-Priority: extra
-Depends: ${misc:Depends}, libcanberra-gnome (= ${binary:Version})
-Description: libcanberra-gtk libraries detached debugging symbols
- libcanberra-gtk provides a few functions that simplify libcanberra
- usage from Gtk+.
- .
- 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 the canberra-gtk-play
- utility.

pkg/boss/main/libcanberra/trunk/debian/libcanberra-gtk-module.install

@@ -1 +1 @@
 debian/tmp/usr/lib/gtk-2.0/modules/libcanberra-gtk-module.so
+debian/52libcanberra-gtk-module_add-to-gtk-modules /etc/X11/Xsession.d

pkg/boss/main/libcanberra/trunk/debian/libcanberra-gtk0.install

@@ -1 +1 @@
 debian/tmp/usr/lib/libcanberra-gtk.so.*
+debian/tmp/usr/bin/canberra-gtk-play

pkg/boss/main/libcanberra/trunk/debian/libcanberra0.symbols

@@ -2 +2 @@
 * Build-Depends-Package: libcanberra-dev
  CANBERRA_0@CANBERRA_0 0.3
+ ca_cache_lookup_sound@Base 0.9
+ ca_cache_store_sound@Base 0.9
  ca_context_cache@Base 0.2
  ca_context_cache_full@Base 0.2
@@ -16 +18 @@
  ca_debug@Base 0.4
  ca_driver_order@Base 0.4
+ ca_get_data_dirs@Base 0.9
+ ca_get_data_home@Base 0.9
  ca_lookup_sound@Base 0.2
+ ca_lookup_sound_with_callback@Base 0.8
+ ca_memdup@Base 0.10
  ca_mutex_free@Base 0.2
  ca_mutex_lock@Base 0.2

pkg/boss/main/libcanberra/trunk/debian/rules

@@ -4 +4 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 common-install-arch::
@@ -23 +23 @@
         done
 
-DEB_CONFIGURE_EXTRA_FLAGS = --disable-pulse --enable-alsa --enable-gtk --enable-gtk-doc --with-builtin=dso
+DEB_CONFIGURE_EXTRA_FLAGS =                     \
+        --disable-pulse                         \
+    --disable-oss               \
+        --enable-alsa                           \
+        --enable-gtk                            \
+        --enable-gtk-doc                        \
+        --enable-tdb                            \
+        --with-builtin=dso
 DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/gtk-2.0/modules
-DEB_DH_MAKESHLIBS_ARGS_libcanberra0 += -V "libcanberra0 (>= 0.4)" -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk0 += -V "libcanberra-gtk0 (>= 0.4)" -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libcanberra0 += -V "libcanberra0 (>= 0.10)" -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk0 += -V "libcanberra-gtk0 (>= 0.10)" -- -c4

pkg/boss/main/libcanberra/trunk/debian/watch

@@ -6 +6 @@
 version=3
 
-http://0pointer.de/lennart/projects/libcanberra/libcanberra-(.*)\.tar\.gz
+http://0pointer.de/public/ libcanberra-(.*)\.tar\.gz