[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.1-560-ge170f8e

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 5f6e839ce2e1fd80d31d9f9c436569715df03a6a
Author: Sven Hoexter <sven at timegate.de>
Date:   Mon Sep 5 20:10:06 2011 +0200

    * New upstream release.
      + Remove debian/patches/path_max_hurd - included upstream.

diff --git a/debian/changelog b/debian/changelog
index 4857964..5821593 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 lyx (2.0.1-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    + Remove debian/patches/path_max_hurd - included upstream.
   * Update Vcs-* to the new anonscm.d.o structure.
   * Add texlive-xetex, etoolbox to the suggests lists and description of
     the lyx binary package. (Closes: #629153)
diff --git a/debian/patches/path_max_hurd b/debian/patches/path_max_hurd
deleted file mode 100644
index 7438cd5..0000000
--- a/debian/patches/path_max_hurd
+++ /dev/null
@@ -1,46 +0,0 @@
-Try to fix another PATH_MAX issue with LyX on GNU/Hurd.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623164
-Patch provided by Pino Toscano <toscano.pino at tiscali.it>.
---- a/src/support/filetools.cpp
-+++ b/src/support/filetools.cpp
-@@ -49,6 +49,7 @@
- #include <utility>
- #include <fstream>
- #include <sstream>
-+#include <vector>
- 
- #if defined (_WIN32)
- #include <io.h>
-@@ -759,13 +760,31 @@ docstring const makeDisplayPath(string c
- #ifdef HAVE_READLINK
- bool readLink(FileName const & file, FileName & link)
- {
--	char linkbuffer[PATH_MAX + 1];
- 	string const encoded = file.toFilesystemEncoding();
-+#ifdef HAVE_DEF_PATH_MAX
-+	char linkbuffer[PATH_MAX + 1];
- 	int const nRead = ::readlink(encoded.c_str(),
- 				     linkbuffer, sizeof(linkbuffer) - 1);
- 	if (nRead <= 0)
- 		return false;
- 	linkbuffer[nRead] = '\0'; // terminator
-+#else
-+	vector<char> buf(1024);
-+	int nRead = -1;
-+
-+	while (true) {
-+		nRead = ::readlink(encoded.c_str(), &buf[0], buf.size() - 1);
-+		if (nRead < 0) {
-+			return false;
-+		}
-+		if (nRead < buf.size() - 1) {
-+			break;
-+		}
-+		buf.resize(buf.size() * 2);
-+	}
-+	buf[nRead] = '\0'; // terminator
-+	const char * linkbuffer = &buf[0];
-+#endif
- 	link = makeAbsPath(linkbuffer, onlyPath(file.absFileName()));
- 	return true;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 5d653a4..3e16998 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 prefer-xdg-open
-path_max_hurd

-- 
LyX packaging