[SCM] A Python IDE for scientists branch, master, updated. debian/2.1.8-1-7-g5ed33fd

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 046511fbc6038cbb7630448980bd21da88a354bf
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Apr 1 11:15:14 2012 +0200

    debian/patches
      - 0002-feature-forwarded-add-icon-to-desktop-file.patch (new)
        (Closes: #665761)

diff --git a/debian/changelog b/debian/changelog
index d7407d7..88c88d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
 spyder (2.1.9-1) unstable; urgency=low
 
-  * Imported Upstream version 2.1.9
+  * Imported Upstream version 2.1.9 (Closes: #663235)
   * debian/copyright
     - Fix format with cme
   * debian/control
-    - Fix with cme
+    - Fix dependencies with cme
+  * debian/patches
+    - 0002-feature-forwarded-add-icon-to-desktop-file.patch (new)
+      (Closes: #665761)
 
- -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 01 Apr 2012 09:34:33 +0200
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 01 Apr 2012 11:11:03 +0200
 
 spyder (2.1.8-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index 21d124d..a668799 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-documentation-installation.patch
@@ -1,6 +1,5 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric-Emmanuel=20PICCA?=
- <picca at synchrotron-soleil.fr>
-Date: Thu, 3 Nov 2011 15:31:46 +0100
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sun, 1 Apr 2012 10:08:11 +0200
 Subject: fix-documentation-installation
 
 ---
@@ -24,7 +23,7 @@ index a74961f..b9892f6 100644
              setup_command.BuildDoc.run(self)
          except UnicodeDecodeError:
 diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
-index 3e72303..717bf75 100644
+index c8eb4e2..cad8046 100644
 --- a/spyderlib/__init__.py
 +++ b/spyderlib/__init__.py
 @@ -35,6 +35,7 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'
@@ -35,4 +34,3 @@ index 3e72303..717bf75 100644
  
  def add_to_distribution(dist):
      """Add package to py2exe/cx_Freeze distribution object
--- 
diff --git a/debian/patches/0002-feature-forwarded-add-icon-to-desktop-file.patch b/debian/patches/0002-feature-forwarded-add-icon-to-desktop-file.patch
new file mode 100644
index 0000000..302f61d
--- /dev/null
+++ b/debian/patches/0002-feature-forwarded-add-icon-to-desktop-file.patch
@@ -0,0 +1,20 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sun, 1 Apr 2012 10:10:21 +0200
+Subject: feature forwarded add icon to desktop file
+
+---
+ scripts/spyder.desktop |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/spyder.desktop b/scripts/spyder.desktop
+index 95ca6bd..c5be961 100644
+--- a/scripts/spyder.desktop
++++ b/scripts/spyder.desktop
+@@ -7,4 +7,5 @@ Comment=Scientific PYthon Development EnviRonment
+ TryExec=spyder
+ Exec=spyder
+ MimeType=application/x-foo;
+-Categories=Development;Science;IDE;Qt;
+\ No newline at end of file
++Categories=Development;Science;IDE;Qt;
++Icon=spyder
diff --git a/debian/patches/series b/debian/patches/series
index d88d3bc..7818dc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-fix-documentation-installation.patch
+0002-feature-forwarded-add-icon-to-desktop-file.patch
diff --git a/debian/python-spyderlib.links b/debian/python-spyderlib.links
new file mode 100644
index 0000000..e9b4252
--- /dev/null
+++ b/debian/python-spyderlib.links
@@ -0,0 +1 @@
+/usr/share/pyshared/spyderlib/images/spyder.svg /usr/share/icons/hicolor/scalable/apps/spyder.svg

-- 
A Python IDE for scientists