r25118 - in /desktop/unstable/gnome-python-desktop/debian: changelog control control.in
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Sep 13 09:46:30 UTC 2010
Author: joss
Date: Mon Sep 13 09:46:21 2010
New Revision: 25118
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25118
Log:
Use Replaces instead of Conflicts to ease APT finding the correct
upgrade path.
Modified:
desktop/unstable/gnome-python-desktop/debian/changelog
desktop/unstable/gnome-python-desktop/debian/control
desktop/unstable/gnome-python-desktop/debian/control.in
Modified: desktop/unstable/gnome-python-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/changelog?rev=25118&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/changelog [utf-8] Mon Sep 13 09:46:21 2010
@@ -1,9 +1,14 @@
gnome-python-desktop (2.30.0-2) UNRELEASED; urgency=low
+ [ Emilio Pozuelo Monfort ]
* debian/control.in:
- Build depend on libgnome-media-dev on Hurd now that it's built there.
Thus build the python-mediaprofiles package.
- Build depend on bug-buddy on Hurd too since it's built there now.
+
+ [ Josselin Mouette ]
+ * Use Replaces instead of Conflicts to ease APT finding the correct
+ upgrade path.
-- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 16 May 2010 22:48:59 +0200
Modified: desktop/unstable/gnome-python-desktop/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/control?rev=25118&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/control [utf-8] Mon Sep 13 09:46:21 2010
@@ -59,7 +59,6 @@
python-gnome2-dev,
python-gtk2-dev
Replaces: python-gnome2-dev (<< 2.9.0)
-Conflicts: python-gnome2-dev (<< 2.9.0)
Description: Python bindings for the GNOME desktop environment
This archive contains files that allow you to build wrappers for addons
that interoperate gnome-python.
@@ -82,7 +81,7 @@
${python:Depends},
python-gtk2
Suggests: bug-buddy
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python module for bug-buddy
This package contains a module that will allow programs using it to
report bugs using the bug-buddy reporting tool, if it is installed.
@@ -104,7 +103,7 @@
${python:Depends},
python-gtk2
Suggests: evolution-data-server
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the evolution libraries
This package contains modules that allows to talk with the evolution
data server to manipulate the address book and calendar in Python.
@@ -117,7 +116,7 @@
python-pyorbit,
python-gtk2
Suggests: gnome-panel
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the GNOME panel applet library
This package contains a module that allows to write applets for the
GNOME panel in Python.
@@ -128,7 +127,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the GNOME desktop library
This package contains a module that allows to write applications using
the GNOME desktop library in Python.
@@ -140,7 +139,7 @@
${python:Depends},
python-gtk2
Suggests: gnome-keyring
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the GNOME keyring library
This package contains a module that allows to access and manipulate
the GNOME keyring framework in Python.
@@ -151,7 +150,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the Gtop library
This package contains a module that allows to use the Gtop system
information library in Python applications.
@@ -162,7 +161,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the GNOME media profiles library
This package contains a module that allows to use the GNOME media
profiles widgets in Python applications.
@@ -174,7 +173,7 @@
${python:Depends},
python-gtk2
Suggests: metacity
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for metacity
This package contains a module that allows to manipulate the internals
of the Metacity window manager in Python applications.
@@ -186,7 +185,7 @@
${python:Depends},
librsvg2-common,
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the RSVG library
This package contains a module that allows to use librsvg to read and
write SVG files from Python applications.
@@ -197,7 +196,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the Totem playlist parser library
This package contains a module that allows to use the Totem playlist
parser library from Python applications.
@@ -208,7 +207,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the WNCK library
This package contains a module that allows to communicate with the
Window Manager using the EWMH specification from Python applications.
Modified: desktop/unstable/gnome-python-desktop/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/control.in?rev=25118&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/control.in [utf-8] Mon Sep 13 09:46:21 2010
@@ -54,7 +54,6 @@
python-gnome2-dev,
python-gtk2-dev
Replaces: python-gnome2-dev (<< 2.9.0)
-Conflicts: python-gnome2-dev (<< 2.9.0)
Description: Python bindings for the GNOME desktop environment
This archive contains files that allow you to build wrappers for addons
that interoperate gnome-python.
@@ -77,7 +76,7 @@
${python:Depends},
python-gtk2
Suggests: bug-buddy
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python module for bug-buddy
This package contains a module that will allow programs using it to
report bugs using the bug-buddy reporting tool, if it is installed.
@@ -99,7 +98,7 @@
${python:Depends},
python-gtk2
Suggests: evolution-data-server
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the evolution libraries
This package contains modules that allows to talk with the evolution
data server to manipulate the address book and calendar in Python.
@@ -112,7 +111,7 @@
python-pyorbit,
python-gtk2
Suggests: gnome-panel
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the GNOME panel applet library
This package contains a module that allows to write applets for the
GNOME panel in Python.
@@ -123,7 +122,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the GNOME desktop library
This package contains a module that allows to write applications using
the GNOME desktop library in Python.
@@ -135,7 +134,7 @@
${python:Depends},
python-gtk2
Suggests: gnome-keyring
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the GNOME keyring library
This package contains a module that allows to access and manipulate
the GNOME keyring framework in Python.
@@ -146,7 +145,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the Gtop library
This package contains a module that allows to use the Gtop system
information library in Python applications.
@@ -157,7 +156,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the GNOME media profiles library
This package contains a module that allows to use the GNOME media
profiles widgets in Python applications.
@@ -169,7 +168,7 @@
${python:Depends},
python-gtk2
Suggests: metacity
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for metacity
This package contains a module that allows to manipulate the internals
of the Metacity window manager in Python applications.
@@ -181,7 +180,7 @@
${python:Depends},
librsvg2-common,
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the RSVG library
This package contains a module that allows to use librsvg to read and
write SVG files from Python applications.
@@ -192,7 +191,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the Totem playlist parser library
This package contains a module that allows to use the Totem playlist
parser library from Python applications.
@@ -203,7 +202,7 @@
${shlibs:Depends},
${python:Depends},
python-gtk2
-Conflicts: python-gnome2-desktop (<< 2.24.0-2)
+Replaces: python-gnome2-desktop (<< 2.24.0-2)
Description: Python bindings for the WNCK library
This package contains a module that allows to communicate with the
Window Manager using the EWMH specification from Python applications.
More information about the pkg-gnome-commits
mailing list