r21918 - in /desktop/unstable/pyorbit/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Oct 12 07:53:23 2009
New Revision: 21918

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21918
Log:
Conflict against python-omniorb-omg. Closes: #550629.

Modified:
    desktop/unstable/pyorbit/debian/changelog
    desktop/unstable/pyorbit/debian/control
    desktop/unstable/pyorbit/debian/control.in

Modified: desktop/unstable/pyorbit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/changelog?rev=21918&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/changelog [utf-8] (original)
+++ desktop/unstable/pyorbit/debian/changelog [utf-8] Mon Oct 12 07:53:23 2009
@@ -1,3 +1,9 @@
+pyorbit (2.24.0-3) UNRELEASED; urgency=low
+
+  * Conflict against python-omniorb-omg. Closes: #550629.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 12 Oct 2009 09:53:01 +0200
+
 pyorbit (2.24.0-2) unstable; urgency=low
 
   * Rebuild with fixed python-support to get rid of an unsatisfiable

Modified: desktop/unstable/pyorbit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/control?rev=21918&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/control [utf-8] (original)
+++ desktop/unstable/pyorbit/debian/control [utf-8] Mon Oct 12 07:53:23 2009
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Luca Falavigna <dktrkranz at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
 Build-Depends: debhelper (>= 5.0.37.2),
                python-support (>= 1.0.4),
                gnome-pkg-tools (>= 0.10),
@@ -66,7 +66,8 @@
            python2.4-omniorb2-omg,
            python-omniorb2-omg,
            python2.3-pyorbit-omg,
-           python2.4-pyorbit-omg
+           python2.4-pyorbit-omg,
+           python-omniorb-omg
 Replaces: python2.3-omniorb2-omg,
           python2.4-omniorb2-omg,
           python-omniorb2-omg,

Modified: desktop/unstable/pyorbit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/control.in?rev=21918&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/control.in [utf-8] (original)
+++ desktop/unstable/pyorbit/debian/control.in [utf-8] Mon Oct 12 07:53:23 2009
@@ -66,7 +66,8 @@
            python2.4-omniorb2-omg,
            python-omniorb2-omg,
            python2.3-pyorbit-omg,
-           python2.4-pyorbit-omg
+           python2.4-pyorbit-omg,
+           python-omniorb-omg
 Replaces: python2.3-omniorb2-omg,
           python2.4-omniorb2-omg,
           python-omniorb2-omg,