r11037 - in /desktop/unstable/gnome-orca/debian: changelog control control.in

[mlang at users.alioth.debian.org]

Author: mlang
Date: Thu May 17 18:45:24 2007
New Revision: 11037

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11037
Log:
Merge dependency changes from 2.19.2-2.

Modified:
    desktop/unstable/gnome-orca/debian/changelog
    desktop/unstable/gnome-orca/debian/control
    desktop/unstable/gnome-orca/debian/control.in

Modified: desktop/unstable/gnome-orca/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/changelog?rev=11037&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/changelog (original)
+++ desktop/unstable/gnome-orca/debian/changelog Thu May 17 18:45:24 2007
@@ -1,9 +1,16 @@
 gnome-orca (2.18.1-4) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Add Mario Lang <mlang at debian.org> as uploaders
   * debian/control: added missing comma in Depends
 
- -- Loic Minier <lool at dooz.org>  Wed, 02 May 2007 10:34:06 +0200
+  [ Mario Lang ]
+  * Merge changes from experimental branch (2.19.2-2):
+    - Drop {Build-,}Depends on python-at-spi.
+    - Drop Build-Depends on libgnome-speech3-dev.
+    - Depends on libgnome-speech7 now.
+
+ -- Mario Lang <mlang at debian.org>  Thu, 17 May 2007 20:41:18 +0200
 
 gnome-orca (2.18.1-3) unstable; urgency=low
 

Modified: desktop/unstable/gnome-orca/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/control?rev=11037&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/control (original)
+++ desktop/unstable/gnome-orca/debian/control Thu May 17 18:45:24 2007
@@ -12,11 +12,9 @@
                libbonobo2-dev (>= 2.18.0),
                libbrlapi1-dev (>= 3.7.2),
                libglib2.0-dev (>= 2.10.0),
-               libgnome-speech3-dev (>= 0.3.10),
                libxml-parser-perl,
                pkg-config,
                python-dev (>= 2.4),
-               python-at-spi,
                python-glade2,
                python-gnome2-dev,
                python-gtk2-dev,
@@ -33,8 +31,7 @@
          ${python:Depends},
          at-spi,
          libatspi1.0-0 (>= 1.18.0),
-         libgnome-speech3 (>= 0.3.10),
-         python-at-spi,
+         libgnome-speech7,
          python-pyorbit (>= 2.14.0),
          python-gtk2 (>= 2.10),
          python-glade2,

Modified: desktop/unstable/gnome-orca/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/control.in?rev=11037&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/control.in (original)
+++ desktop/unstable/gnome-orca/debian/control.in Thu May 17 18:45:24 2007
@@ -12,11 +12,9 @@
                libbonobo2-dev (>= 2.18.0),
                libbrlapi1-dev (>= 3.7.2),
                libglib2.0-dev (>= 2.10.0),
-               libgnome-speech3-dev (>= 0.3.10),
                libxml-parser-perl,
                pkg-config,
                python-dev (>= 2.4),
-               python-at-spi,
                python-glade2,
                python-gnome2-dev,
                python-gtk2-dev,
@@ -33,8 +31,7 @@
          ${python:Depends},
          at-spi,
          libatspi1.0-0 (>= 1.18.0),
-         libgnome-speech3 (>= 0.3.10),
-         python-at-spi,
+         libgnome-speech7,
          python-pyorbit (>= 2.14.0),
          python-gtk2 (>= 2.10),
          python-glade2,