diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 36968e5dbc..0d817aca5f 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -47,6 +47,10 @@ November 6th, 2015 + + [fernando] - Update to QScintilla-gpl-2.9.1. Fixes + #7091. + [fernando] - Update to firefox-42.0. Fixes #7085. diff --git a/lxqt/apps/qscintilla.xml b/lxqt/apps/qscintilla.xml index 3c7a329864..229b682fe1 100644 --- a/lxqt/apps/qscintilla.xml +++ b/lxqt/apps/qscintilla.xml @@ -6,9 +6,9 @@ - + - + ]> @@ -160,9 +160,9 @@ make class="username">root user: -install -v -m755 -d $QT5DIR/share/doc/QScintilla-&qscintilla-version; && +install -v -m755 -d $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html && install -v -m644 ../doc/html-Qt4Qt5/* \ - $QT5DIR/share/doc/QScintilla-&qscintilla-version; + $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html if building with Qt5. For @@ -188,9 +188,9 @@ install -v -m644 ../doc/html-Qt4Qt5/* \ $QT5DIR/lib/libqt5scintilla2.so or $QT4DIR/lib/libqtscintilla2.so - $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;} + $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html or - $QT4DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;} + $QT4DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html diff --git a/packages.ent b/packages.ent index 2558007dda..89fee6ded4 100644 --- a/packages.ent +++ b/packages.ent @@ -623,7 +623,7 @@ - +