[SCM] wxMaxima packaging branch, master, updated. debian/0.8.3a-2-7-g08f105c

[Frank S. Thomas]

The following commit has been merged in the master branch:
commit 69955f740a2e7e3972407f387ce437fec5dc7321
Author: Frank S. Thomas <fst at debian.org>
Date:   Wed Dec 16 12:06:12 2009 +0100

    Removed patch 001 which was required for Maxima (<< 5.18).
    
    Removed debian/patches/001_renamed_client_to_server.patch which was
    required for Maxima (<< 5.18). Now that a newer Maxima version is in
    unstable, this patch has been dropped and the Maxima dependency has
    been bumped to (>= 5.18). (closes: #561326)

diff --git a/debian/changelog b/debian/changelog
index f698a1f..2d41d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-wxmaxima (0.8.4) UNRELEASED; urgency=low
+wxmaxima (0.8.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Switched to source format "3.0 (quilt)".
+  * Removed debian/patches/001_renamed_client_to_server.patch which was
+    required for Maxima (<< 5.18). Now that a newer Maxima version is in
+    unstable, this patch has been dropped and the Maxima dependency has
+    been bumped to (>= 5.18). (closes: #561326)
 
  -- Frank S. Thomas <fst at debian.org>  Mon, 14 Dec 2009 16:49:22 +0100
 
diff --git a/debian/control b/debian/control
index b5910a3..d0f364e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Homepage: http://wxmaxima.sourceforge.net/
 
 Package: wxmaxima
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, maxima (>= 5.10.0),
+Depends: ${shlibs:Depends}, ${misc:Depends}, maxima (>= 5.18),
  maxima-doc (>= 5.10.0)
 Recommends: ttf-jsmath
 Description: GUI for the computer algebra system Maxima
diff --git a/debian/patches/001_renamed_client_to_server.patch b/debian/patches/001_renamed_client_to_server.patch
deleted file mode 100644
index ef4e7d6..0000000
--- a/debian/patches/001_renamed_client_to_server.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Andrej Vodopivec <andrejv at users.sourceforge.net>
-Description: Renamed "client" to "server" so that wxMaxima works with
- Maxima (<< 5.18). This is required because the current Maxima version
- in Debian is 5.17.1.
-Upstream-Changeset: http://wxmaxima.svn.sourceforge.net/viewvc/wxmaxima?view=rev&revision=835 
-Index: b/src/wxMaxima.cpp
-===================================================================
---- a/src/wxMaxima.cpp
-+++ b/src/wxMaxima.cpp
-@@ -563,7 +563,7 @@
-       {
-         command = files[0];
-         command.Append(wxString::Format(
--                         wxT(" -eval \"(maxima::start-client %d)\" -eval \"(run)\" -f"),
-+                         wxT(" -eval \"(maxima::start-server %d)\" -eval \"(run)\" -f"),
-                          m_port
-                        ));
-       }
-@@ -572,7 +572,7 @@
-       command.Append(wxString::Format(wxT(" -s %d"), m_port));
-     wxSetEnv(wxT("home"), wxGetHomeDir());
- #else
--    command.Append(wxString::Format(wxT(" -r \":lisp (setup-client %d)\""),
-+    command.Append(wxString::Format(wxT(" -r \":lisp (setup-server %d)\""),
-                                     m_port));
- #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index fdf6f99..2e99fc8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-001_renamed_client_to_server.patch
 002_adapt_desktop_file.patch

-- 
wxMaxima packaging