r20979 by craig -

scribus-commit scribus-commit at lists.scribus.net
Thu Feb 11 21:54:58 UTC 2016


Author: craig
Date: Thu Feb 11 21:54:58 2016
New Revision: 20979

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20979
Log:
Bump to 1.5.1 for upcoming release

Modified:
    trunk/Scribus/CMakeLists.txt
    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/doc/de/releases.html
    trunk/Scribus/doc/en/releases.html
    trunk/Scribus/doc/it/releases.html
    trunk/Scribus/resources/versions/scribusversions.xml
    trunk/Scribus/scribus.lsm
    trunk/Scribus/scribus/ui/splash.cpp

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20979&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Thu Feb 11 21:54:58 2016
@@ -46,7 +46,7 @@
 SET (VERSION_MAJOR "1")
 SET (VERSION_MINOR "5")
 SET (VERSION_PATCH "1")
-SET (VERSION_SUFFIX "svn")
+SET (VERSION_SUFFIX "")
 SET (VERSION ${VERSION_MAJOR})
 IF (VERSION_MINOR GREATER -1)
 	SET (VERSION ${VERSION}.${VERSION_MINOR})
@@ -1039,9 +1039,9 @@
 	SET(CPACK_TOPLEVEL_TAG "")
 	SET(CPACK_SOURCE_IGNORE_FILES
 		CMakeCache.txt
-		scribus-1.5.0.svn.tar.bz2
-		scribus-1.5.0.svn.tar.Z
-		scribus-1.5.0.svn.tar.gz
+		scribus-1.5.1.svn.tar.bz2
+		scribus-1.5.1.svn.tar.Z
+		scribus-1.5.1.svn.tar.gz
 		"~$"
 		"\\\\.cvsignore$"
 		"\\\\.o$"

Modified: trunk/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20979&path=/trunk/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- trunk/Scribus/OSX-package/inputs/Info.plist	(original)
+++ trunk/Scribus/OSX-package/inputs/Info.plist	Thu Feb 11 21:54:58 2016
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>Scribus Installer 1.5.1.svn</string>
+		<string>Scribus Installer 1.5.1</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.osxinstaller</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.5.1.svn</string>
+		<string>1.5.1</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=20979&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 Feb 11 21:54:58 2016
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>Scribus 1.5.1.svn</string>
+		<string>Scribus 1.5.1</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.aqua</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.5.1.svn</string>
+		<string>1.5.1</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=20979&path=/trunk/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- trunk/Scribus/Scribus.app/Contents/Info.plist	(original)
+++ trunk/Scribus/Scribus.app/Contents/Info.plist	Thu Feb 11 21:54:58 2016
@@ -57,7 +57,7 @@
 		</dict>
 	</array>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus (c) 2001-2015 The Scribus Team</string>
+	<string>Scribus (c) 2001-2016 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.1.svn</string>
+	<string>1.5.1</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=20979&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake	(original)
+++ trunk/Scribus/config.h.cmake	Thu Feb 11 21:54:58 2016
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.5.1.svn"
+#cmakedefine VERSION "1.5.1"
 
 #cmakedefine BUILD_WINDOWS_VERSION 1
 #cmakedefine DLL_USE_NATIVE_API 1

Modified: trunk/Scribus/doc/de/releases.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20979&path=/trunk/Scribus/doc/de/releases.html
==============================================================================
--- trunk/Scribus/doc/de/releases.html	(original)
+++ trunk/Scribus/doc/de/releases.html	Thu Feb 11 21:54:58 2016
@@ -6,6 +6,11 @@
 <body>
 <h2>Release History</h2>
 <ul>
+<li><b>14/02/2016</b> - Scribus 1.5.1</li>
+<li><b>12/01/2016</b> - Scribus 1.4.6</li>
+<li><b>26/05/2015</b> - Scribus 1.5.0</li>
+<li><b>26/01/2015</b> - Scribus 1.4.5</li>
+<li><b>29/05/2014</b> - Scribus 1.4.4</li>
 <li><b>20/07/2013</b> - Scribus 1.4.3 (added Haiku Port)</li>
 <li><b>13/02/2013</b> - Scribus 1.4.2 (added Win64 Port)</li>
 <li><b>30/04/2012</b> - Scribus 1.4.1  </li>

Modified: trunk/Scribus/doc/en/releases.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20979&path=/trunk/Scribus/doc/en/releases.html
==============================================================================
--- trunk/Scribus/doc/en/releases.html	(original)
+++ trunk/Scribus/doc/en/releases.html	Thu Feb 11 21:54:58 2016
@@ -9,7 +9,9 @@
 <body>
 <h2>Release History</h2>
 <ul>
+<li><b>14/02/2016</b> - Scribus 1.5.1</li>
 <li><b>12/01/2016</b> - Scribus 1.4.6</li>
+<li><b>26/05/2015</b> - Scribus 1.5.0</li>
 <li><b>26/01/2015</b> - Scribus 1.4.5</li>
 <li><b>29/05/2014</b> - Scribus 1.4.4</li>
 <li><b>20/07/2013</b> - Scribus 1.4.3 (added Haiku Port)</li>

Modified: trunk/Scribus/doc/it/releases.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20979&path=/trunk/Scribus/doc/it/releases.html
==============================================================================
--- trunk/Scribus/doc/it/releases.html	(original)
+++ trunk/Scribus/doc/it/releases.html	Thu Feb 11 21:54:58 2016
@@ -6,6 +6,16 @@
 <body>
 <h2>Release History</h2>
 <ul>
+<li><b>14/02/2016</b> - Scribus 1.5.1</li>
+<li><b>12/01/2016</b> - Scribus 1.4.6</li>
+<li><b>26/05/2015</b> - Scribus 1.5.0</li>
+<li><b>26/01/2015</b> - Scribus 1.4.5</li>
+<li><b>29/05/2014</b> - Scribus 1.4.4</li>
+<li><b>20/07/2013</b> - Scribus 1.4.3 (added Haiku Port)</li>
+<li><b>13/02/2013</b> - Scribus 1.4.2 (added Win64 Port)</li>
+<li><b>30/04/2012</b> - Scribus 1.4.1  </li>
+<li><b>01/01/2012</b> - Scribus 1.4.0 (new stable)  </li>
+<li><b>18/10/2011</b> - Scribus 1.4.0rc6 (almost stable)  </li>
 <li><b>27/10/2010</b> - Scribus 1.3.9 (devel)  </li>
 <li><b>23/07/2010</b> - Scribus 1.3.8 (devel)  </li>
 <li><b>05/06/2010</b> - Scribus 1.3.7 (devel)  </li>
@@ -48,4 +58,4 @@
 <li><b>21/06/2003</b> - Scribus 1.0 </li>
 
 </body>
-</html>
+</html>

Modified: trunk/Scribus/resources/versions/scribusversions.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20979&path=/trunk/Scribus/resources/versions/scribusversions.xml
==============================================================================
--- trunk/Scribus/resources/versions/scribusversions.xml	(original)
+++ trunk/Scribus/resources/versions/scribusversions.xml	Thu Feb 11 21:54:58 2016
@@ -1,20 +1,20 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <scribus>
-  <release platform="X11" stability="stable" version="1.4.5" />
-  <release platform="OS2" stability="stable" version="1.4.5" />
-  <release platform="MacOSX" stability="stable" version="1.4.5" />
-  <release platform="Win32" stability="stable" version="1.4.5" />
-  <release platform="X11" stability="stablesvn" version="1.4.6.svn" />
-  <release platform="OS2" stability="stablesvn" version="1.4.6.svn" />
-  <release platform="MacOSX" stability="stablesvn" version="1.4.6.svn" />
-  <release platform="Win32" stability="stablesvn" version="1.4.6.svn" />
-  <release platform="X11" stability="unstable" version="1.5.0" />
-  <release platform="Win32" stability="unstable" version="1.5.0" />
-  <release platform="MacOSX" stability="unstable" version="1.5.0" />
-  <release platform="OS2" stability="unstable" version="1.5.0" />
-  <release platform="X11" stability="unstablesvn" version="1.5.1.svn" />
-  <release platform="Win32" stability="unstablesvn" version="1.5.1.svn" />
-  <release platform="MacOSX" stability="unstablesvn" version="1.5.1.svn" />
-  <release platform="OS2" stability="unstablesvn" version="1.5.1.svn" />
-  <message lang="en" > - Scribus 1.4.5 is the latest stable release, released January 26 2015.<![CDATA[<br>]]> - Scribus 1.5.0 is the current development version, release May 19, 2015. </message>
+  <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="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.1" />
+  <release platform="Win32" stability="unstable" version="1.5.1" />
+  <release platform="MacOSX" stability="unstable" version="1.5.1" />
+  <release platform="OS2" stability="unstable" version="1.5.1" />
+  <release platform="X11" stability="unstablesvn" version="1.5.2.svn" />
+  <release platform="Win32" stability="unstablesvn" version="1.5.2.svn" />
+  <release platform="MacOSX" stability="unstablesvn" version="1.5.2.svn" />
+  <release platform="OS2" stability="unstablesvn" version="1.5.2.svn" />
+  <message lang="en" > - Scribus 1.4.6 is the latest stable release, released January 12 2016.<![CDATA[<br>]]> - Scribus 1.5.1 is the current development version, release February 14, 2016. </message>
 </scribus>

Modified: trunk/Scribus/scribus.lsm
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20979&path=/trunk/Scribus/scribus.lsm
==============================================================================
--- trunk/Scribus/scribus.lsm	(original)
+++ trunk/Scribus/scribus.lsm	Thu Feb 11 21:54:58 2016
@@ -1,6 +1,6 @@
 Begin4
 Title:           Scribus 
-Version:         1.5.1.svn
+Version:         1.5.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: trunk/Scribus/scribus/ui/splash.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20979&path=/trunk/Scribus/scribus/ui/splash.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/splash.cpp	(original)
+++ trunk/Scribus/scribus/ui/splash.cpp	Thu Feb 11 21:54:58 2016
@@ -71,11 +71,11 @@
 #else
 	lgf.setPointSize(29);
 #endif
-	QString v(VERSION);
+	QString versionText(VERSION);
 	painter->setFont(lgf);
-	painter->drawText(r, Qt::AlignRight | Qt::AlignBottom, v );
+	painter->drawText(r, Qt::AlignRight | Qt::AlignBottom, versionText );
 
-	if (v.contains("svn"))
+	if (versionText.contains("svn"))
 	{
 #if defined(HAVE_SVNVERSION) && defined(SVNVERSION)
 		QString revText;




More information about the scribus-commit mailing list