r47178 - in /packages/ipe/trunk/debian: changelog patches/default-editor.patch

[smr at users.alioth.debian.org]

Author: smr
Date: Sat Nov 21 16:16:03 2015
New Revision: 47178

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47178
Log:
Fix broken default-editor.patch.

Modified:
    packages/ipe/trunk/debian/changelog
    packages/ipe/trunk/debian/patches/default-editor.patch

Modified: packages/ipe/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/changelog?rev=47178&op=diff
==============================================================================
--- packages/ipe/trunk/debian/changelog	(original)
+++ packages/ipe/trunk/debian/changelog	Sat Nov 21 16:16:03 2015
@@ -4,8 +4,9 @@
   * control: adjust build-dependencies.  Now builds with Qt5.
   * patches/fPIC.patch: Remove.  Applied upstream.
   * patches/fix-moc.patch: New.  Temporary workaround for #805726.
-
- -- Steve M. Robbins <smr at debian.org>  Sat, 21 Nov 2015 07:51:36 -0600
+  * patches/default-editor.patch: Fix error in patch.  Closes: #728480.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 21 Nov 2015 10:15:22 -0600
 
 ipe (7.1.8-1) unstable; urgency=medium
 

Modified: packages/ipe/trunk/debian/patches/default-editor.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/patches/default-editor.patch?rev=47178&op=diff
==============================================================================
--- packages/ipe/trunk/debian/patches/default-editor.patch	(original)
+++ packages/ipe/trunk/debian/patches/default-editor.patch	Sat Nov 21 16:16:03 2015
@@ -5,14 +5,14 @@
 Fixed as described by Francesco Poli in Debian bug #728480.
 
 
---- ipe-7.1.8.orig/src/ipe/lua/prefs.lua
-+++ ipe-7.1.8/src/ipe/lua/prefs.lua
-@@ -68,7 +68,7 @@
- if config.platform == "win" then
-   prefs.editable_textfile = config.latexdir .. "/temp.txt"
+--- ipe-7.1.10.orig/src/ipe/lua/prefs.lua
++++ ipe-7.1.10/src/ipe/lua/prefs.lua
+@@ -59,7 +59,7 @@
  else
--  prefs.editable_textfile = nil
-+  prefs.editable_textfile = "x-terminal-emulator -e editor %s"
+   -- prefs.external_editor = "pluma %s"
+   -- prefs.external_editor = "emacsclient %s"
+-  prefs.external_editor = nil
++  prefs.external_editor = "x-terminal-emulator -e editor %s"
  end
  
- if config.platform == "apple" then
+ -- The name of the temporary textfile where Ipe will store text to be