r49023 - in /desktop/unstable/libpeas/debian: control control.in

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Sun Jun  5 00:37:28 2016
New Revision: 49023

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49023
Log:
add "Keep until May 2018" note to Ubuntu-specific C/R/P's

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

Modified: desktop/unstable/libpeas/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/control?rev=49023&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/control	[utf-8] (original)
+++ desktop/unstable/libpeas/debian/control	[utf-8] Sun Jun  5 00:37:28 2016
@@ -35,7 +35,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpeas-common
-# Ubuntu had this; added here so libpeas can be synced
+# Keep python3loader below until May 2018 so Ubuntu can stay in sync
 Conflicts: libpeas-1.0-0-python3loader
 Replaces: libpeas-1.0-0-python3loader
 Provides: libpeas-1.0-0-python3loader
@@ -51,7 +51,7 @@
          libpeas-1.0-0 (= ${binary:Version}),
          libpeas-common
 Breaks: libpeas-1.0-0 (<< 1.8.0-2)
-# Ubuntu had libpeas-1.0-0-python2loader; added here so libpeas can be synced
+# Keep python2loader below until May 2018 so Ubuntu can stay in sync
 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

Modified: desktop/unstable/libpeas/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/control.in?rev=49023&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/control.in	[utf-8] (original)
+++ desktop/unstable/libpeas/debian/control.in	[utf-8] Sun Jun  5 00:37:28 2016
@@ -31,7 +31,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpeas-common
-# Ubuntu had this; added here so libpeas can be synced
+# Keep python3loader below until May 2018 so Ubuntu can stay in sync
 Conflicts: libpeas-1.0-0-python3loader
 Replaces: libpeas-1.0-0-python3loader
 Provides: libpeas-1.0-0-python3loader
@@ -47,7 +47,7 @@
          libpeas-1.0-0 (= ${binary:Version}),
          libpeas-common
 Breaks: libpeas-1.0-0 (<< 1.8.0-2)
-# Ubuntu had libpeas-1.0-0-python2loader; added here so libpeas can be synced
+# Keep python2loader below until May 2018 so Ubuntu can stay in sync
 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