small things

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2287 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index cfce3e9cc75905bf30ae08f2665435296a89efa6..b73c5e0f1d212a684efe5e4cdff2943af14c3bc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-19  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * configure.in: remove extra action for AC_OUTPUT (not needed
+       anymore with gettext 0.10.38)
+
 2001-07-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * INSTALL: update various requirements

diff --git a/configure.in b/configure.in
index d9fe16d7ece0e2501ecdf26918c38201bace0487..f0843f7aa5241609b4f25eb5af7c4abfb3486660 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -313,7 +313,7 @@ AC_OUTPUT([Makefile \
        src/frontends/xforms/Makefile \
        src/frontends/qt2/Makefile \
        src/frontends/gnome/Makefile \
-],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+])
 
 
 cat <<EOF

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 79bbef4a9ee77bf774e525043f712a4b5d442d4a..920e9bcd827ef7f4c4a9db4c0da5f9626352b5d0 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -13,7 +13,7 @@
        * bind/cua.bind: 
        * ui/default.ui: use inset-toggle instead of open-stuff
 
-2001-07-12  Kayvan A. Sylvan  <kayvan@camel.internal.sylvan.com>
+2001-07-12  Kayvan A. Sylvan  <kayvan@sylvan.com>
 
        * layouts/literate-scrap.inc: Added PassThru tag
 

diff --git a/src/ChangeLog b/src/ChangeLog
index d47f2a8eb6283964df0fb4820eb5d68cbd6820a8..ea3292dbf107e092380b0939a71c081b6c5ae49b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -127,7 +127,7 @@
        * sp_form.[Ch]: removed
        * spellchecker.[Ch]: removed
 
-2001-07-12  Kayvan A. Sylvan  <kayvan@camel.internal.sylvan.com>
+2001-07-12  Kayvan A. Sylvan  <kayvan@sylvan.com>
 
        * paragraph_pimpl.C (simpleTeXBlanks): Simply return if pass_thru
        is set.
@@ -913,7 +913,7 @@
 
        * bufferlist.C (emergencyWrite): fix assert() call
 
-2001-05-04  Kayvan A. Sylvan  <kayvan@camel.internal.sylvan.com>
+2001-05-04  Kayvan A. Sylvan  <kayvan@sylvan.com>
 
        * text.C (InsertChar): Added trivial patch to only send the "you
        can not do multiple spaces this way" message once during a

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index c4714f044355ada16d7d0f17c650fe5f70159c02..9d1133d01cf367a3f43ecf91b9b88ce32bdf7b34 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-19  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * biblio.C (getInfo): add a .c_str() to handle the usual
+       stringstream pain.
+
 2001-07-19  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * ControlCitation.[Ch]: changes associated with adding natbib support.

diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index 91a4d57fd5f95c78ca05c720e4a593468f0c17fa..9b2096e0c9adfacab25dbc72fb38762d54a0a1da 100644 (file)
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -281,7 +281,7 @@ string const getInfo(InfoMap const & map, string const & key)
        if (result.str().empty()) // not a BibTeX record
                result << it->second;
 
-       return result.str();
+       return result.str().c_str();
 }