[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Fixing pyatspi upgrades from squeeze



Le vendredi 09 novembre 2012 à 01:44 +0100, Samuel Thibault a écrit : 
> Josselin Mouette, le Thu 01 Nov 2012 16:34:17 +0100, a écrit :
> > B: 
> >      1. Remove python-pyatspi from the at-spi source package. 
> >      2. Rename python-pyatspi2 to python-pyatspi. 
> >      3. Make python-pyatspi2 an empty package depending on
> >         python-pyatspi.
> 
> I'd rather do this.

Attached is the proposed diff for pyatspi.

Ana is testing whether it is enough to fix #691160, in which case I’ll
upload.

-- 
 .''`.      Josselin Mouette
: :' :
`. `'
  `-
diff -Nru pyatspi-2.5.3+dfsg/debian/changelog pyatspi-2.5.3+dfsg/debian/changelog
--- pyatspi-2.5.3+dfsg/debian/changelog	2012-08-27 13:50:12.000000000 +0200
+++ pyatspi-2.5.3+dfsg/debian/changelog	2012-11-09 10:26:03.000000000 +0100
@@ -1,3 +1,14 @@
+pyatspi (2.5.3+dfsg-2.1) unstable; urgency=low
+
+  * Non-maintainer upload with Samuel’s approval.
+  * Ensure smooth upgrades from squeeze. Closes: #691160.
+    + Rename python*-pyatspi2 to python*-pyatspi since the API is 
+      compatible with the former python-pyatspi package and the module 
+      is named pyatspi.
+    + Create transitional python*-pyatspi2 packages.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 09 Nov 2012 10:01:50 +0100
+
 pyatspi (2.5.3+dfsg-2) unstable; urgency=low
 
   * Make pyatspi depend on libgail-common. Closes: #682915.
diff -Nru pyatspi-2.5.3+dfsg/debian/control pyatspi-2.5.3+dfsg/debian/control
--- pyatspi-2.5.3+dfsg/debian/control	2012-08-27 13:49:31.000000000 +0200
+++ pyatspi-2.5.3+dfsg/debian/control	2012-11-09 10:04:57.000000000 +0100
@@ -15,11 +15,10 @@
 X-Python-Version: >= 2.5
 Standards-Version: 3.9.3
 
-Package: python-pyatspi2
+Package: python-pyatspi
 Architecture: all
-Conflicts: python-pyatspi
-Replaces: python-pyatspi
-Provides: python-pyatspi
+Breaks: python-pytaspi2 (<< 2.5.3+dfsg-2.1)
+Replaces: python-pytaspi2 (<< 2.5.3+dfsg-2.1)
 Depends: ${misc:Depends},
          ${python:Depends},
          python-gi (>= 2.90.1),
@@ -30,8 +29,21 @@
  .
  This package contains Python bindings for the client side aspects of at-spi2.
 
-Package: python3-pyatspi2
+Package: python-pyatspi2
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends},
+         python-pyatspi (= ${source:Version})
+Description: Transitional package for assistive technology Python bindings
+ at-spi is the "Assistive Technology Service Provider Interface".
+ .
+ This empty transitional package can be safely removed.
+
+Package: python3-pyatspi
 Architecture: all
+Breaks: python3-pytaspi2 (<< 2.5.3+dfsg-2.1)
+Replaces: python3-pytaspi2 (<< 2.5.3+dfsg-2.1)
 Depends: ${misc:Depends},
          ${python3:Depends},
          python3-gi (>= 2.90.1),
@@ -41,3 +53,14 @@
  at-spi is the "Assistive Technology Service Provider Interface".
  .
  This package contains Python3 bindings for the client side aspects of at-spi2.
+
+Package: python3-pyatspi2
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends},
+         python3-pyatspi (= ${source:Version})
+Description: Transitional package for assistive technology Python3 bindings
+ at-spi is the "Assistive Technology Service Provider Interface".
+ .
+ This empty transitional package can be safely removed.
diff -Nru pyatspi-2.5.3+dfsg/debian/python3-pyatspi2.install pyatspi-2.5.3+dfsg/debian/python3-pyatspi2.install
--- pyatspi-2.5.3+dfsg/debian/python3-pyatspi2.install	2012-06-29 04:38:10.000000000 +0200
+++ pyatspi-2.5.3+dfsg/debian/python3-pyatspi2.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/python3
diff -Nru pyatspi-2.5.3+dfsg/debian/python3-pyatspi.install pyatspi-2.5.3+dfsg/debian/python3-pyatspi.install
--- pyatspi-2.5.3+dfsg/debian/python3-pyatspi.install	1970-01-01 01:00:00.000000000 +0100
+++ pyatspi-2.5.3+dfsg/debian/python3-pyatspi.install	2012-06-29 04:38:10.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/python3
diff -Nru pyatspi-2.5.3+dfsg/debian/python-pyatspi2.install pyatspi-2.5.3+dfsg/debian/python-pyatspi2.install
--- pyatspi-2.5.3+dfsg/debian/python-pyatspi2.install	2012-06-29 04:38:10.000000000 +0200
+++ pyatspi-2.5.3+dfsg/debian/python-pyatspi2.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/python2.7
diff -Nru pyatspi-2.5.3+dfsg/debian/python-pyatspi.install pyatspi-2.5.3+dfsg/debian/python-pyatspi.install
--- pyatspi-2.5.3+dfsg/debian/python-pyatspi.install	1970-01-01 01:00:00.000000000 +0100
+++ pyatspi-2.5.3+dfsg/debian/python-pyatspi.install	2012-06-29 04:38:10.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/python2.7

Reply to: