Merge lp:~marcelstimberg/ubuntu/oneiric/labyrinth/fix-for-872756 into lp:ubuntu/oneiric/labyrinth

[Marcel Stimberg]

Replaces the dependency on python-numeric (which is no longer in the archives) with python-numeric (that is actually only used in one line of code in utils.py...). Changing the dependency in debian/control makes the package installable.

This is the minimal fix for Oneiric, there will be a new upstream version (already including such a fix) hopefully soon that could be included in Precise.

[Brian Murray (brian-murray)]

The package version number you've used would be greater than the package version in precise - 0.4.1-0ubuntu5.1 would be more appropriate. Additionally, for this to be fixed in Oneiric it first needs to be fixed in Precise. I uploaded the same changes to Precise though.

review: Approve

[Brian Murray (brian-murray)]

Additionally the target for the changelog should be oneiric-proposed as the bug will need to go through the SRU process. Thanks again for your patch!

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-28 21:05:36 +0000
+++ debian/changelog	2011-12-07 22:32:25 +0000
@@ -1,3 +1,11 @@
+labyrinth (0.4.1-0ubuntu6) oneiric; urgency=low
+
+  * debian/control: Replace python-numeric with python-numpy dependency
+    fixes LP: #872756
+  * debian/patches/numeric_to_numpy.patch: Replace Numeric with numpy
+
+ -- Marcel Stimberg <[e-mail]>  Wed, 07 Dec 2011 22:17:46 +0100
+
 labyrinth (0.4.1-0ubuntu5) maverick; urgency=low
 
   * Depend on python-gnomedesktop | python-gnome2-desktop (>= 2.14).

=== modified file 'debian/control'
--- debian/control	2010-09-28 21:05:36 +0000
+++ debian/control	2011-12-07 22:32:25 +0000
@@ -11,7 +11,7 @@
 
 Package: labyrinth
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-glade2, python-gtk2 (>= 2.8), python-gobject (>= 2.10), python-gnome2 (>= 2.12), python-gnomedesktop | python-gnome2-desktop (>= 2.14), python-cairo (>= 1.0), python-numeric
+Depends: ${python:Depends}, ${misc:Depends}, python-glade2, python-gtk2 (>= 2.8), python-gobject (>= 2.10), python-gnome2 (>= 2.12), python-gnomedesktop | python-gnome2-desktop (>= 2.14), python-cairo (>= 1.0), python-numpy
 XB-Python-Version: ${python:Versions}
 Description: lightweight mind-mapping tool
  Labyrinth is a lightweight mind-mapping tool, written in Python using Gtk 

=== added file 'debian/patches/numeric_to_numpy.patch'
--- debian/patches/numeric_to_numpy.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/numeric_to_numpy.patch	2011-12-07 22:32:25 +0000
@@ -0,0 +1,15 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+diff -Nur -x '*.orig' -x '*~' labyrinth//src/utils.py labyrinth.new//src/utils.py
+--- labyrinth//src/utils.py	2011-12-07 22:15:48.759804000 +0100
++++ labyrinth.new//src/utils.py	2011-12-07 22:17:36.600923603 +0100
+@@ -26,7 +26,7 @@
+ import sys
+ from os.path import *
+ import os
+-from Numeric import *
++from numpy import array
+ import gtk
+ 
+ __BE_VERBOSE=os.environ.get('DEBUG_LABYRINTH',0)