Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 23067 → Rev 23068

/branches/Version14x/Scribus/CMakeLists.txt
79,8 → 79,8
#where VERSION_SUFFIX is of the form "", "svn" or "Nsvn" (N being the minor patch level)
SET (VERSION_MAJOR "1")
SET (VERSION_MINOR "4")
SET (VERSION_PATCH "8")
SET (VERSION_SUFFIX "")
SET (VERSION_PATCH "9")
SET (VERSION_SUFFIX "svn")
SET (VERSION ${VERSION_MAJOR})
IF (VERSION_MINOR GREATER -1)
SET (VERSION ${VERSION}.${VERSION_MINOR})
997,18 → 997,18
SET(CPACK_TOPLEVEL_TAG "")
SET(CPACK_SOURCE_IGNORE_FILES
CMakeCache.txt
scribus-1.4.8.svn.tar.gz
scribus-1.4.8.svn.tar.Z
scribus-1.4.8.svn.tar.xz
scribus-1.4.8.svn.gz
scribus-1.4.8.svn.tar.bz2
scribus-1.4.8.svn.tar.7z
scribus-1.4.8.tar.gz
scribus-1.4.8.tar.Z
scribus-1.4.8.tar.xz
scribus-1.4.8.gz
scribus-1.4.8.tar.bz2
scribus-1.4.8.tar.7z
scribus-1.4.9.svn.tar.gz
scribus-1.4.9.svn.tar.Z
scribus-1.4.9.svn.tar.xz
scribus-1.4.9.svn.gz
scribus-1.4.9.svn.tar.bz2
scribus-1.4.9.svn.tar.7z
scribus-1.4.9.tar.gz
scribus-1.4.9.tar.Z
scribus-1.4.9.tar.xz
scribus-1.4.9.gz
scribus-1.4.9.tar.bz2
scribus-1.4.9.tar.7z
"~$"
"\\\\.cvsignore$"
"\\\\.o$"
/branches/Version14x/Scribus/OSX-package/inputs/Info.plist
3,13 → 3,13
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
<string>Scribus Installer 1.4.8</string>
<string>Scribus Installer 1.4.9.svn</string>
<key>CFBundleIdentifier</key>
<string>net.scribus.osxinstaller</string>
<key>CFBundleName</key>
<string>Scribus</string>
<key>CFBundleShortVersionString</key>
<string>1.4.8</string>
<string>1.4.9.svn</string>
<key>IFMajorVersion</key>
<integer>0</integer>
<key>IFMinorVersion</key>
/branches/Version14x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
3,13 → 3,13
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
<string>Scribus 1.4.8</string>
<string>Scribus 1.4.9.svn</string>
<key>CFBundleIdentifier</key>
<string>net.scribus.aqua</string>
<key>CFBundleName</key>
<string>Scribus</string>
<key>CFBundleShortVersionString</key>
<string>1.4.8</string>
<string>1.4.9.svn</string>
<key>IFMajorVersion</key>
<integer>0</integer>
<key>IFMinorVersion</key>
/branches/Version14x/Scribus/Scribus.app/Contents/Info.plist
67,7 → 67,7
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.8</string>
<string>1.4.9.svn</string>
<key>CFBundleSignature</key>
<string>OSCR</string>
</dict>
/branches/Version14x/Scribus/config.h.cmake
9,7 → 9,7
#error "Include <scconfig.h> rather than using <config.h> directly"
#endif
 
#cmakedefine VERSION "1.4.8"
#cmakedefine VERSION "1.4.9.svn"
 
#cmakedefine BUILD_WINDOWS_VERSION 1
#cmakedefine SC_USE_GDI 1
/branches/Version14x/Scribus/resources/icons/Splash.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version14x/Scribus/resources/icons/scribus_logo.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version14x/Scribus/scribus/about.cpp
114,8 → 114,8
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
QString BUILD_DAY = "03";
QString BUILD_MONTH = CommonStrings::march;
QString BUILD_DAY = "04";
QString BUILD_MONTH = CommonStrings::july;
QString BUILD_YEAR = "2019";
QString BUILD_TIME = "";
QString BUILD_TZ = "";
/branches/Version14x/Scribus/win32/msvc2008/scribus-exe/scribus.rc
75,8 → 75,8
//
 
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,8,0
PRODUCTVERSION 1,4,8,0
FILEVERSION 1,4,9,0
PRODUCTVERSION 1,4,9,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
92,13 → 92,13
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "The Scribus Team"
VALUE "FileDescription", "Scribus 1.4.8"
VALUE "FileVersion", "1.4.8"
VALUE "InternalName", "Scribus 1.4.8"
VALUE "FileDescription", "Scribus 1.4.9.svn"
VALUE "FileVersion", "1.4.9"
VALUE "InternalName", "Scribus 1.4.9.svn"
VALUE "LegalCopyright", "Copyright (C) 2001-2019 by The Scribus Team"
VALUE "OriginalFilename", "Scribus.exe"
VALUE "ProductName", "Scribus - Open Source Desktop Publishing"
VALUE "ProductVersion", "1.4.8"
VALUE "ProductVersion", "1.4.9"
END
END
BLOCK "VarFileInfo"
/branches/Version14x/Scribus/win32/msvc2008/win-config.h
2,7 → 2,7
#define WINCONFIG_H
 
/* Version number of package */
#define VERSION "1.4.8"
#define VERSION "1.4.9.svn"
 
/* Are we building win32 native version. */
#define BUILD_WINDOWS_VERSION 1
/branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.rc
75,8 → 75,8
//
 
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,8,0
PRODUCTVERSION 1,4,8,0
FILEVERSION 1,4,9,0
PRODUCTVERSION 1,4,9,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
92,13 → 92,13
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "The Scribus Team"
VALUE "FileDescription", "Scribus 1.4.8"
VALUE "FileVersion", "1.4.8"
VALUE "InternalName", "Scribus 1.4.8"
VALUE "FileDescription", "Scribus 1.4.9.svn"
VALUE "FileVersion", "1.4.9"
VALUE "InternalName", "Scribus 1.4.9.svn"
VALUE "LegalCopyright", "Copyright (C) 2001-2019 by The Scribus Team"
VALUE "OriginalFilename", "Scribus.exe"
VALUE "ProductName", "Scribus - Open Source Desktop Publishing"
VALUE "ProductVersion", "1.4.8"
VALUE "ProductVersion", "1.4.9"
END
END
BLOCK "VarFileInfo"
/branches/Version14x/Scribus/win32/msvc2012/win-config.h
2,7 → 2,7
#define WINCONFIG_H
 
/* Version number of package */
#define VERSION "1.4.8"
#define VERSION "1.4.9.svn"
 
/* Are we building win32 native version. */
#define BUILD_WINDOWS_VERSION 1
/branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.rc
75,8 → 75,8
//
 
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,8,0
PRODUCTVERSION 1,4,8,0
FILEVERSION 1,4,9,0
PRODUCTVERSION 1,4,9,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
92,13 → 92,13
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "The Scribus Team"
VALUE "FileDescription", "Scribus 1.4.8"
VALUE "FileVersion", "1.4.8"
VALUE "InternalName", "Scribus 1.4.8"
VALUE "FileDescription", "Scribus 1.4.9.svn"
VALUE "FileVersion", "1.4.9"
VALUE "InternalName", "Scribus 1.4.9.svn"
VALUE "LegalCopyright", "Copyright (C) 2001-2019 by The Scribus Team"
VALUE "OriginalFilename", "Scribus.exe"
VALUE "ProductName", "Scribus - Open Source Desktop Publishing"
VALUE "ProductVersion", "1.4.8"
VALUE "ProductVersion", "1.4.9"
END
END
BLOCK "VarFileInfo"
/branches/Version14x/Scribus/win32/msvc2013/win-config.h
2,7 → 2,7
#define WINCONFIG_H
 
/* Version number of package */
#define VERSION "1.4.8"
#define VERSION "1.4.9.svn"
 
/* Are we building win32 native version. */
#define BUILD_WINDOWS_VERSION 1
/branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.rc
75,8 → 75,8
//
 
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,8,0
PRODUCTVERSION 1,4,8,0
FILEVERSION 1,4,9,0
PRODUCTVERSION 1,4,9,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
92,13 → 92,13
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "The Scribus Team"
VALUE "FileDescription", "Scribus 1.4.8"
VALUE "FileVersion", "1.4.8"
VALUE "InternalName", "Scribus 1.4.8"
VALUE "FileDescription", "Scribus 1.4.9.svn"
VALUE "FileVersion", "1.4.9"
VALUE "InternalName", "Scribus 1.4.9.svn"
VALUE "LegalCopyright", "Copyright (C) 2001-2019 by The Scribus Team"
VALUE "OriginalFilename", "Scribus.exe"
VALUE "ProductName", "Scribus - Open Source Desktop Publishing"
VALUE "ProductVersion", "1.4.8"
VALUE "ProductVersion", "1.4.9"
END
END
BLOCK "VarFileInfo"
/branches/Version14x/Scribus/win32/msvc2015/win-config.h
2,7 → 2,7
#define WINCONFIG_H
 
/* Version number of package */
#define VERSION "1.4.8"
#define VERSION "1.4.9.svn"
 
/* Are we building win32 native version. */
#define BUILD_WINDOWS_VERSION 1