r22477 by craig - Bump dates

Wed Apr 25 18:42:32 UTC 2018

Author: craig
Date: Wed Apr 25 18:42:32 2018
New Revision: 22477

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22477
Log:
Bump dates

Modified:
    trunk/Scribus/CMakeLists.txt
    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.lsm
    trunk/Scribus/scribus/ui/about.cpp
    trunk/Scribus/win32/msvc2012/win-config.h
    trunk/Scribus/win32/msvc2015/win-config.h

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22477&path=/trunk/Scribus/CMakeLists.txt
==============================================================================

--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Wed Apr 25 18:42:32 2018
@@ -64,7 +64,7 @@
 set (VERSION_MAJOR "1")
 set (VERSION_MINOR "5")
 set (VERSION_PATCH "4")
-set (VERSION_SUFFIX "svn")
+set (VERSION_SUFFIX "")
 set (VERSION ${VERSION_MAJOR})
 if (VERSION_MINOR GREATER -1)
 	set (VERSION ${VERSION}.${VERSION_MINOR})

Modified: trunk/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22477&path=/trunk/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- trunk/Scribus/OSX-package/inputs/Info.plist	(original)
+++ trunk/Scribus/OSX-package/inputs/Info.plist	Wed Apr 25 18:42:32 2018
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-		<string>Scribus Installer 1.5.4.svn</string>
+		<string>Scribus Installer 1.5.4</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.osxinstaller</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-		<string>1.5.4.svn</string>
+		<string>1.5.4</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=22477&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	Wed Apr 25 18:42:32 2018
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-		<string>Scribus 1.5.4.svn</string>
+		<string>Scribus 1.5.4</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.aqua</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-		<string>1.5.4.svn</string>
+		<string>1.5.4</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: trunk/Scribus/README
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22477&path=/trunk/Scribus/README
==============================================================================
--- trunk/Scribus/README	(original)
+++ trunk/Scribus/README	Wed Apr 25 18:42:32 2018
@@ -1,4 +1,4 @@
-=Whatâ€™s New in Scribus 1.5.3 ?=
+=Whatâ€™s New in Scribus 1.5.x ?=
 
 
 This is a cursory overview over the most important changes in Scribus compared to the latest stable version 1.4.x.
@@ -8,7 +8,7 @@
 Also note that the 1.5.x series is not an officially stable version. Instead, all 1.5.x versions are development candidates of the upcoming stable Scribus 1.6.0! If you try to do some serious work with 1.5.x, you do so at your own peril. That being said, the Scribus Team considers Scribus 1.5.2 to be stable enough to be used for daily work. Features that are already in 1.4.x will work as reliably and in many cases even better than in 1.4.x.
 
 
-ï¿¼
+
 ==General==
 
 Qt 5: As of version 1.5.3, Scribus is being built using version 5.5 of the Qt toolkit.
@@ -27,7 +27,7 @@
 
 - Background colors for glyphs.
 - Foot- and endnotes.
-- Freely defineable text variables.
+- Freely definable text variables.
 - Text references.
 - Anchored text frames.
 - Automatic numbering and bullets.
@@ -42,14 +42,14 @@
 The tables tool has been completely rewritten. Tables in Scribus work now more like those in other DTP and wordprocessing software. Basic table and cell styles have also been implemented.
 
 
-ï¿¼
+
 ==Graphics==
 
 ===Picture Browser===
 
 A new feature-rich plug-in called â€œPicture Browserâ€ enables asset management for graphics files by tagging them or creating graphics collections. Graphics files can be dragged into a Scribus document from the Picture Browser. 
 
-ï¿¼
+
 ===Vector Tools===
 
 - New vector types: Arcs and Spirals.
@@ -65,16 +65,16 @@
 
 
 ==Frame Fills and Lines==
-ï¿¼
+
 ===L*a*b* and HLC colors in Scribus===
 
 - Support for CIE L*a*b* and CIE HLC color models: As of version 1.5.1 Scribus supports the CIE L*a*b* color space and its user-friendly variant HLC in almost all color-related dialogs. You can now add or convert existing colors using L*a*b* or HLC.
 
 - Availability of more than 300 color palettes: As of version 1.5.2, Scribus provides access to the more than 300 mostly commercial color palettes of the Open Colour Systems Collection in the CIE L*a*b color space via the Resource Manager.
-ï¿¼
+
 ===The unified Colors & Fills Manager===
 
-- More supported color palette formats: Scribus can now read and use swatches from Adobe Photoshop (ACO), AutoCAD (ACB), Swatchbooker (SBZ), as well as Adobe Swatch Exchange files (ASE).
+- More supported color palette formats: Scribus can now read and use swatches from Adobe Photoshop (ACO), AutoCAD (ACB), Swatchbooker (SBZ), as well as Adobe Swatch Exchange files (ASE) and the new ISO standard, CxF3.
 - More gradient fills: Scribus can import GIMP gradients via the â€œColors & Fillsâ€ dialog. Moreover, the number of available gradient options in Scribus has grown significantly and includes, among others, mesh gradients.
 - Hatchings: As of this version, Scribus supports real vector hatchings with various options.
 - New frame stroke and line options: All types of lines, including frame strokes, can now use a gradient or a pattern instead of only a color.

Modified: trunk/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22477&path=/trunk/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- trunk/Scribus/Scribus.app/Contents/Info.plist	(original)
+++ trunk/Scribus/Scribus.app/Contents/Info.plist	Wed Apr 25 18:42:32 2018
@@ -67,7 +67,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.4.svn</string>
+	<string>1.5.4</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=22477&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake	(original)
+++ trunk/Scribus/config.h.cmake	Wed Apr 25 18:42:32 2018
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.5.4.svn"
+#cmakedefine VERSION "1.5.4"
 
 #cmakedefine BUILD_WINDOWS_VERSION 1
 #cmakedefine DLL_USE_NATIVE_API 1

Modified: trunk/Scribus/resources/versions/scribusversions.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22477&path=/trunk/Scribus/resources/versions/scribusversions.xml
==============================================================================
--- trunk/Scribus/resources/versions/scribusversions.xml	(original)
+++ trunk/Scribus/resources/versions/scribusversions.xml	Wed Apr 25 18:42:32 2018
@@ -1,20 +1,20 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <scribus>
-  <release platform="X11" stability="stable" version="1.4.6" />
-  <release platform="OS2" stability="stable" version="1.4.6" />
-  <release platform="MacOSX" stability="stable" version="1.4.6" />
-  <release platform="Win32" stability="stable" version="1.4.6" />
+  <release platform="X11" stability="stable" version="1.4.7" />
+  <release platform="OS2" stability="stable" version="1.4.7" />
+  <release platform="MacOSX" stability="stable" version="1.4.7" />
+  <release platform="Win32" stability="stable" version="1.4.7" />
   <release platform="X11" stability="stablesvn" version="1.4.7.svn" />
   <release platform="OS2" stability="stablesvn" version="1.4.7.svn" />
   <release platform="MacOSX" stability="stablesvn" version="1.4.7.svn" />
   <release platform="Win32" stability="stablesvn" version="1.4.7.svn" />
-  <release platform="X11" stability="unstable" version="1.5.3" />
-  <release platform="Win32" stability="unstable" version="1.5.3" />
-  <release platform="MacOSX" stability="unstable" version="1.5.3" />
-  <release platform="OS2" stability="unstable" version="1.5.3" />
-  <release platform="X11" stability="unstablesvn" version="1.5.4.svn" />
-  <release platform="Win32" stability="unstablesvn" version="1.5.4.svn" />
-  <release platform="MacOSX" stability="unstablesvn" version="1.5.4.svn" />
-  <release platform="OS2" stability="unstablesvn" version="1.5.4.svn" />
-  <message lang="en" > - Scribus 1.4.6 is the latest stable release, released January 12 2016.<![CDATA[<br>]]> - Scribus 1.5.3 is the current development version, release May 23, 2017. </message>
+  <release platform="X11" stability="unstable" version="1.5.4" />
+  <release platform="Win32" stability="unstable" version="1.5.4" />
+  <release platform="MacOSX" stability="unstable" version="1.5.4" />
+  <release platform="OS2" stability="unstable" version="1.5.4" />
+  <release platform="X11" stability="unstablesvn" version="1.5.5.svn" />
+  <release platform="Win32" stability="unstablesvn" version="1.5.5.svn" />
+  <release platform="MacOSX" stability="unstablesvn" version="1.5.5.svn" />
+  <release platform="OS2" stability="unstablesvn" version="1.5.5.svn" />
+  <message lang="en" > - Scribus 1.4.7 is the latest stable release, released 28 April 2018.<![CDATA[<br>]]> - Scribus 1.5.4 is the current development version, release May 23, 2017. </message>
 </scribus>

Modified: trunk/Scribus/scribus.lsm
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22477&path=/trunk/Scribus/scribus.lsm
==============================================================================
--- trunk/Scribus/scribus.lsm	(original)
+++ trunk/Scribus/scribus.lsm	Wed Apr 25 18:42:32 2018
@@ -1,6 +1,6 @@
 Begin4
 Title:           Scribus 
-Version:         1.5.4.svn
+Version:         1.5.4
 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: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22477&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp	(original)
+++ trunk/Scribus/scribus/ui/about.cpp	Wed Apr 25 18:42:32 2018
@@ -114,8 +114,8 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "13";
-	QString BUILD_MONTH = CommonStrings::march;
+	QString BUILD_DAY = "28";
+	QString BUILD_MONTH = CommonStrings::april;
 	QString BUILD_YEAR = "2018";
 	QString BUILD_TIME = "";
 	QString BUILD_TZ = "";

Modified: trunk/Scribus/win32/msvc2012/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22477&path=/trunk/Scribus/win32/msvc2012/win-config.h
==============================================================================
--- trunk/Scribus/win32/msvc2012/win-config.h	(original)
+++ trunk/Scribus/win32/msvc2012/win-config.h	Wed Apr 25 18:42:32 2018
@@ -2,7 +2,7 @@
 #define WINCONFIG_H
 
 /* Version number of package */
-#define VERSION "1.5.4.svn"
+#define VERSION "1.5.4"
 
 /* Are we building win32 native version. */
 #define BUILD_WINDOWS_VERSION 1

Modified: trunk/Scribus/win32/msvc2015/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22477&path=/trunk/Scribus/win32/msvc2015/win-config.h
==============================================================================
--- trunk/Scribus/win32/msvc2015/win-config.h	(original)
+++ trunk/Scribus/win32/msvc2015/win-config.h	Wed Apr 25 18:42:32 2018
@@ -2,7 +2,7 @@
 #define WINCONFIG_H
 
 /* Version number of package */
-#define VERSION "1.5.4.svn"
+#define VERSION "1.5.4"
 
 /* Are we building win32 native version. */
 #define BUILD_WINDOWS_VERSION 1


