Bump to 1.5.5.svn

git-svn-id: svn://scribus.net/trunk/Scribus@22486 11d20701-8431-0410-a711-e3c959e3b870
scribusproject · Apr 28, 2018 · a96a68d · a96a68d
1 parent cd88618
commit a96a68d
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,8 +63,8 @@ project(scribus)
 #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 "4")
-set (VERSION_SUFFIX "")
+set (VERSION_PATCH "5")
+set (VERSION_SUFFIX "svn")
 set (VERSION ${VERSION_MAJOR})
 if (VERSION_MINOR GREATER -1)
 	set (VERSION ${VERSION}.${VERSION_MINOR})
@@ -1113,12 +1113,12 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 	set(CPACK_TOPLEVEL_TAG "")
 	set(CPACK_SOURCE_IGNORE_FILES
 		CMakeCache.txt
-		scribus-1.5.4.tar.bz2
-		scribus-1.5.4.tar.Z
-		scribus-1.5.4.tar.gz
-		scribus-1.5.4.svn.tar.bz2
-		scribus-1.5.4.svn.tar.Z
-		scribus-1.5.4.svn.tar.gz
+		scribus-1.5.5.tar.bz2
+		scribus-1.5.5.tar.Z
+		scribus-1.5.5.tar.gz
+		scribus-1.5.5.svn.tar.bz2
+		scribus-1.5.5.svn.tar.Z
+		scribus-1.5.5.svn.tar.gz
 		"~$"
 		"\\\\.cvsignore$"
 		"\\\\.o$"

diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,7 @@
-Scribus - 1.5.4 (Released 2018-xx-xx)
+Scribus - 1.5.5 (Released 2018-xx-xx)
+=========================================
+
+Scribus - 1.5.4 (Released 2018-04-28)
 =========================================
 - 0015267: [Color Management] Colour model switch in the "Colours & Fills" dialogue doesn't work as expected (jghali)
 - 0015080: [Story Editor / Text Frames] Crashes when editing document (jghali)

diff --git a/OSX-package/inputs/Info.plist b/OSX-package/inputs/Info.plist
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-		<string>Scribus Installer 1.5.4</string>
+		<string>Scribus Installer 1.5.5.svn</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.osxinstaller</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-		<string>1.5.4</string>
+		<string>1.5.5.svn</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

diff --git a/OSX-package/inputs/Scribus.pkg-Info.plist b/OSX-package/inputs/Scribus.pkg-Info.plist
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-		<string>Scribus 1.5.4</string>
+		<string>Scribus 1.5.5.svn</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.aqua</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-		<string>1.5.4</string>
+		<string>1.5.5.svn</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

diff --git a/Scribus.app/Contents/Info.plist b/Scribus.app/Contents/Info.plist
@@ -67,7 +67,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.4</string>
+	<string>1.5.5.svn</string>
 	<key>CFBundleSignature</key>
 	<string>OSCR</string>
 	<key>NSPrincipalClass</key>

diff --git a/config.h.cmake b/config.h.cmake
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.5.4"
+#cmakedefine VERSION "1.5.5.svn"
 
 #cmakedefine BUILD_WINDOWS_VERSION 1
 #cmakedefine DLL_USE_NATIVE_API 1

diff --git a/resources/versions/scribusversions.xml b/resources/versions/scribusversions.xml
@@ -16,5 +16,5 @@
   <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>
+  <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, released 28 April 2018. </message>
 </scribus>
diff --git a/scribus.lsm b/scribus.lsm
@@ -1,6 +1,6 @@
 Begin4
 Title:           Scribus 
-Version:         1.5.4
+Version:         1.5.5.svn
 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 

diff --git a/win32/msvc2012/scribus-main/Scribus.rc b/win32/msvc2012/scribus-main/Scribus.rc
@@ -75,8 +75,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,4,0
- PRODUCTVERSION 1,5,4,0
+ FILEVERSION 1,5,5,0
+ PRODUCTVERSION 1,5,5,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -92,13 +92,13 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "The Scribus Team"
-            VALUE "FileDescription", "Scribus 1.5.4"
-            VALUE "FileVersion", "1.5.4"
-            VALUE "InternalName", "Scribus 1.5.4"
+            VALUE "FileDescription", "Scribus 1.5.5.svn"
+            VALUE "FileVersion", "1.5.5.svn"
+            VALUE "InternalName", "Scribus 1.5.5.svn"
             VALUE "LegalCopyright", "Copyright (C) 2001-2018 by The Scribus Team"
             VALUE "OriginalFilename", "Scribus.exe"
             VALUE "ProductName", "Scribus - Open Source Desktop Publishing"
-            VALUE "ProductVersion", "1.5.4"
+            VALUE "ProductVersion", "1.5.5.svn"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/win32/msvc2012/win-config.h b/win32/msvc2012/win-config.h
@@ -2,7 +2,7 @@
 #define WINCONFIG_H
 
 /* Version number of package */
-#define VERSION "1.5.4"
+#define VERSION "1.5.5.svn"
 
 /* Are we building win32 native version. */
 #define BUILD_WINDOWS_VERSION 1

diff --git a/win32/msvc2015/scribus-main/Scribus.rc b/win32/msvc2015/scribus-main/Scribus.rc
@@ -75,8 +75,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,4,0
- PRODUCTVERSION 1,5,4,0
+ FILEVERSION 1,5,5,0
+ PRODUCTVERSION 1,5,5,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -92,13 +92,13 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "The Scribus Team"
-            VALUE "FileDescription", "Scribus 1.5.4"
-            VALUE "FileVersion", "1.5.4"
-            VALUE "InternalName", "Scribus 1.5.4"
+            VALUE "FileDescription", "Scribus 1.5.5.svn"
+            VALUE "FileVersion", "1.5.5.svn"
+            VALUE "InternalName", "Scribus 1.5.5.svn"
             VALUE "LegalCopyright", "Copyright (C) 2001-2018 by The Scribus Team"
             VALUE "OriginalFilename", "Scribus.exe"
             VALUE "ProductName", "Scribus - Open Source Desktop Publishing"
-            VALUE "ProductVersion", "1.5.4"
+            VALUE "ProductVersion", "1.5.5.svn"
         END
     END
     BLOCK "VarFileInfo"