r24641 by craig - Bump to 1.5.8.svn

[scribus-commit]

Author: craig
Date: Thu Apr 29 21:23:07 2021
New Revision: 24641

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24641
Log:
Bump to 1.5.8.svn

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/ChangeLog
    trunk/Scribus/OSX-package/inputs/Info.plist
    trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
    trunk/Scribus/Scribus.app/Contents/Info.plist
    trunk/Scribus/config.h.cmake
    trunk/Scribus/scribus/ui/about.cpp

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24641&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Thu Apr 29 21:23:07 2021
@@ -31,8 +31,8 @@
 #where VERSION_SUFFIX is of the form "", "svn" or "Nsvn" (N being the minor patch level)
 set (VERSION_MAJOR "1")
 set (VERSION_MINOR "5")
-set (VERSION_PATCH "7")
-set (VERSION_SUFFIX "")
+set (VERSION_PATCH "8")
+set (VERSION_SUFFIX "svn")
 set (VERSION ${VERSION_MAJOR})
 if (VERSION_MINOR GREATER -1)
 	set (VERSION ${VERSION}.${VERSION_MINOR})
@@ -592,12 +592,12 @@
 	set(CPACK_TOPLEVEL_TAG "")
 	set(CPACK_SOURCE_IGNORE_FILES
 		CMakeCache.txt
-		scribus-1.5.7.tar.bz2
-		scribus-1.5.7.tar.7z
-		scribus-1.5.7.tar.gz
-		scribus-1.5.7.svn.tar.bz2
-		scribus-1.5.7.svn.tar.7z
-		scribus-1.5.7.svn.tar.gz
+		scribus-1.5.8.tar.bz2
+		scribus-1.5.8.tar.7z
+		scribus-1.5.8.tar.gz
+		scribus-1.5.8.svn.tar.bz2
+		scribus-1.5.8.svn.tar.7z
+		scribus-1.5.8.svn.tar.gz
 		"~$"
 		"\\\\.cvsignore$"
 		"\\\\.o$"

Modified: trunk/Scribus/ChangeLog
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24641&path=/trunk/Scribus/ChangeLog
==============================================================================
--- trunk/Scribus/ChangeLog	(original)
+++ trunk/Scribus/ChangeLog	Thu Apr 29 21:23:07 2021
@@ -1,3 +1,6 @@
+Scribus - 1.5.8 (Released 2021-xx-xx)
+=========================================
+
 Scribus - 1.5.7 (Released 2021-04-25)
 =========================================
 0015738: [User Interface] preferences > display > color tab is disable when a document is open (cbradney)

Modified: trunk/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24641&path=/trunk/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- trunk/Scribus/OSX-package/inputs/Info.plist	(original)
+++ trunk/Scribus/OSX-package/inputs/Info.plist	Thu Apr 29 21:23:07 2021
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus Installer 1.5.7</string>
+	<string>Scribus Installer 1.5.8.svn</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus.osxinstaller</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.7</string>
+	<string>1.5.8.svn</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24641&path=/trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
==============================================================================
--- trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	(original)
+++ trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	Thu Apr 29 21:23:07 2021
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus 1.5.7</string>
+	<string>Scribus 1.5.8.svn</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.7</string>
+	<string>1.5.8.svn</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: trunk/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24641&path=/trunk/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- trunk/Scribus/Scribus.app/Contents/Info.plist	(original)
+++ trunk/Scribus/Scribus.app/Contents/Info.plist	Thu Apr 29 21:23:07 2021
@@ -67,7 +67,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.7</string>
+	<string>1.5.8.svn</string>
 	<key>CFBundleSignature</key>
 	<string>OSCR</string>
 	<key>NSPrincipalClass</key>

Modified: trunk/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24641&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake	(original)
+++ trunk/Scribus/config.h.cmake	Thu Apr 29 21:23:07 2021
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.5.7"
+#cmakedefine VERSION "1.5.8.svn"
 
 #cmakedefine BUILD_MAC_BUNDLE
 #cmakedefine BUILD_WINDOWS_VERSION 1

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24641&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp	(original)
+++ trunk/Scribus/scribus/ui/about.cpp	Thu Apr 29 21:23:07 2021
@@ -127,7 +127,7 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "25";
+	QString BUILD_DAY = "29";
 	QString BUILD_MONTH = CommonStrings::april;
 	QString BUILD_YEAR = "2021";
 	QString BUILD_TIME = "";