[SCM] wxMaxima packaging branch, master, updated. debian/0.8.2-1-8-g0cc11c2

[Frank S. Thomas]

The following commit has been merged in the master branch:
commit 0f7022295e8c1ae27e3872046462d2036e102066
Author: Frank S. Thomas <fst at debian.org>
Date:   Sat Aug 29 10:43:25 2009 +0200

    Refreshed patches.

diff --git a/debian/changelog b/debian/changelog
index 883ba0c..9ddc608 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ wxmaxima (0.8.3a-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/control:
     - Bumped Standards-Version from 3.8.2 to 3.8.3, no changes required.
+  * debian/patches/: wxmaxima.desktop was updated upstream according to the
+    latest freedesktop.org specs so reduced 201_fix_desktop_file.patch to the
+    Debian specific bits and renamed it to 002_adapt_desktop_file.patch.
 
  -- Frank S. Thomas <fst at debian.org>  Sat, 29 Aug 2009 09:52:40 +0200
 
diff --git a/debian/patches/001_renamed_client_to_server.patch b/debian/patches/001_renamed_client_to_server.patch
index f21fa06..ef4e7d6 100644
--- a/debian/patches/001_renamed_client_to_server.patch
+++ b/debian/patches/001_renamed_client_to_server.patch
@@ -7,7 +7,7 @@ Index: b/src/wxMaxima.cpp
 ===================================================================
 --- a/src/wxMaxima.cpp
 +++ b/src/wxMaxima.cpp
-@@ -557,7 +557,7 @@
+@@ -563,7 +563,7 @@
        {
          command = files[0];
          command.Append(wxString::Format(
@@ -16,7 +16,7 @@ Index: b/src/wxMaxima.cpp
                           m_port
                         ));
        }
-@@ -566,7 +566,7 @@
+@@ -572,7 +572,7 @@
        command.Append(wxString::Format(wxT(" -s %d"), m_port));
      wxSetEnv(wxT("home"), wxGetHomeDir());
  #else
diff --git a/debian/patches/201_fix_desktop_file.patch b/debian/patches/002_adapt_desktop_file.patch
similarity index 75%
rename from debian/patches/201_fix_desktop_file.patch
rename to debian/patches/002_adapt_desktop_file.patch
index 4e1d4f0..d5a4703 100644
--- a/debian/patches/201_fix_desktop_file.patch
+++ b/debian/patches/002_adapt_desktop_file.patch
@@ -7,16 +7,12 @@ Index: b/wxmaxima.desktop
 ===================================================================
 --- a/wxmaxima.desktop
 +++ b/wxmaxima.desktop
-@@ -2,8 +2,7 @@
+@@ -2,7 +2,7 @@
  Name=wxMaxima
  Comment=Perform symbolic and numeric calculations using Maxima
  Exec=wxmaxima
 -Icon=wxmaxima.png
--Terminal=0
 +Icon=/usr/share/wxMaxima/wxmaxima.png
-+Terminal=false
+ Terminal=false
  Type=Application
--Encoding=UTF-8
--Categories=Application;Utility;X-Red-Hat-Base;X-Red-Hat-Base-Only;
-\ No newline at end of file
-+Categories=Education;Science;Math;
+ Categories=Education;Science;Math;X-Red-Hat-Base;X-Red-Hat-Base-Only;

-- 
wxMaxima packaging