[SCM] wxMaxima packaging branch, master, updated. debian/0.8.1-1-6-gf8fa3d0

[Frank S. Thomas]

The following commit has been merged in the master branch:
commit 8092e589ad04c88de4db528793ee85aa2f00aadb
Author: Frank S. Thomas <fst at debian.org>
Date:   Sun Jun 28 13:59:53 2009 +0200

    Added patch for Maxima << 5.18.
    
    * New upstream release.
    * debian/patches/: Added 001_renamed_client_to_server.patch so that wxMaxima
      works with Maxima (<< 5.18).

diff --git a/debian/changelog b/debian/changelog
index 774543d..37d9602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-wxmaxima (0.8.1-2) UNRELEASED; urgency=low
+wxmaxima (0.8.2-1) unstable; urgency=low
 
-  * debian/rules:
-    - Set configure's --build and --host options properly according to the
-      autotools-dev documentation.
+  * New upstream release.
+  * debian/rules: Set configure's --build and --host options properly according
+    to the autotools-dev documentation.
+  * debian/patches/: Added 001_renamed_client_to_server.patch so that wxMaxima
+    works with Maxima (<< 5.18).
 
- -- Frank S. Thomas <fst at debian.org>  Sun, 28 Jun 2009 11:51:28 +0200
+ -- Frank S. Thomas <fst at debian.org>  Sun, 28 Jun 2009 13:58:42 +0200
 
 wxmaxima (0.8.1-1) unstable; urgency=low
 
diff --git a/debian/patches/001_renamed_client_to_server.patch b/debian/patches/001_renamed_client_to_server.patch
new file mode 100644
index 0000000..f21fa06
--- /dev/null
+++ b/debian/patches/001_renamed_client_to_server.patch
@@ -0,0 +1,27 @@
+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
+@@ -557,7 +557,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
+                        ));
+       }
+@@ -566,7 +566,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/README.patches b/debian/patches/README.patches
new file mode 100644
index 0000000..b06bbf3
--- /dev/null
+++ b/debian/patches/README.patches
@@ -0,0 +1,9 @@
+0xx patches are Debian-specific build patches, that have not and will not be
+proposed upstream; they don't need to be.
+
+If there are any:
+
+1xx patches have been proposed upstream and accepted; these can safely be
+deleted when updating to a new release.
+
+2xx patches are awaiting the approval of upstream.
diff --git a/debian/patches/series b/debian/patches/series
index a114ba3..b264471 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+001_renamed_client_to_server.patch
 201_fix_desktop_file.patch

-- 
wxMaxima packaging