diff -Nru ipe-7.1.4/debian/changelog ipe-7.1.4/debian/changelog --- ipe-7.1.4/debian/changelog 2013-11-05 05:12:50.000000000 +0000 +++ ipe-7.1.4/debian/changelog 2013-12-01 04:46:41.000000000 +0000 @@ -1,3 +1,12 @@ +ipe (7.1.4-2) unstable; urgency=low + + * copyright: Updated with patch from Felix Geyer. Closes: #729740. + * patches/default-editor.patch: New. Change hardcoded default editor + (when EDITOR not defined) to "xterminal-emulator -e editor", as + suggested by Francesco Poli. Closes: #728480. + + -- Steve M. Robbins Sat, 30 Nov 2013 22:28:30 -0600 + ipe (7.1.4-1) unstable; urgency=low * New upstream. Closes: #703269. diff -Nru ipe-7.1.4/debian/copyright ipe-7.1.4/debian/copyright --- ipe-7.1.4/debian/copyright 2008-11-07 10:14:17.000000000 +0000 +++ ipe-7.1.4/debian/copyright 2013-12-01 04:27:14.000000000 +0000 @@ -4,33 +4,39 @@ It was downloaded from: http://ipe.compgeom.org/ Current site: http://tclab.kaist.ac.kr/ipe/ -Copyright (C) 1993-2007 Otfried Cheong +Copyright (C) 1993-2013 Otfried Cheong +Copyright (C) 2003 Kepler Project -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -As a special exception, you have permission to link Ipe with the CGAL -library and distribute executables, as long as you follow the -requirements of the Gnu General Public License in regard to all of the -software in the executable aside from CGAL. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. +Ipe is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +As a special exception, you have permission to link Ipe with the +CGAL library and distribute executables, as long as you follow the +requirements of the Gnu General Public License in regard to all of +the software in the executable aside from CGAL. + +Ipe is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +License for more details. -Version 2 of the GPL may be found in /usr/share/common-licenses/GPL-2 +Version 3 of the GPL may be found in /usr/share/common-licenses/GPL-3 -------------------------------------------------------------------- Ipe uses the Zlib library by Jean-loup Gailly and Mark Adler (www.gzip.org/zlib), the Freetype~2 library by David Turner, Robert Wilhelm, and Werner Lemberg (www.freetype.org), as well as some code -from Xpdf by Derek B. Noonburg (www.foolabs.com/xpdf). +from Xpdf by Derek B. Noonburg (www.foolabs.com/xpdf) and pdfTeX by +Han The Thanh . -------------------------------------------------------------------- -Xpdf is icensed under the GNU General Public License (GPL), version 2. +Xpdf is icensed under the GNU General Public License (GPL), version 2 and 3. +-------------------------------------------------------------------- + +pdfTeX is licensed under the GNU General Public License (GPL) either version 2 +of the License, or (at your option) any later version. diff -Nru ipe-7.1.4/debian/patches/default-editor.patch ipe-7.1.4/debian/patches/default-editor.patch --- ipe-7.1.4/debian/patches/default-editor.patch 1970-01-01 00:00:00.000000000 +0000 +++ ipe-7.1.4/debian/patches/default-editor.patch 2013-12-01 04:44:57.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Change default editor from 'gedit' to '/usr/bin/editor' +Author: Steve Robbins +Forwarded: not-needed + +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" + else + prefs.external_editor = nil diff -Nru ipe-7.1.4/debian/patches/series ipe-7.1.4/debian/patches/series --- ipe-7.1.4/debian/patches/series 2011-12-10 22:27:58.000000000 +0000 +++ ipe-7.1.4/debian/patches/series 2013-12-01 04:39:03.000000000 +0000 @@ -1,2 +1,3 @@ +default-editor.patch build-nostrip.patch fPIC.patch