r16910 by craig - Bump versions to rc6 and about date

scribus-commit scribus-commit at lists.scribus.net
Mon Oct 17 19:36:39 UTC 2011


Author: craig
Date: Mon Oct 17 19:36:39 2011
New Revision: 16910

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16910
Log:
Bump versions to rc6 and about date

Modified:
    branches/Version135/Scribus/CMakeLists.txt
    branches/Version135/Scribus/ChangeLog
    branches/Version135/Scribus/OSX-package/inputs/Info.plist
    branches/Version135/Scribus/README
    branches/Version135/Scribus/Scribus.app/Contents/Info.plist
    branches/Version135/Scribus/config.h.cmake
    branches/Version135/Scribus/scribus/about.cpp
    branches/Version135/Scribus/scribusversions.xml

Modified: branches/Version135/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16910&path=/branches/Version135/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version135/Scribus/CMakeLists.txt (original)
+++ branches/Version135/Scribus/CMakeLists.txt Mon Oct 17 19:36:39 2011
@@ -79,7 +79,7 @@
 SET (VERSION_MAJOR "1")
 SET (VERSION_MINOR "4")
 SET (VERSION_PATCH "0")
-SET (VERSION_SUFFIX "rc5")
+SET (VERSION_SUFFIX "rc6")
 SET (VERSION ${VERSION_MAJOR})
 IF (VERSION_MINOR GREATER -1)
   SET (VERSION ${VERSION}.${VERSION_MINOR})
@@ -863,10 +863,10 @@
   SET(CPACK_TOPLEVEL_TAG "")
   SET(CPACK_SOURCE_IGNORE_FILES
     CMakeCache.txt
-    scribus-1.4.0.rc5.tar.gz
-    scribus-1.4.0.rc5.tar.Z
-    scribus-1.4.0.rc5.gz
-    scribus-1.4.0.rc5.tar.bz2
+    scribus-1.4.0.rc6.tar.gz
+    scribus-1.4.0.rc6.tar.Z
+    scribus-1.4.0.rc6.gz
+    scribus-1.4.0.rc6.tar.bz2
     "~$"
     "\\\\.cvsignore$"
     "\\\\.o$"

Modified: branches/Version135/Scribus/ChangeLog
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16910&path=/branches/Version135/Scribus/ChangeLog
==============================================================================
--- branches/Version135/Scribus/ChangeLog (original)
+++ branches/Version135/Scribus/ChangeLog Mon Oct 17 19:36:39 2011
@@ -1,4 +1,11 @@
 Scribus - 1.4.0.rc6
+- 0010288: [Canvas] resizing a frame with keyboard is not blocked when resizing is off (jghali) - resolved.
+- 0010251: [Story Editor / Text Frames] [PATCH] wrong text formatting issues (jghali) - closed.
+- 0009902: [Graphics / Image Frames] Font letters spoiled when using text flow around frame (cbradney) - closed.
+- 0005891: [Story Editor / Text Frames] Various settings of work tracking and glyph extension make text overlap in column gap (jghali) - closed.
+- 0010174: [General] the return of the brownish color (jghali) - closed.
+- 0009436: [Story Editor / Text Frames] wrong text formating - text extend margins or columns (jghali) - closed.
+- 0009932: [Story Editor / Text Frames] First text line does not flow around objects (jghali) - closed.
 - 0010204: [Translation] Update of Slovak translation (cbradney) - resolved.
 - 0010251: [Story Editor / Text Frames] [PATCH] wrong text formatting issues (jghali) - resolved.
 - 0009436: [Story Editor / Text Frames] wrong text formating - text extend margins or columns (jghali) - resolved.

Modified: branches/Version135/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16910&path=/branches/Version135/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- branches/Version135/Scribus/OSX-package/inputs/Info.plist (original)
+++ branches/Version135/Scribus/OSX-package/inputs/Info.plist Mon Oct 17 19:36:39 2011
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>Scribus Installer 1.4.0.rc5</string>
+        <string>Scribus Installer 1.4.0.rc6</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.osxinstaller</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.4.0.rc5</string>
+        <string>1.4.0.rc6</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: branches/Version135/Scribus/README
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16910&path=/branches/Version135/Scribus/README
==============================================================================
--- branches/Version135/Scribus/README (original)
+++ branches/Version135/Scribus/README Mon Oct 17 19:36:39 2011
@@ -1,11 +1,11 @@
-SCRIBUS 1.4.0.RC5
+SCRIBUS 1.4.0.RC6
 ----------------------------------------------
 
-1.4.0.RC5 will become the next new stable version 1.4, which will replace 1.3.3.x as the officially stable Scribus version.
+1.4.0.RC6 will become the next new stable version 1.4, which will replace 1.3.3.x as the officially stable Scribus version.
 
-While 1.4.0.RC5 is considered to be usable, you may want to keep the latest 1.3.3.14 as a fallback option. Both versions can be installed in parallel. Please be aware of the fact that files saved with 1.3.4 or any later version cannot be opened by 1.3.3.x!
+While 1.4.0.RC6 is considered to be usable, you may want to keep the latest 1.3.3.14 as a fallback option. Both versions can be installed in parallel. Please be aware of the fact that files saved with 1.3.4 or any later version cannot be opened by 1.3.3.x!
 
-If you think you have found a bug in 1.4.0.RC5, you can use the Scribus bugtracker (http://bugs.scribus.net) to make us aware of it. Please make sure that the bug hasn't been reported earlier. The bugtracker's search feature can help you to check for issues that have already been submitted.
+If you think you have found a bug in 1.4.0.RC6, you can use the Scribus bugtracker (http://bugs.scribus.net) to make us aware of it. Please make sure that the bug hasn't been reported earlier. The bugtracker's search feature can help you to check for issues that have already been submitted.
 
 Compiling from Source
 =====================

Modified: branches/Version135/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16910&path=/branches/Version135/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- branches/Version135/Scribus/Scribus.app/Contents/Info.plist (original)
+++ branches/Version135/Scribus/Scribus.app/Contents/Info.plist Mon Oct 17 19:36:39 2011
@@ -67,7 +67,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0.rc5</string>
+	<string>1.4.0.rc6</string>
 	<key>CFBundleSignature</key>
 	<string>OSCR</string>
 </dict>

Modified: branches/Version135/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16910&path=/branches/Version135/Scribus/config.h.cmake
==============================================================================
--- branches/Version135/Scribus/config.h.cmake (original)
+++ branches/Version135/Scribus/config.h.cmake Mon Oct 17 19:36:39 2011
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.4.0.rc5"
+#cmakedefine VERSION "1.4.0.rc6"
 
 #cmakedefine BUILD_WINDOWS_VERSION 1
 #cmakedefine SC_USE_GDI 1

Modified: branches/Version135/Scribus/scribus/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16910&path=/branches/Version135/Scribus/scribus/about.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/about.cpp (original)
+++ branches/Version135/Scribus/scribus/about.cpp Mon Oct 17 19:36:39 2011
@@ -114,7 +114,7 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "4";
+	QString BUILD_DAY = "17";
 	QString BUILD_MONTH = CommonStrings::october;
 	QString BUILD_YEAR = "2011";
 	QString BUILD_TIME = "";

Modified: branches/Version135/Scribus/scribusversions.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16910&path=/branches/Version135/Scribus/scribusversions.xml
==============================================================================
--- branches/Version135/Scribus/scribusversions.xml (original)
+++ branches/Version135/Scribus/scribusversions.xml Mon Oct 17 19:36:39 2011
@@ -8,13 +8,13 @@
   <release platform="OS2" stability="stablesvn" version="1.3.3.14" />
   <release platform="MacOSX" stability="stablesvn" version="1.3.3.14" />
   <release platform="Win32" stability="stablesvn" version="1.3.3.14" />
-  <release platform="X11" stability="unstable" version="1.4.0.RC5" />
-  <release platform="Win32" stability="unstable" version="1.4.0.RC5" />
-  <release platform="MacOSX" stability="unstable" version="1.4.0.RC5" />
-  <release platform="OS2" stability="unstable" version="1.4.0.RC5" />
+  <release platform="X11" stability="unstable" version="1.4.0.RC6" />
+  <release platform="Win32" stability="unstable" version="1.4.0.RC6" />
+  <release platform="MacOSX" stability="unstable" version="1.4.0.RC6" />
+  <release platform="OS2" stability="unstable" version="1.4.0.RC6" />
   <release platform="X11" stability="unstablesvn" version="1.5.0.svn" />
   <release platform="Win32" stability="unstablesvn" version="1.5.0.svn" />
   <release platform="MacOSX" stability="unstablesvn" version="1.5.0.svn" />
   <release platform="OS2" stability="unstablesvn" version="1.5.0.svn" />
-  <message lang="en" > - Scribus 1.3.3.14 is the latest stable release.<![CDATA[<br>]]> - We have stabilised 1.3.3.x for those wishing to use some new features of the 1.3.x series but need more stability.<![CDATA[<br>]]> - Scribus 1.4.0.RC5 was released 18 June 2011 </message>
+  <message lang="en" > - Scribus 1.3.3.14 is the latest stable release.<![CDATA[<br>]]> - We have stabilised 1.3.3.x for those wishing to use some new features of the 1.3.x series but need more stability.<![CDATA[<br>]]> - Scribus 1.4.0.RC6 was released October 2011 </message>
 </scribus>




More information about the scribus-commit mailing list