r24827 by craig - Bump Version15x branche to 1.5.9.svn

scribus-commit scribus-commit at lists.scribus.net
Thu Jan 27 22:58:22 UTC 2022


Author: craig
Date: Thu Jan 27 22:58:22 2022
New Revision: 24827

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24827
Log:
Bump Version15x branche to 1.5.9.svn

Modified:
    branches/Version15x/Scribus/CMakeLists.txt
    branches/Version15x/Scribus/ChangeLog
    branches/Version15x/Scribus/OSX-package/inputs/Info.plist
    branches/Version15x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
    branches/Version15x/Scribus/Scribus.app/Contents/Info.plist
    branches/Version15x/Scribus/config.h.cmake
    branches/Version15x/Scribus/scribus.lsm
    branches/Version15x/Scribus/scribus/pageitem_textframe.cpp
    branches/Version15x/Scribus/scribus/ui/about.cpp

Modified: branches/Version15x/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24827&path=/branches/Version15x/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version15x/Scribus/CMakeLists.txt	(original)
+++ branches/Version15x/Scribus/CMakeLists.txt	Thu Jan 27 22:58:22 2022
@@ -31,8 +31,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 "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})
@@ -605,12 +605,12 @@
 	set(CPACK_TOPLEVEL_TAG "")
 	set(CPACK_SOURCE_IGNORE_FILES
 		CMakeCache.txt
-		scribus-1.5.8.tar.bz2
-		scribus-1.5.8.tar.7z
-		scribus-1.5.8.tar.gz
-		scribus-1.5.8.svn.tar.bz2
-		scribus-1.5.8.svn.tar.7z
-		scribus-1.5.8.svn.tar.gz
+		scribus-1.5.9.tar.bz2
+		scribus-1.5.9.tar.7z
+		scribus-1.5.9.tar.gz
+		scribus-1.5.9.svn.tar.bz2
+		scribus-1.5.9.svn.tar.7z
+		scribus-1.5.9.svn.tar.gz
 		"~$"
 		"\\\\.cvsignore$"
 		"\\\\.o$"

Modified: branches/Version15x/Scribus/ChangeLog
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24827&path=/branches/Version15x/Scribus/ChangeLog
==============================================================================
--- branches/Version15x/Scribus/ChangeLog	(original)
+++ branches/Version15x/Scribus/ChangeLog	Thu Jan 27 22:58:22 2022
@@ -1,3 +1,6 @@
+Scribus - 1.5.9 (Released 2022-xx-xx)
+=========================================
+
 Scribus - 1.5.8 (Released 2022-01-23)
 =========================================
 0016726: [General] Duplicate paragraph among linked text frames (jghali)

Modified: branches/Version15x/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24827&path=/branches/Version15x/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- branches/Version15x/Scribus/OSX-package/inputs/Info.plist	(original)
+++ branches/Version15x/Scribus/OSX-package/inputs/Info.plist	Thu Jan 27 22:58:22 2022
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus Installer 1.5.8</string>
+	<string>Scribus Installer 1.5.9.svn</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus.osxinstaller</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.8</string>
+	<string>1.5.9.svn</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: branches/Version15x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24827&path=/branches/Version15x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
==============================================================================
--- branches/Version15x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	(original)
+++ branches/Version15x/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	Thu Jan 27 22:58:22 2022
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus 1.5.8</string>
+	<string>Scribus 1.5.9.svn</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.8</string>
+	<string>1.5.9.svn</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: branches/Version15x/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24827&path=/branches/Version15x/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- branches/Version15x/Scribus/Scribus.app/Contents/Info.plist	(original)
+++ branches/Version15x/Scribus/Scribus.app/Contents/Info.plist	Thu Jan 27 22:58:22 2022
@@ -67,7 +67,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.8</string>
+	<string>1.5.9.svn</string>
 	<key>CFBundleSignature</key>
 	<string>OSCR</string>
 	<key>NSPrincipalClass</key>

Modified: branches/Version15x/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24827&path=/branches/Version15x/Scribus/config.h.cmake
==============================================================================
--- branches/Version15x/Scribus/config.h.cmake	(original)
+++ branches/Version15x/Scribus/config.h.cmake	Thu Jan 27 22:58:22 2022
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.5.8"
+#cmakedefine VERSION "1.5.9.svn"
 
 #cmakedefine BUILD_MAC_BUNDLE
 #cmakedefine BUILD_WINDOWS_VERSION 1

Modified: branches/Version15x/Scribus/scribus.lsm
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24827&path=/branches/Version15x/Scribus/scribus.lsm
==============================================================================
--- branches/Version15x/Scribus/scribus.lsm	(original)
+++ branches/Version15x/Scribus/scribus.lsm	Thu Jan 27 22:58:22 2022
@@ -1,6 +1,6 @@
 Begin4
 Title:           Scribus 
-Version:         1.5.8
+Version:         1.5.9.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: branches/Version15x/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24827&path=/branches/Version15x/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- branches/Version15x/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ branches/Version15x/Scribus/scribus/pageitem_textframe.cpp	Thu Jan 27 22:58:22 2022
@@ -4537,7 +4537,7 @@
 					notes2DEL.append(QPair<TextNote*, int>(mark->getNotePtr(), i));
 			}
 		}
-		else
+		else if (!itemText.hasMark(start))
 		{
 			//delete marks from selected text (with undo)
 			marksNum = removeMarksFromText(true);

Modified: branches/Version15x/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24827&path=/branches/Version15x/Scribus/scribus/ui/about.cpp
==============================================================================
--- branches/Version15x/Scribus/scribus/ui/about.cpp	(original)
+++ branches/Version15x/Scribus/scribus/ui/about.cpp	Thu Jan 27 22:58:22 2022
@@ -126,7 +126,7 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "23";
+	QString BUILD_DAY = "27";
 	QString BUILD_MONTH = CommonStrings::january;
 	QString BUILD_YEAR = "2022";
 	QString BUILD_TIME = "";




More information about the scribus-commit mailing list