[SCM] A Python IDE for scientists branch, master, updated. debian/2.2.0_beta2+dfsg-1-6-g228092e

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

The following commit has been merged in the master branch:
commit ba6a44e4cf526772e54be6f4306d7cf217f7605a
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Feb 27 10:59:06 2013 +0100

    remove upstream applyed patched

diff --git a/debian/changelog b/debian/changelog
index 776e159..16c4b58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 spyder (2.2.0~beta3+dfsg-1) experimental; urgency=low
 
   * Imported Upstream version 2.2.0~beta3+dfsg
+  * debian /patches
+    - 0002-feature-forwarded-add-icon-to-desktop-file.patch (deleted)
+      this patch was integrated by the upstream.
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Wed, 27 Feb 2013 09:51:28 +0100
 
diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index 262210b..977092f 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-documentation-installation.patch
@@ -8,10 +8,10 @@ Subject: fix-documentation-installation
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 6d71506..e5fd17e 100644
+index e823e5e..4d6022d 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -52,8 +52,8 @@ class MyBuildDoc(setup_command.BuildDoc):
+@@ -54,8 +54,8 @@ class MyBuildDoc(setup_command.BuildDoc):
      def run(self):
          build = self.get_finalized_command('build')
          sys.path.insert(0, os.path.abspath(build.build_lib))
@@ -23,7 +23,7 @@ index 6d71506..e5fd17e 100644
              setup_command.BuildDoc.run(self)
          except UnicodeDecodeError:
 diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
-index 9d7fb89..0e66377 100644
+index 2d342c2..814af8d 100644
 --- a/spyderlib/__init__.py
 +++ b/spyderlib/__init__.py
 @@ -35,6 +35,8 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'
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
deleted file mode 100644
index 302f61d..0000000
--- a/debian/patches/0002-feature-forwarded-add-icon-to-desktop-file.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 7818dc4..d88d3bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-fix-documentation-installation.patch
-0002-feature-forwarded-add-icon-to-desktop-file.patch

-- 
A Python IDE for scientists