[SCM] A Python IDE for scientists branch, master, updated. debian/2.0.11-1-25-g7ddd407

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

The following commit has been merged in the master branch:
commit 073078ab3ee836302d2ef662b6ebc632d4c1ffa1
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon Oct 31 17:24:28 2011 +0100

    use the .desktop file distributed with spyder

diff --git a/debian/changelog b/debian/changelog
index 7f9487e..503264f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ spyder (2.1.0-1) UNRELEASED; urgency=low
   * debian/patches
     - 0001-fix-documentation-installation.patch (updated)
            build the sphinx documentation only once.
+  * debian/spyder.desktop (deleted)
+    - provided by the upstream
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Mon, 31 Oct 2011 12:43:34 +0200
 
diff --git a/debian/spyder.desktop b/debian/spyder.desktop
deleted file mode 100644
index d35f15a..0000000
--- a/debian/spyder.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=spyder
-GenericName=spyder
-Comment=Python IDE for scientists
-TryExec=spyder
-Exec=spyder
-Categories=Education;Science;Physics;
diff --git a/debian/spyder.install b/debian/spyder.install
index f7aed70..668154e 100644
--- a/debian/spyder.install
+++ b/debian/spyder.install
@@ -1,2 +1,2 @@
 usr/bin
-debian/spyder.desktop /usr/share/applications
+scripts/spyder.desktop /usr/share/applications

-- 
A Python IDE for scientists