r38254 - in /packages/unstable/libcanberra: ./ debian/changelog debian/control.in debian/libcanberra-gtk-module.install debian/libcanberra-gtk3-module.install debian/rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Thu May 30 14:50:06 2013
New Revision: 38254

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38254
Log:
Merge experimental branch

Modified:
    packages/unstable/libcanberra/   (props changed)
    packages/unstable/libcanberra/debian/changelog
    packages/unstable/libcanberra/debian/control.in
    packages/unstable/libcanberra/debian/libcanberra-gtk-module.install
    packages/unstable/libcanberra/debian/libcanberra-gtk3-module.install
    packages/unstable/libcanberra/debian/rules

Propchange: packages/unstable/libcanberra/
------------------------------------------------------------------------------
    svn:mergeinfo = /packages/experimental/libcanberra:37169-38253

Modified: packages/unstable/libcanberra/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/changelog?rev=38254&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/changelog [utf-8] (original)
+++ packages/unstable/libcanberra/debian/changelog [utf-8] Thu May 30 14:50:06 2013
@@ -1,3 +1,11 @@
+libcanberra (0.30-1) experimental; urgency=low
+
+  * New upstream release
+  * Gconf usage is dropped (remove b-d and schema install)
+  * Ported to gstreamer 1.0
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 24 Mar 2013 10:35:17 +0100
+
 libcanberra (0.28-6) unstable; urgency=low
 
   * libcanberra-gtk-common-dev breaks/replaces libcanberra-gtk-dev << 

Modified: packages/unstable/libcanberra/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/control.in?rev=38254&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/control.in [utf-8] (original)
+++ packages/unstable/libcanberra/debian/control.in [utf-8] Thu May 30 14:50:06 2013
@@ -12,13 +12,12 @@
                dpkg-dev (>= 1.14.13),
                libasound2-dev [linux-any],
                libvorbis-dev,
-               libgconf2-dev,
                libgtk-3-dev (>= 3.0.0),
                libgtk2.0-dev (>= 2.22),
                libtdb-dev (>> 1.1),
                gtk-doc-tools,
                libpulse-dev (>= 0.9.11),
-               libgstreamer0.10-dev (>= 0.10.15)
+               libgstreamer1.0-dev
 Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/libcanberra/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libcanberra/

Modified: packages/unstable/libcanberra/debian/libcanberra-gtk-module.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/libcanberra-gtk-module.install?rev=38254&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/libcanberra-gtk-module.install [utf-8] (original)
+++ packages/unstable/libcanberra/debian/libcanberra-gtk-module.install [utf-8] Thu May 30 14:50:06 2013
@@ -1,3 +1,2 @@
 debian/tmp/usr/lib/*/gtk-2.0/modules/libcanberra-gtk-module.so
-debian/tmp/etc/gconf/schemas/libcanberra.schemas
 debian/tmp/usr/lib/*/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop usr/lib/gnome-settings-daemon-3.0/gtk-modules

Modified: packages/unstable/libcanberra/debian/libcanberra-gtk3-module.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/libcanberra-gtk3-module.install?rev=38254&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/libcanberra-gtk3-module.install [utf-8] (original)
+++ packages/unstable/libcanberra/debian/libcanberra-gtk3-module.install [utf-8] Thu May 30 14:50:06 2013
@@ -1,4 +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/tmp/etc/gconf/schemas/libcanberra3.schemas
 debian/tmp/usr/lib/*/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk3-module.desktop usr/lib/gnome-settings-daemon-3.0/gtk-modules

Modified: packages/unstable/libcanberra/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/rules?rev=38254&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/rules [utf-8] (original)
+++ packages/unstable/libcanberra/debian/rules [utf-8] Thu May 30 14:50:06 2013
@@ -39,4 +39,3 @@
 install/libcanberra-gtk3-module::
 	cp -a src/canberra-gtk-module.desktop \
 	      debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk3-module.desktop
-	cp -a libcanberra.schemas debian/tmp/etc/gconf/schemas/libcanberra3.schemas