r24238 by craig - Bump versions to 1.5.6.1, about date, fix hunspell plugin linker issue

scribus-commit scribus-commit at lists.scribus.net
Sat Nov 14 00:07:19 UTC 2020


Author: craig
Date: Sat Nov 14 00:07:19 2020
New Revision: 24238

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24238
Log:
Bump versions to 1.5.6.1, about date, fix hunspell plugin linker issue

Modified:
    branches/Version156/Scribus/CMakeLists.txt
    branches/Version156/Scribus/ChangeLog
    branches/Version156/Scribus/OSX-package/inputs/Info.plist
    branches/Version156/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
    branches/Version156/Scribus/Scribus.app/Contents/Info.plist
    branches/Version156/Scribus/config.h.cmake
    branches/Version156/Scribus/resources/versions/scribusversions.xml
    branches/Version156/Scribus/scribus.lsm
    branches/Version156/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
    branches/Version156/Scribus/scribus/ui/about.cpp

Modified: branches/Version156/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version156/Scribus/CMakeLists.txt	(original)
+++ branches/Version156/Scribus/CMakeLists.txt	Sat Nov 14 00:07:19 2020
@@ -69,7 +69,7 @@
 set (VERSION_MAJOR "1")
 set (VERSION_MINOR "5")
 set (VERSION_PATCH "6")
-set (VERSION_SUFFIX "")
+set (VERSION_SUFFIX "1")
 set (VERSION ${VERSION_MAJOR})
 if (VERSION_MINOR GREATER -1)
 	set (VERSION ${VERSION}.${VERSION_MINOR})

Modified: branches/Version156/Scribus/ChangeLog
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/ChangeLog
==============================================================================
--- branches/Version156/Scribus/ChangeLog	(original)
+++ branches/Version156/Scribus/ChangeLog	Sat Nov 14 00:07:19 2020
@@ -1,3 +1,7 @@
+Scribus - 1.5.6.1 (Released 2020-11-14)
+=========================================
+0016327: [Build System] libhunspellplugin.so fails to load
+
 Scribus - 1.5.6 (Released 2020-11-07)
 =========================================
 0016212: [Scripter] Fix docstrings for the scripter's pdfexport and print (ale)

Modified: branches/Version156/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- branches/Version156/Scribus/OSX-package/inputs/Info.plist	(original)
+++ branches/Version156/Scribus/OSX-package/inputs/Info.plist	Sat Nov 14 00:07:19 2020
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus Installer 1.5.6</string>
+	<string>Scribus Installer 1.5.6.1</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus.osxinstaller</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.6</string>
+	<string>1.5.6.1</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: branches/Version156/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
==============================================================================
--- branches/Version156/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	(original)
+++ branches/Version156/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	Sat Nov 14 00:07:19 2020
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus 1.5.6</string>
+	<string>Scribus 1.5.6.1</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.6</string>
+	<string>1.5.6.1</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: branches/Version156/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- branches/Version156/Scribus/Scribus.app/Contents/Info.plist	(original)
+++ branches/Version156/Scribus/Scribus.app/Contents/Info.plist	Sat Nov 14 00:07:19 2020
@@ -67,7 +67,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.6</string>
+	<string>1.5.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>OSCR</string>
 	<key>NSPrincipalClass</key>

Modified: branches/Version156/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/config.h.cmake
==============================================================================
--- branches/Version156/Scribus/config.h.cmake	(original)
+++ branches/Version156/Scribus/config.h.cmake	Sat Nov 14 00:07:19 2020
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.5.6"
+#cmakedefine VERSION "1.5.6.1"
 
 #cmakedefine BUILD_WINDOWS_VERSION 1
 #cmakedefine DLL_USE_NATIVE_API 1

Modified: branches/Version156/Scribus/resources/versions/scribusversions.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/resources/versions/scribusversions.xml
==============================================================================
--- branches/Version156/Scribus/resources/versions/scribusversions.xml	(original)
+++ branches/Version156/Scribus/resources/versions/scribusversions.xml	Sat Nov 14 00:07:19 2020
@@ -8,10 +8,10 @@
   <release platform="OS2" stability="stablesvn" version="1.4.9.svn" />
   <release platform="MacOSX" stability="stablesvn" version="1.4.9.svn" />
   <release platform="Win32" stability="stablesvn" version="1.4.9.svn" />
-  <release platform="X11" stability="unstable" version="1.5.6" />
-  <release platform="Win32" stability="unstable" version="1.5.6" />
-  <release platform="MacOSX" stability="unstable" version="1.5.6" />
-  <release platform="OS2" stability="unstable" version="1.5.6" />
+  <release platform="X11" stability="unstable" version="1.5.6.1" />
+  <release platform="Win32" stability="unstable" version="1.5.6.1" />
+  <release platform="MacOSX" stability="unstable" version="1.5.6.1" />
+  <release platform="OS2" stability="unstable" version="1.5.6.1" />
   <release platform="X11" stability="unstablesvn" version="1.5.7.svn" />
   <release platform="Win32" stability="unstablesvn" version="1.5.7.svn" />
   <release platform="MacOSX" stability="unstablesvn" version="1.5.7.svn" />

Modified: branches/Version156/Scribus/scribus.lsm
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/scribus.lsm
==============================================================================
--- branches/Version156/Scribus/scribus.lsm	(original)
+++ branches/Version156/Scribus/scribus.lsm	Sat Nov 14 00:07:19 2020
@@ -1,6 +1,6 @@
 Begin4
 Title:           Scribus 
-Version:         1.5.6
+Version:         1.5.6.1
 Entered-date:    2003-10-01
 Description:     Scribus is a Page Layout Program for Linux published under the GNU GPL. 
 Keywords:        desktop publishing, page layout, PDF, text processing, graphics, postscript, SVG, EPS 

Modified: branches/Version156/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
==============================================================================
--- branches/Version156/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt	(original)
+++ branches/Version156/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt	Sat Nov 14 00:07:19 2020
@@ -33,7 +33,7 @@
 	${HUNSPELL_PLUGIN_UI_SOURCES}
 )
 
-target_link_libraries(${SCRIBUS_HUNSPELL_PLUGIN} ${HUNSPELL_LIBRARIES} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_HUNSPELL_PLUGIN} ${HUNSPELL_LIBRARIES} ${SCRIBUS_TEXT_LIB} ${PLUGIN_LIBRARIES})
 
 install(TARGETS ${SCRIBUS_HUNSPELL_PLUGIN}
 	LIBRARY

Modified: branches/Version156/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24238&path=/branches/Version156/Scribus/scribus/ui/about.cpp
==============================================================================
--- branches/Version156/Scribus/scribus/ui/about.cpp	(original)
+++ branches/Version156/Scribus/scribus/ui/about.cpp	Sat Nov 14 00:07:19 2020
@@ -114,7 +114,7 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "1";
+	QString BUILD_DAY = "14";
 	QString BUILD_MONTH = CommonStrings::november;
 	QString BUILD_YEAR = "2020";
 	QString BUILD_TIME = "";




More information about the scribus-commit mailing list