Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24198 → Rev 24200

/trunk/Scribus/CMakeLists.txt
68,8 → 68,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 "6")
set (VERSION_SUFFIX "")
set (VERSION_PATCH "7")
set (VERSION_SUFFIX "svn")
set (VERSION ${VERSION_MAJOR})
if (VERSION_MINOR GREATER -1)
set (VERSION ${VERSION}.${VERSION_MINOR})
567,12 → 567,12
set(CPACK_TOPLEVEL_TAG "")
set(CPACK_SOURCE_IGNORE_FILES
CMakeCache.txt
scribus-1.5.6.tar.bz2
scribus-1.5.6.tar.7z
scribus-1.5.6.tar.gz
scribus-1.5.6.svn.tar.bz2
scribus-1.5.6.svn.tar.7z
scribus-1.5.6.svn.tar.gz
scribus-1.5.7.tar.bz2
scribus-1.5.7.tar.7z
scribus-1.5.7.tar.gz
scribus-1.5.7.svn.tar.bz2
scribus-1.5.7.svn.tar.7z
scribus-1.5.7.svn.tar.gz
"~$"
"\\\\.cvsignore$"
"\\\\.o$"
/trunk/Scribus/ChangeLog
1,3 → 1,6
Scribus - 1.5.7 (Released 202x-xx-xx)
=========================================
 
Scribus - 1.5.6 (Released 2020-11-07)
=========================================
0016212: [Scripter] Fix docstrings for the scripter's pdfexport and print (ale)
/trunk/Scribus/OSX-package/inputs/Info.plist
3,13 → 3,13
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
<string>Scribus Installer 1.5.6</string>
<string>Scribus Installer 1.5.7.svn</string>
<key>CFBundleIdentifier</key>
<string>net.scribus.osxinstaller</string>
<key>CFBundleName</key>
<string>Scribus</string>
<key>CFBundleShortVersionString</key>
<string>1.5.6</string>
<string>1.5.7.svn</string>
<key>IFMajorVersion</key>
<integer>0</integer>
<key>IFMinorVersion</key>
/trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
3,13 → 3,13
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
<string>Scribus 1.5.6</string>
<string>Scribus 1.5.7.svn</string>
<key>CFBundleIdentifier</key>
<string>net.scribus</string>
<key>CFBundleName</key>
<string>Scribus</string>
<key>CFBundleShortVersionString</key>
<string>1.5.6</string>
<string>1.5.7.svn</string>
<key>IFMajorVersion</key>
<integer>0</integer>
<key>IFMinorVersion</key>
/trunk/Scribus/Scribus.app/Contents/Info.plist
67,7 → 67,7
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.5.6</string>
<string>1.5.7.svn</string>
<key>CFBundleSignature</key>
<string>OSCR</string>
<key>NSPrincipalClass</key>
/trunk/Scribus/config.h.cmake
9,7 → 9,7
#error "Include <scconfig.h> rather than using <config.h> directly"
#endif
 
#cmakedefine VERSION "1.5.6"
#cmakedefine VERSION "1.5.7.svn"
 
#cmakedefine BUILD_WINDOWS_VERSION 1
#cmakedefine DLL_USE_NATIVE_API 1
/trunk/Scribus/scribus/ui/about.cpp
114,7 → 114,7
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
QString BUILD_DAY = "1";
QString BUILD_DAY = "7";
QString BUILD_MONTH = CommonStrings::november;
QString BUILD_YEAR = "2020";
QString BUILD_TIME = "";
/trunk/Scribus/scribus.lsm
1,6 → 1,6
Begin4
Title: Scribus
Version: 1.5.6
Version: 1.5.7.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
/trunk/Scribus/win32/msvc2015/win-config.h
2,7 → 2,7
#define WINCONFIG_H
 
/* Version number of package */
#define VERSION "1.5.6"
#define VERSION "1.5.7.svn"
 
/* Are we building win32 native version. */
#define BUILD_WINDOWS_VERSION 1
/trunk/Scribus/win32/msvc2017/win-config.h
2,7 → 2,7
#define WINCONFIG_H
 
/* Version number of package */
#define VERSION "1.5.6"
#define VERSION "1.5.7.svn"
 
/* Are we building win32 native version. */
#define BUILD_WINDOWS_VERSION 1
/trunk/Scribus/win32/msvc2019/win-config.h
2,7 → 2,7
#define WINCONFIG_H
 
/* Version number of package */
#define VERSION "1.5.6"
#define VERSION "1.5.7.svn"
 
/* Are we building win32 native version. */
#define BUILD_WINDOWS_VERSION 1