r47127 - in /packages/ipe/trunk/debian: changelog patches/build-nostrip.patch patches/default-editor.patch patches/fPIC.patch

[smr at users.alioth.debian.org]

Author: smr
Date: Sun Sep 13 14:44:02 2015
New Revision: 47127

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47127
Log:
Refresh patches for Ipe 7.1.8

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

Modified: packages/ipe/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/changelog?rev=47127&op=diff
==============================================================================
--- packages/ipe/trunk/debian/changelog	(original)
+++ packages/ipe/trunk/debian/changelog	Sun Sep 13 14:44:02 2015
@@ -1,3 +1,9 @@
+ipe (7.1.8-1) unstable; urgency=medium
+
+  * New upstream.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 13 Sep 2015 09:27:23 -0500
+
 ipe (7.1.4-2) unstable; urgency=low
 
   * copyright: Updated with patch from Felix Geyer.  Closes: #729740.

Modified: packages/ipe/trunk/debian/patches/build-nostrip.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/patches/build-nostrip.patch?rev=47127&op=diff
==============================================================================
--- packages/ipe/trunk/debian/patches/build-nostrip.patch	(original)
+++ packages/ipe/trunk/debian/patches/build-nostrip.patch	Sun Sep 13 14:44:02 2015
@@ -1,11 +1,11 @@
---- ipe-7.0.10.orig/src/common.mak
-+++ ipe-7.0.10/src/common.mak
-@@ -121,7 +121,7 @@
- # stripping is faulty on Mac?
- INSTALL_PROGRAMS = install -m 0755
- else
--INSTALL_PROGRAMS = install -s -m 0755
-+INSTALL_PROGRAMS = install -m 0755
- endif
- 
- MAKE_BINDIR = mkdir -p $(BUILDDIR)/bin
+--- ipe-7.1.8.orig/src/common.mak
++++ ipe-7.1.8/src/common.mak
+@@ -174,7 +174,7 @@
+ # stripping is faulty on Mac?
+ INSTALL_PROGRAMS = install -m 0755
+ else
+-INSTALL_PROGRAMS = install -s -m 0755
++INSTALL_PROGRAMS = install -m 0755
+ endif
+ 
+ MAKE_BINDIR = mkdir -p $(BUILDDIR)/bin

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=47127&op=diff
==============================================================================
--- packages/ipe/trunk/debian/patches/default-editor.patch	(original)
+++ packages/ipe/trunk/debian/patches/default-editor.patch	Sun Sep 13 14:44:02 2015
@@ -5,14 +5,14 @@
 Fixed as described by Francesco Poli in Debian bug #728480.
 
 
---- ipe-7.1.4.orig/src/ipe/lua/prefs.lua
-+++ ipe-7.1.4/src/ipe/lua/prefs.lua
-@@ -59,7 +59,7 @@
- if os.getenv("EDITOR") then
-   prefs.external_editor = os.getenv("EDITOR") .. " %s"
- elseif config.platform == "unix" then
--  prefs.external_editor = "gedit %s"
-+  prefs.external_editor = "x-terminal-emulator -e editor %s"
-   -- prefs.external_editor = "emacsclient %s"
+--- 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"
  else
-   prefs.external_editor = nil
+-  prefs.editable_textfile = nil
++  prefs.editable_textfile = "x-terminal-emulator -e editor %s"
+ end
+ 
+ if config.platform == "apple" then

Modified: packages/ipe/trunk/debian/patches/fPIC.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/patches/fPIC.patch?rev=47127&op=diff
==============================================================================
--- packages/ipe/trunk/debian/patches/fPIC.patch	(original)
+++ packages/ipe/trunk/debian/patches/fPIC.patch	Sun Sep 13 14:44:02 2015
@@ -8,9 +8,9 @@
 Forwarded: no
 
 
---- ipe-7.1.1.orig/src/config.mak
-+++ ipe-7.1.1/src/config.mak
-@@ -101,7 +101,7 @@
+--- ipe-7.1.8.orig/src/config.mak
++++ ipe-7.1.8/src/config.mak
+@@ -106,7 +106,7 @@
  # position independent code
  # (it doesn't hurt much on 32bit Linux, although you could comment it
  # out for slightly faster code)