diff -u libcanberra-0.26/debian/changelog libcanberra-0.26/debian/changelog --- libcanberra-0.26/debian/changelog +++ libcanberra-0.26/debian/changelog @@ -1,3 +1,33 @@ +libcanberra (0.26-1ubuntu1) natty; urgency=low + + * Merge from debian experimental. Remaining changes: + - Use the Ubuntu sound theme as the default and fallback theme + - gnome-session-canberra recommends libcanberra-pulse + * debian/control: + - Dropped conflicts/replace for libcanberra-gnome(-dbg) because it's + been fixed since jaunty and natty needn't care about direct upgrades + from hardy or intrepid. + - Added breaks/replace for libcanberra-gtk-dev to new package + libcanberra-gtk-common-dev that took some of its files + * debian/gnome-session-canberra.install: + - Drop Ubuntu change to install ready-sound.desktop because Debian + does it too now. + + -- Michael Terry Wed, 08 Dec 2010 11:28:26 -0500 + +libcanberra (0.26-1) experimental; urgency=low + + * New upstream release + * debian/control + - Add gtk3.0 support + * Split header and vapi used for both gtk2 and gtk3 into + libcanberra-gtk-common-dev + * Various cleanups and updates based on the Ubuntu packaging + * debian/control: Update standards version, 3.9.1 + * Remove the quilt build-dep, we're not applying any patches + + -- Sjoerd Simons Sat, 20 Nov 2010 11:39:25 +0100 + libcanberra (0.26-0ubuntu2) natty; urgency=low * Upload to natty diff -u libcanberra-0.26/debian/libcanberra-gtk3-0.install libcanberra-0.26/debian/libcanberra-gtk3-0.install --- libcanberra-0.26/debian/libcanberra-gtk3-0.install +++ libcanberra-0.26/debian/libcanberra-gtk3-0.install @@ -2 +1,0 @@ -#debian/tmp/usr/bin/canberra-gtk-play diff -u libcanberra-0.26/debian/libcanberra-gtk3-dev.install libcanberra-0.26/debian/libcanberra-gtk3-dev.install --- libcanberra-0.26/debian/libcanberra-gtk3-dev.install +++ libcanberra-0.26/debian/libcanberra-gtk3-dev.install @@ -1,4 +1,2 @@ -#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 diff -u libcanberra-0.26/debian/libcanberra-gtk3-module.install libcanberra-0.26/debian/libcanberra-gtk3-module.install --- libcanberra-0.26/debian/libcanberra-gtk3-module.install +++ libcanberra-0.26/debian/libcanberra-gtk3-module.install @@ -3 +3 @@ -#debian/52libcanberra-gtk-module_add-to-gtk-modules /etc/X11/Xsession.d +debian/52libcanberra-gtk-module_add-to-gtk-modules /etc/X11/Xsession.d/52libcanberra-gtk3-module_add-to-gtk-modules diff -u libcanberra-0.26/debian/control libcanberra-0.26/debian/control --- libcanberra-0.26/debian/control +++ libcanberra-0.26/debian/control @@ -1,7 +1,7 @@ Source: libcanberra Section: libs Priority: optional -Maintainer: Ubuntu Core Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Marc-Andre Lureau Uploaders: Sjoerd Simons , Sebastian Dröge Build-Depends: debhelper (>= 5), @@ -11,13 +11,12 @@ dpkg-dev (>= 1.14.13), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libvorbis-dev, - libgtk2.0-dev (>= 2.20), libgtk3.0-dev (>= 2.91.0), + libgtk2.0-dev (>= 2.22), tdb-dev (>> 1.1), gtk-doc-tools, libpulse-dev (>= 0.9.11), libgstreamer0.10-dev (>= 0.10.15), - libgconf2-dev, quilt Standards-Version: 3.9.1 Vcs-Bzr: http://launchpad.net/~ubuntu-desktop/libcanberra/ubuntu @@ -112,13 +111,11 @@ Architecture: any 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 usage from Gtk+. . - Contextual informations are needed to play event sound. This library + Contextual information is needed to play event sound. This library can help to compile directly event sounds property lists based on active GtkWidget objects or GdkEvent events. @@ -127,37 +124,71 @@ Priority: extra Section: debug 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 usage from Gtk+. . - Contextual informations are needed to play event sound. This library + Contextual information is 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-gtk-common-dev +Section: libdevel +Architecture: all +Replaces: libcanberra-gtk-dev (<< 0.26-1) +Breaks: libcanberra-gtk-dev (<< 0.26-1) +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a simple abstract interface for playing event sounds + libcanberra-gtk provides a few functions that simplify + libcanberra usage from Gtk+. + . + Contextual information is 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 common headers for developing + applications using libcanberra-gtk and libcanberra-gtk3 + Package: libcanberra-gtk-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends}, - libcanberra-gtk0 (= ${binary:Version}), - libcanberra-dev (= ${binary:Version}), - libgtk2.0-dev (>= 2.20) + ${misc:Depends}, + libcanberra-gtk0 (= ${binary:Version}), + libcanberra-dev (= ${binary:Version}), + libgtk2.0-dev (>= 2.20), + libcanberra-gtk-common-dev Description: a simple abstract interface for playing event sounds libcanberra-gtk provides a few functions that simplify libcanberra usage from Gtk+. . - Contextual informations are needed to play event sound. This library + Contextual information is 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} +Description: translates Gtk+ widgets signals to event sounds + 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-0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -166,7 +197,7 @@ libcanberra-gtk provides a few functions that simplify libcanberra usage from Gtk+ 3.0. . - Contextual informations are needed to play event sound. This library + Contextual information is needed to play event sound. This library can help to compile directly event sounds property lists based on active GtkWidget objects or GdkEvent events. @@ -179,7 +210,7 @@ libcanberra-gtk provides a few functions that simplify libcanberra usage from Gtk+ 3.0. . - Contextual informations are needed to play event sound. This library + Contextual information is needed to play event sound. This library can help to compile directly event sounds property lists based on active GtkWidget objects or GdkEvent events. . @@ -189,73 +220,49 @@ 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) + ${misc:Depends}, + libcanberra-gtk3-0 (= ${binary:Version}), + libcanberra-dev (= ${binary:Version}), + libcanberra-gtk-common-dev, + libgtk3.0-dev Description: a simple abstract interface for playing event sounds - libcanberra-gtk provides a few functions that simplify - libcanberra usage from Gtk+ 3.0. + libcanberra-gtk3 provides a few functions that simplify + libcanberra usage from Gtk 3.0. . - Contextual informations are needed to play event sound. This library + Contextual information is 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 +Package: libcanberra-gtk3-module Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: translates Gtk+ widgets signals to event sounds +Description: translates Gtk3 widgets signals to event sounds A GtkModule which will automatically hook into all kinds of events - inside a Gtk+ program and generate sound events from them. + inside a Gtk+ 3.0 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. +Package: gnome-session-canberra +Architecture: all +Depends: ${misc:Depends}, ${shlibs:Depends}, libcanberra-gtk0 +Recommends: libcanberra-pulse +Description: GNOME session log in and log out sound events + Produce sound events on GNOME session log in and log out. . - This package contains detached debugging symbols for it. - -Package: libcanberra-gtk3-module -Architecture: any -Priority: extra -Section: debug -Depends: ${shlibs: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. + This package is using canberra-gtk-play from libcanberra. Package: libcanberra-gtk3-module-dbg Architecture: any Priority: extra Section: debug -Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version}) +Depends: ${misc:Depends}, libcanberra-gtk3-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 -Recommends: libcanberra-pulse -Conflicts: libcanberra-gnome (<< 0.10-1) -Replaces: libcanberra-gnome (<< 0.10-1) -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-doc Section: doc Architecture: all diff -u libcanberra-0.26/debian/libcanberra-gtk-dev.install libcanberra-0.26/debian/libcanberra-gtk-dev.install --- libcanberra-0.26/debian/libcanberra-gtk-dev.install +++ libcanberra-0.26/debian/libcanberra-gtk-dev.install @@ -1,4 +1,2 @@ -debian/tmp/usr/include/canberra-gtk.h debian/tmp/usr/lib/libcanberra-gtk.so debian/tmp/usr/lib/pkgconfig/libcanberra-gtk.pc -debian/tmp/usr/share/vala/vapi/libcanberra-gtk.vapi only in patch2: unchanged: --- libcanberra-0.26.orig/debian/libcanberra-gtk-common-dev.install +++ libcanberra-0.26/debian/libcanberra-gtk-common-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include/canberra-gtk.h +debian/tmp/usr/share/vala/vapi/libcanberra-gtk.vapi