r21325 by craig -
scribus-commit
scribus-commit at lists.scribus.net
Mon May 16 13:17:40 UTC 2016
Author: craig
Date: Mon May 16 13:17:39 2016
New Revision: 21325
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21325
Log:
Bump Changelog again, bump versions
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/Scribus.pro
trunk/Scribus/config.h.cmake
trunk/Scribus/resources/versions/scribusversions.xml
trunk/Scribus/scribus.lsm
Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21325&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Mon May 16 13:17:39 2016
@@ -33,6 +33,7 @@
INCLUDE(CheckTypeSize)
INCLUDE(TestBigEndian)
INCLUDE(GNUInstallDirs)
+#INCLUDE(FeatureSummary)
#ENABLE_TESTING()
@@ -51,7 +52,7 @@
SET (VERSION_MAJOR "1")
SET (VERSION_MINOR "5")
SET (VERSION_PATCH "2")
-SET (VERSION_SUFFIX "svn")
+SET (VERSION_SUFFIX "")
SET (VERSION ${VERSION_MAJOR})
IF (VERSION_MINOR GREATER -1)
SET (VERSION ${VERSION}.${VERSION_MINOR})
@@ -1061,6 +1062,9 @@
SET(CPACK_TOPLEVEL_TAG "")
SET(CPACK_SOURCE_IGNORE_FILES
CMakeCache.txt
+ scribus-1.5.2.tar.bz2
+ scribus-1.5.2.tar.Z
+ scribus-1.5.2.tar.gz
scribus-1.5.2.svn.tar.bz2
scribus-1.5.2.svn.tar.Z
scribus-1.5.2.svn.tar.gz
@@ -1079,3 +1083,6 @@
ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
#include (cmakeconfigreport optional)
+
+# Output everything we've found
+#feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES)
Modified: trunk/Scribus/ChangeLog
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21325&path=/trunk/Scribus/ChangeLog
==============================================================================
--- trunk/Scribus/ChangeLog (original)
+++ trunk/Scribus/ChangeLog Mon May 16 13:17:39 2016
@@ -1,14 +1,20 @@
-Scribus - 1.5.2 (Released 2016-05-xx)
+Scribus - 1.5.2 (Released 2016-05-17)
=========================================
-- 0013204: [Usability] Unusably tiny tool icons on HiDPI screen on Ubuntu Unity desktop (fschmid) - resolved.
-- 0014043: [Usability] Ungrouping with flipped objects, objects are not positioned correctly (fschmid) - resolved.
-- 0013242: [Story Editor / Text Frames] changing text size spinboxes in SE loses focus on intended text (+ mysteriously increments text size +1) - resolved.
-- 0013894: [Typography] "Paragraph Effects" for numbered (or un-numbered) lists get removed when creating a new line or pressing backspace (jghali) - resolved.
-- 0013896: [Usability] Widgets inconsistently enabled in colors tab of PDF export settings in Document Setup (jghali) - resolved.
-- 0013897: [General] Pathtext distance from path not working in r21140 (jghali) - resolved.
-- 0013869: [Typography] DropCaps do not work correctly on 1st Paragraph (jghali) - resolved.
-- 0013852: [Import / Export] XPS export of Text is broken. (fschmid) - resolved.
-- 0013107: [OS-Win32] Wrong language on document closing dialogue: Save - Close without Saving - Cancel (cbradney) - resolved.
+- 0010723: [User Interface] Incorrect rubber band box selection bounds after selecting text. - closed.
+- 0013465: [User Interface] Drag/Drop of HTML to text frame (fschmid) - closed.
+- 0014044: [Translation] Duplicate "Pfad glätten" in german translation (christoph_s) - closed.
+- 0014059: [General] "Print Layer" is not in sync with Preview Mode (fschmid) - closed.
+- 0014060: [Integration] Crash when using dropping image onto image frame via digikam or nemo (fschmid) - closed.
+- 0014064: [Canvas] bezier curve + text frame + text to path = crash (fschmid) - closed.
+- 0013107: [OS-Win32] Wrong language on document closing dialogue: Save - Close without Saving - Cancel (cbradney) - closed.
+- 0013852: [Import / Export] XPS export of Text is broken. (fschmid) - closed.
+- 0013869: [Typography] DropCaps do not work correctly on 1st Paragraph (jghali) - closed.
+- 0013894: [Typography] "Paragraph Effects" for numbered (or un-numbered) lists get removed when creating a new line or pressing backspace (jghali) - closed.
+- 0013896: [Usability] Widgets inconsistently enabled in colors tab of PDF export settings in Document Setup (jghali) - closed.
+- 0013897: [General] Pathtext distance from path not working in r21140 (jghali) - closed.
+- 0013204: [Usability] Unusably tiny tool icons on HiDPI screen on Ubuntu Unity desktop (fschmid) - closed.
+- 0013242: [Story Editor / Text Frames] changing text size spinboxes in SE loses focus on intended text (+ mysteriously increments text size +1) - closed.
+- 0014043: [Usability] Ungrouping with flipped objects, objects are not positioned correctly (fschmid) - closed.
- 0014062: [General] Text aligned to baseline grid in 1.4.x is loaded jumping even lines in 1.5.2.svn (jghali) - closed.
- 0003725: [Usability] wrong snapping when resizing objects off page (jghali) - closed.
- 0007312: [User Interface] Drag/Drop of ODT to text frame outputs gibberish (fschmid) - closed.
Modified: trunk/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21325&path=/trunk/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- trunk/Scribus/OSX-package/inputs/Info.plist (original)
+++ trunk/Scribus/OSX-package/inputs/Info.plist Mon May 16 13:17:39 2016
@@ -3,13 +3,13 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>Scribus Installer 1.5.2.svn</string>
+ <string>Scribus Installer 1.5.2</string>
<key>CFBundleIdentifier</key>
<string>net.scribus.osxinstaller</string>
<key>CFBundleName</key>
<string>Scribus</string>
<key>CFBundleShortVersionString</key>
- <string>1.5.2.svn</string>
+ <string>1.5.2</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=21325&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 Mon May 16 13:17:39 2016
@@ -3,13 +3,13 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>Scribus 1.5.2.svn</string>
+ <string>Scribus 1.5.2</string>
<key>CFBundleIdentifier</key>
<string>net.scribus.aqua</string>
<key>CFBundleName</key>
<string>Scribus</string>
<key>CFBundleShortVersionString</key>
- <string>1.5.2.svn</string>
+ <string>1.5.2</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=21325&path=/trunk/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- trunk/Scribus/Scribus.app/Contents/Info.plist (original)
+++ trunk/Scribus/Scribus.app/Contents/Info.plist Mon May 16 13:17:39 2016
@@ -67,7 +67,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.5.2.svn</string>
+ <string>1.5.2</string>
<key>CFBundleSignature</key>
<string>OSCR</string>
<key>NSPrincipalClass</key>
Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21325&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro (original)
+++ trunk/Scribus/Scribus.pro Mon May 16 13:17:39 2016
@@ -1,5 +1,5 @@
######################################################################
-# Automatically generated by qmake (3.0) Sun Apr 17 00:23:32 2016
+# Automatically generated by qmake (3.0) Sun May 15 23:07:06 2016
######################################################################
INCLUDEPATH+=./scribus
@@ -1025,6 +1025,8 @@
scribus/ui/prefs_preflightverifierbase.ui \
scribus/ui/prefs_printerbase.ui \
scribus/ui/prefs_scrapbookbase.ui \
+ scribus/ui/prefs_scripterbase.ui \
+ scribus/ui/prefs_shortwordsbase.ui \
scribus/ui/prefs_spellingbase.ui \
scribus/ui/prefs_tableofcontentsbase.ui \
scribus/ui/prefs_typographybase.ui \
Modified: trunk/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21325&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake (original)
+++ trunk/Scribus/config.h.cmake Mon May 16 13:17:39 2016
@@ -9,7 +9,7 @@
#error "Include <scconfig.h> rather than using <config.h> directly"
#endif
-#cmakedefine VERSION "1.5.2.svn"
+#cmakedefine VERSION "1.5.2"
#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=21325&path=/trunk/Scribus/resources/versions/scribusversions.xml
==============================================================================
--- trunk/Scribus/resources/versions/scribusversions.xml (original)
+++ trunk/Scribus/resources/versions/scribusversions.xml Mon May 16 13:17:39 2016
@@ -8,13 +8,13 @@
<release platform="OS2" stability="stablesvn" version="1.4.7.svn" />
<release platform="MacOSX" stability="stablesvn" version="1.4.7.svn" />
<release platform="Win32" stability="stablesvn" version="1.4.7.svn" />
- <release platform="X11" stability="unstable" version="1.5.1" />
- <release platform="Win32" stability="unstable" version="1.5.1" />
- <release platform="MacOSX" stability="unstable" version="1.5.1" />
- <release platform="OS2" stability="unstable" version="1.5.1" />
- <release platform="X11" stability="unstablesvn" version="1.5.2.svn" />
- <release platform="Win32" stability="unstablesvn" version="1.5.2.svn" />
- <release platform="MacOSX" stability="unstablesvn" version="1.5.2.svn" />
- <release platform="OS2" stability="unstablesvn" version="1.5.2.svn" />
- <message lang="en" > - Scribus 1.4.6 is the latest stable release, released January 12 2016.<![CDATA[<br>]]> - Scribus 1.5.1 is the current development version, release February 14, 2016. </message>
+ <release platform="X11" stability="unstable" version="1.5.2" />
+ <release platform="Win32" stability="unstable" version="1.5.2" />
+ <release platform="MacOSX" stability="unstable" version="1.5.2" />
+ <release platform="OS2" stability="unstable" version="1.5.2" />
+ <release platform="X11" stability="unstablesvn" version="1.5.3.svn" />
+ <release platform="Win32" stability="unstablesvn" version="1.5.3.svn" />
+ <release platform="MacOSX" stability="unstablesvn" version="1.5.3.svn" />
+ <release platform="OS2" stability="unstablesvn" version="1.5.3.svn" />
+ <message lang="en" > - Scribus 1.4.6 is the latest stable release, released January 12 2016.<![CDATA[<br>]]> - Scribus 1.5.2 is the current development version, release May 17, 2016. </message>
</scribus>
Modified: trunk/Scribus/scribus.lsm
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21325&path=/trunk/Scribus/scribus.lsm
==============================================================================
--- trunk/Scribus/scribus.lsm (original)
+++ trunk/Scribus/scribus.lsm Mon May 16 13:17:39 2016
@@ -1,6 +1,6 @@
Begin4
Title: Scribus
-Version: 1.5.2.svn
+Version: 1.5.2
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
@@ -9,6 +9,6 @@
Primary-site: http://www.scribus.net
Alternate-site: http://www.scribus.org.uk/
Original-site: http://web2.altmuehlnet.de/fschmid
-Platforms: Linux and other Unices, MacOSX, Requires: Python >= 2.7, Qt >= 5.2+, cairo >= 2.4, freetype2 >=2.1.9
+Platforms: Linux and other Unices, MacOSX, Requires: Python >= 2.7, Qt >= 5.3+, cairo >= 2.4, freetype2 >=2.1.9
Copying-policy: GNU Public License
End
More information about the scribus-commit
mailing list