Author: craig
Date: Sat Apr 28 20:39:10 2018
New Revision: 22486
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22486
Log:
Bump to 1.5.5.svn
Modified:
trunk/Scribus/CMakeLists.txt
trunk/Scribus/ChangeLog
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/resources/versions/scribusversions.xml
trunk/Scribus/scribus.lsm
trunk/Scribus/win32/msvc2012/scribus-main/Scribus.rc
trunk/Scribus/win32/msvc2012/win-config.h
trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc
Modified: trunk/Scribus/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sat Apr 28 20:39:10 2018
@@ -63,8 +63,8 @@
#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 @@
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$"
Modified: trunk/Scribus/ChangeLog
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&path=/trunk/Scribus/ChangeLog
==============================================================================
--- trunk/Scribus/ChangeLog (original)
+++ trunk/Scribus/ChangeLog Sat Apr 28 20:39:10 2018
@@ -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)
Modified: trunk/Scribus/OSX-package/inputs/Info.plist
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&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 28 20:39:10 2018
@@ -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>
Modified: trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&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 28
20:39:10 2018
@@ -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>
Modified: trunk/Scribus/Scribus.app/Contents/Info.plist
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&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 28 20:39:10 2018
@@ -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>
Modified: trunk/Scribus/config.h.cmake
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake (original)
+++ trunk/Scribus/config.h.cmake Sat Apr 28 20:39:10 2018
@@ -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
Modified: trunk/Scribus/resources/versions/scribusversions.xml
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&path=/trunk/Scribus/resources/versions/scribusversions.xml
==============================================================================
--- trunk/Scribus/resources/versions/scribusversions.xml (original)
+++ trunk/Scribus/resources/versions/scribusversions.xml Sat Apr 28
20:39:10 2018
@@ -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>
Modified: trunk/Scribus/scribus.lsm
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&path=/trunk/Scribus/scribus.lsm
==============================================================================
--- trunk/Scribus/scribus.lsm (original)
+++ trunk/Scribus/scribus.lsm Sat Apr 28 20:39:10 2018
@@ -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
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.rc
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&path=/trunk/Scribus/win32/msvc2012/scribus-main/Scribus.rc
==============================================================================
--- trunk/Scribus/win32/msvc2012/scribus-main/Scribus.rc (original)
+++ trunk/Scribus/win32/msvc2012/scribus-main/Scribus.rc Sat Apr 28
20:39:10 2018
@@ -75,8 +75,8 @@
//
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 @@
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"
Modified: trunk/Scribus/win32/msvc2012/win-config.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&path=/trunk/Scribus/win32/msvc2012/win-config.h
==============================================================================
--- trunk/Scribus/win32/msvc2012/win-config.h (original)
+++ trunk/Scribus/win32/msvc2012/win-config.h Sat Apr 28 20:39:10 2018
@@ -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
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22486&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc (original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc Sat Apr 28
20:39:10 2018
@@ -75,8 +75,8 @@
//
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 @@
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"
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
