r20649 by craig -

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 2 21:34:36 UTC 2016 

Author: craig
Date: Sat Jan  2 21:34:35 2016
New Revision: 20649

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20649
Log:
Bump version to 1.4.6 in preparation for release

Modified:
    branches/Version14x/Scribus/CMakeLists.txt
    branches/Version14x/Scribus/OSX-package/inputs/Info.plist
    branches/Version14x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
    branches/Version14x/Scribus/Scribus.app/Contents/Info.plist
    branches/Version14x/Scribus/Scribus.pro
    branches/Version14x/Scribus/config.h.cmake
    branches/Version14x/Scribus/scribusversions.xml

Modified: branches/Version14x/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20649&path=/branches/Version14x/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/CMakeLists.txt	(original)
+++ branches/Version14x/Scribus/CMakeLists.txt	Sat Jan  2 21:34:35 2016
@@ -80,7 +80,7 @@
 SET (VERSION_MAJOR "1")
 SET (VERSION_MINOR "4")
 SET (VERSION_PATCH "6")
-SET (VERSION_SUFFIX "svn")
+SET (VERSION_SUFFIX "")
 SET (VERSION ${VERSION_MAJOR})
 IF (VERSION_MINOR GREATER -1)
   SET (VERSION ${VERSION}.${VERSION_MINOR})
@@ -991,6 +991,12 @@
 	scribus-1.4.6.svn.gz
 	scribus-1.4.6.svn.tar.bz2
 	scribus-1.4.6.svn.tar.7z
+	scribus-1.4.6.tar.gz
+	scribus-1.4.6.tar.Z
+	scribus-1.4.6.tar.xz
+	scribus-1.4.6.gz
+	scribus-1.4.6.tar.bz2
+	scribus-1.4.6.tar.7z
     "~$"
     "\\\\.cvsignore$"
     "\\\\.o$"

Modified: branches/Version14x/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20649&path=/branches/Version14x/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- branches/Version14x/Scribus/OSX-package/inputs/Info.plist	(original)
+++ branches/Version14x/Scribus/OSX-package/inputs/Info.plist	Sat Jan  2 21:34:35 2016
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>Scribus Installer 1.4.6.svn</string>
+        <string>Scribus Installer 1.4.6</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.osxinstaller</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.4.6.svn</string>
+        <string>1.4.6</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: branches/Version14x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20649&path=/branches/Version14x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
==============================================================================
--- branches/Version14x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	(original)
+++ branches/Version14x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	Sat Jan  2 21:34:35 2016
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>Scribus 1.4.6.svn</string>
+        <string>Scribus 1.4.6</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.aqua</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.4.6.svn</string>
+        <string>1.4.6</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: branches/Version14x/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20649&path=/branches/Version14x/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- branches/Version14x/Scribus/Scribus.app/Contents/Info.plist	(original)
+++ branches/Version14x/Scribus/Scribus.app/Contents/Info.plist	Sat Jan  2 21:34:35 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.4.6.svn</string>
+	<string>1.4.6</string>
 	<key>CFBundleSignature</key>
 	<string>OSCR</string>
 </dict>

Modified: branches/Version14x/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20649&path=/branches/Version14x/Scribus/Scribus.pro
==============================================================================
--- branches/Version14x/Scribus/Scribus.pro	(original)
+++ branches/Version14x/Scribus/Scribus.pro	Sat Jan  2 21:34:35 2016
@@ -1,5 +1,5 @@
 ######################################################################
-# Automatically generated by qmake (2.01a) Sat Sep 19 18:24:15 2015
+# Automatically generated by qmake (2.01a) Tue Dec 15 22:06:36 2015
 ######################################################################
 
 TEMPLATE = app

Modified: branches/Version14x/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20649&path=/branches/Version14x/Scribus/config.h.cmake
==============================================================================
--- branches/Version14x/Scribus/config.h.cmake	(original)
+++ branches/Version14x/Scribus/config.h.cmake	Sat Jan  2 21:34:35 2016
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.4.6.svn"
+#cmakedefine VERSION "1.4.6"
 
 #cmakedefine BUILD_WINDOWS_VERSION 1
 #cmakedefine SC_USE_GDI 1

Modified: branches/Version14x/Scribus/scribusversions.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20649&path=/branches/Version14x/Scribus/scribusversions.xml
==============================================================================
--- branches/Version14x/Scribus/scribusversions.xml	(original)
+++ branches/Version14x/Scribus/scribusversions.xml	Sat Jan  2 21:34:35 2016
@@ -1,13 +1,13 @@
 <?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.5.svn" />
-  <release platform="OS2" stability="stablesvn" version="1.4.5.svn" />
-  <release platform="MacOSX" stability="stablesvn" version="1.4.5.svn" />
-  <release platform="Win32" stability="stablesvn" version="1.4.5.svn" />
+  <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.0.svn" />
   <release platform="Win32" stability="unstable" version="1.5.0.svn" />
   <release platform="MacOSX" stability="unstable" version="1.5.0.svn" />
@@ -16,5 +16,5 @@
   <release platform="Win32" stability="unstablesvn" version="1.5.0.svn" />
   <release platform="MacOSX" stability="unstablesvn" version="1.5.0.svn" />
   <release platform="OS2" stability="unstablesvn" version="1.5.0.svn" />
-  <message lang="en" > - Scribus 1.4.5 is the latest stable release, released January 2015.<![CDATA[<br>]]> - Scribus 1.5.0.svn is the current development version. </message>
+  <message lang="en" > - Scribus 1.4.6 is the latest stable release, released January 2016.<![CDATA[<br>]]> - Scribus 1.5.0.svn is the current development version. </message>
 </scribus>

More information about the scribus-commit mailing list