r48800 - in /desktop/unstable/libpeas/debian: changelog control control.in

[laney at users.alioth.debian.org]

Author: laney
Date: Thu May 19 16:45:15 2016
New Revision: 48800

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48800
Log:
Deal with Ubuntu's different split, so libpeas can be synced

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

Modified: desktop/unstable/libpeas/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/changelog?rev=48800&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libpeas/debian/changelog	[utf-8] Thu May 19 16:45:15 2016
@@ -1,6 +1,8 @@
 libpeas (1.18.0-3) UNRELEASED; urgency=medium
 
   * Convert to multiarch. (Closes: #815727)
+  * Add some Conflicts/Replaces/Provides for the benefit of users
+    transitioning from Ubuntu's different loader split.
 
  -- Iain Lane <laney at debian.org>  Thu, 19 May 2016 12:35:21 +0100
 

Modified: desktop/unstable/libpeas/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/control?rev=48800&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/control	[utf-8] (original)
+++ desktop/unstable/libpeas/debian/control	[utf-8] Thu May 19 16:45:15 2016
@@ -35,6 +35,10 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpeas-common
+# Ubuntu had this; added here so libpeas can be synced
+Conflicts: libpeas-1.0-0-python3loader
+Replaces: libpeas-1.0-0-python3loader
+Provides: libpeas-1.0-0-python3loader
 Multi-Arch: same
 Description: Application plugin library
  libpeas is a library that allows applications to support plugins.
@@ -47,7 +51,10 @@
          libpeas-1.0-0 (= ${binary:Version}),
          libpeas-common
 Breaks: libpeas-1.0-0 (<< 1.8.0-2)
-Replaces: libpeas-1.0-0 (<< 1.8.0-2)
+# Ubuntu had libpeas-1.0-0-python2loader; added here so libpeas can be synced
+Conflicts: libpeas-1.0-0-python2loader
+Replaces: libpeas-1.0-0 (<< 1.8.0-2), libpeas-1.0-0-python2loader
+Provides: libpeas-1.0-0-python2loader
 Multi-Arch: same
 Description: Application plugin library (Python 2 support)
  libpeas is a library that allows applications to support plugins.

Modified: desktop/unstable/libpeas/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/control.in?rev=48800&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/control.in	[utf-8] (original)
+++ desktop/unstable/libpeas/debian/control.in	[utf-8] Thu May 19 16:45:15 2016
@@ -31,6 +31,10 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpeas-common
+# Ubuntu had this; added here so libpeas can be synced
+Conflicts: libpeas-1.0-0-python3loader
+Replaces: libpeas-1.0-0-python3loader
+Provides: libpeas-1.0-0-python3loader
 Multi-Arch: same
 Description: Application plugin library
  libpeas is a library that allows applications to support plugins.
@@ -43,7 +47,10 @@
          libpeas-1.0-0 (= ${binary:Version}),
          libpeas-common
 Breaks: libpeas-1.0-0 (<< 1.8.0-2)
-Replaces: libpeas-1.0-0 (<< 1.8.0-2)
+# Ubuntu had libpeas-1.0-0-python2loader; added here so libpeas can be synced
+Conflicts: libpeas-1.0-0-python2loader
+Replaces: libpeas-1.0-0 (<< 1.8.0-2), libpeas-1.0-0-python2loader
+Provides: libpeas-1.0-0-python2loader
 Multi-Arch: same
 Description: Application plugin library (Python 2 support)
  libpeas is a library that allows applications to support plugins.