r24633 by craig - Bump for 1.5.7 release

scribus-commit scribus-commit at lists.scribus.net
Sat Apr 24 16:24:46 UTC 2021


Author: craig
Date: Sat Apr 24 16:24:45 2021
New Revision: 24633

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24633
Log:
Bump for 1.5.7 release

Modified:
    trunk/Scribus/BUILDING
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/COPYING
    trunk/Scribus/ChangeLog
    trunk/Scribus/OSX-package/inputs/Info.plist
    trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
    trunk/Scribus/README
    trunk/Scribus/Scribus.app/Contents/Info.plist
    trunk/Scribus/config.h.cmake
    trunk/Scribus/resources/versions/scribusversions.xml
    trunk/Scribus/scribus.appdata.xml.in
    trunk/Scribus/scribus.lsm
    trunk/Scribus/scribus/ui/about.cpp

Modified: trunk/Scribus/BUILDING
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/BUILDING
==============================================================================
--- trunk/Scribus/BUILDING	(original)
+++ trunk/Scribus/BUILDING	Sat Apr 24 16:24:45 2021
@@ -27,7 +27,7 @@
 Install the below packages BEFORE running CMake or compiling Scribus:
 
 Requirements:
-	Qt >= 5.11.0
+    Qt >= 5.14.0
 	Freetype >= 2.1.7 (2.3.x strongly recommended)
 	cairo >= 1.14.x
 	harfbuzz = > 0.9.42

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sat Apr 24 16:24:45 2021
@@ -32,7 +32,7 @@
 set (VERSION_MAJOR "1")
 set (VERSION_MINOR "5")
 set (VERSION_PATCH "7")
-set (VERSION_SUFFIX "svn")
+set (VERSION_SUFFIX "")
 set (VERSION ${VERSION_MAJOR})
 if (VERSION_MINOR GREATER -1)
 	set (VERSION ${VERSION}.${VERSION_MINOR})

Modified: trunk/Scribus/COPYING
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/COPYING
==============================================================================
--- trunk/Scribus/COPYING	(original)
+++ trunk/Scribus/COPYING	Sat Apr 24 16:24:45 2021
@@ -1,5 +1,5 @@
 Scribus Copyright
-Copyright 2001–2020 Franz Schmid and rest of the members of the Scribus Team.
+Copyright 2001–2021 Franz Schmid and rest of the members of the Scribus Team.
 
 The "Scribus Team" is informally defined as the following people: Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Christoph Schäfer, Petr Vaněk, Andreas Vox, and Jain Basil.
 

Modified: trunk/Scribus/ChangeLog
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/ChangeLog
==============================================================================
--- trunk/Scribus/ChangeLog	(original)
+++ trunk/Scribus/ChangeLog	Sat Apr 24 16:24:45 2021
@@ -1,5 +1,10 @@
-Scribus - 1.5.7 (Released 2021-04-xx)
+Scribus - 1.5.7 (Released 2021-04-25)
 =========================================
+0016357: [OS-MacOSX] Mac Os Catalina refuses to start Scribus 1.5.6 (cbradney)
+0016044: [OS-MacOSX] Scribus was not able to load its preferences (cbradney)
+0013187: [OS-MacOSX] OSX Bug: Unable to access Preferences in Russian Interface (cbradney)
+0015738: [User Interface] preferences > display > color tab is disable when a document is open (cbradney)
+0016548: [General] Updated 600_xelatex.xml (cbradney)
 0016462: [User Interface] Update Layout for Node Editor (cbradney)
 0016470: [General] Clean up unused .ui files (jghali)
 0016518: [General] Inserting pages in the middle of a document distorts welded items further down (jghali)

Modified: trunk/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- trunk/Scribus/OSX-package/inputs/Info.plist	(original)
+++ trunk/Scribus/OSX-package/inputs/Info.plist	Sat Apr 24 16:24:45 2021
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus Installer 1.5.7.svn</string>
+	<string>Scribus Installer 1.5.7</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus.osxinstaller</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.7.svn</string>
+	<string>1.5.7</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=24633&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	Sat Apr 24 16:24:45 2021
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus 1.5.7.svn</string>
+	<string>Scribus 1.5.7</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.7.svn</string>
+	<string>1.5.7</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: trunk/Scribus/README
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/README
==============================================================================
--- trunk/Scribus/README	(original)
+++ trunk/Scribus/README	Sat Apr 24 16:24:45 2021
@@ -11,7 +11,7 @@
 
 ==General==
 
-Qt 5: As of version 1.5.x, Scribus is being built using version 5 of the Qt toolkit. Scribus 1.5.6 requires at least Qt 5.12.
+Qt 5: As of version 1.5.x, Scribus is being built using version 5 of the Qt toolkit. Scribus 1.5.7 requires at least Qt 5.14.
 
 More dependencies: Scribus 1.5.x makes extensive use of many more external libraries than earlier versions, especially for import filters. In most cases Scribus needs to be explicitly compiled against these libraries, so they become dependencies. In other cases (e.g. UniConvertor), Scribus will detect an installed version automatically. Note that full support for some libraries may not be available on Mac OS X and Windows until the final 1.6.0 release.
 

Modified: trunk/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- trunk/Scribus/Scribus.app/Contents/Info.plist	(original)
+++ trunk/Scribus/Scribus.app/Contents/Info.plist	Sat Apr 24 16:24:45 2021
@@ -57,7 +57,7 @@
 		</dict>
 	</array>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus (c) 2001-2020 The Scribus Team</string>
+	<string>Scribus (c) 2001-2021 The Scribus Team</string>
 	<key>CFBundleIconFile</key>
 	<string>Scribus.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -67,7 +67,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.7.svn</string>
+	<string>1.5.7</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=24633&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake	(original)
+++ trunk/Scribus/config.h.cmake	Sat Apr 24 16:24:45 2021
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.5.7.svn"
+#cmakedefine VERSION "1.5.7"
 
 #cmakedefine BUILD_MAC_BUNDLE
 #cmakedefine BUILD_WINDOWS_VERSION 1

Modified: trunk/Scribus/resources/versions/scribusversions.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/resources/versions/scribusversions.xml
==============================================================================
--- trunk/Scribus/resources/versions/scribusversions.xml	(original)
+++ trunk/Scribus/resources/versions/scribusversions.xml	Sat Apr 24 16:24:45 2021
@@ -8,13 +8,13 @@
   <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="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" />
-  <release platform="OS2" stability="unstablesvn" version="1.5.7.svn" />
-  <message lang="en" > - Scribus 1.4.8 is the latest stable release, released 3rd March 2019.<![CDATA[<br>]]> - Scribus 1.5.6 is the current development version, released 7th November 2020. </message>
+  <release platform="X11" stability="unstable" version="1.5.7" />
+  <release platform="Win32" stability="unstable" version="1.5.7" />
+  <release platform="MacOSX" stability="unstable" version="1.5.7" />
+  <release platform="OS2" stability="unstable" version="1.5.7" />
+  <release platform="X11" stability="unstablesvn" version="1.5.8.svn" />
+  <release platform="Win32" stability="unstablesvn" version="1.5.8.svn" />
+  <release platform="MacOSX" stability="unstablesvn" version="1.5.8.svn" />
+  <release platform="OS2" stability="unstablesvn" version="1.5.8.svn" />
+  <message lang="en" > - Scribus 1.4.8 is the latest stable release, released 3rd March 2019.<![CDATA[<br>]]> - Scribus 1.5.7 is the current development version, released 25th April 2021. </message>
 </scribus>

Modified: trunk/Scribus/scribus.appdata.xml.in
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/scribus.appdata.xml.in
==============================================================================
--- trunk/Scribus/scribus.appdata.xml.in	(original)
+++ trunk/Scribus/scribus.appdata.xml.in	Sat Apr 24 16:24:45 2021
@@ -35,6 +35,7 @@
   <update_contact>scribus-dev at lists.scribus.net</update_contact>
   <content_rating type="oars-1.1"/>
   <releases>
+    <release version="1.5.7" date="2021-04-25" type="development"/>
     <release version="1.5.6.1" date="2020-11-14" type="development"/>
     <release version="1.5.6" date="2020-11-07" type="development"/>
 	<release version="1.5.5" date="2019-07-30" type="development"/>

Modified: trunk/Scribus/scribus.lsm
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/scribus.lsm
==============================================================================
--- trunk/Scribus/scribus.lsm	(original)
+++ trunk/Scribus/scribus.lsm	Sat Apr 24 16:24:45 2021
@@ -1,6 +1,6 @@
 Begin4
 Title:           Scribus 
-Version:         1.5.7.svn
+Version:         1.5.7
 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 
@@ -9,6 +9,6 @@
 Primary-site:    http://www.scribus.net        
 Alternate-site:  http://www.scribus.org.uk/	        
 Original-site:   http://web2.altmuehlnet.de/fschmid  
-Platforms:       Linux and other Unices, MacOSX, Requires: Python >= 3.3, Qt >= 5.12+, cairo >= 2.4, freetype2 >=2.1.9
+Platforms:       Linux and other Unices, MacOSX, Requires: Python >= 3.3, Qt >= 5.14+, cairo >= 2.4, freetype2 >=2.1.9
 Copying-policy:  GNU Public License
 End

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24633&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp	(original)
+++ trunk/Scribus/scribus/ui/about.cpp	Sat Apr 24 16:24:45 2021
@@ -127,9 +127,9 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "13";
-	QString BUILD_MONTH = CommonStrings::december;
-	QString BUILD_YEAR = "2020";
+	QString BUILD_DAY = "25";
+	QString BUILD_MONTH = CommonStrings::april;
+	QString BUILD_YEAR = "2021";
 	QString BUILD_TIME = "";
 	QString BUILD_TZ = "";
 	QString BUILD_NAME = "";




More information about the scribus-commit mailing list