From 6b01821091302ce91ed43051b2f87d6b103a6c83 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 21 Feb 2018 22:02:26 +0000 Subject: [PATCH 1/2] Bump version --- SparkleShare/Mac/Info.plist | 4 ++-- SparkleShare/Windows/SparkleShare.wxs | 2 +- Sparkles/InstallationInfo.Directory.cs | 2 +- meson.build | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SparkleShare/Mac/Info.plist b/SparkleShare/Mac/Info.plist index 3df3ed24..5616f171 100755 --- a/SparkleShare/Mac/Info.plist +++ b/SparkleShare/Mac/Info.plist @@ -9,9 +9,9 @@ CFBundleName SparkleShare CFBundleShortVersionString - 2.0.1 + 3.28.0 CFBundleVersion - 2.0.1 + 3.28.0 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/SparkleShare/Windows/SparkleShare.wxs b/SparkleShare/Windows/SparkleShare.wxs index 6ca687b2..aadac8be 100644 --- a/SparkleShare/Windows/SparkleShare.wxs +++ b/SparkleShare/Windows/SparkleShare.wxs @@ -2,7 +2,7 @@ + Language='1033' Codepage='1252' Version='3.28.0' Manufacturer='SparkleShare'> diff --git a/Sparkles/InstallationInfo.Directory.cs b/Sparkles/InstallationInfo.Directory.cs index 13e5bfe1..f7e1bd7d 100644 --- a/Sparkles/InstallationInfo.Directory.cs +++ b/Sparkles/InstallationInfo.Directory.cs @@ -18,7 +18,7 @@ using System.Reflection; [assembly:AssemblyTitle ("Sparkles")] -[assembly:AssemblyVersion ("2.0.1")] +[assembly:AssemblyVersion ("3.28.0")] [assembly:AssemblyCopyright ("Copyright (c) 2010 Hylke Bons and others")] namespace Sparkles { diff --git a/meson.build b/meson.build index cfd9d4ac..55a6785a 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ configuration = configuration_data() configuration.set('ABS_INSTALL_DIR', join_paths(get_option('prefix'), install_dir)) # This line is changed by scripts/bump-version.sh, so keep it intact -configuration.set('VERSION', '2.0.1') +configuration.set('VERSION', '3.28.0') subdir('Sparkles') subdir('Sparkles/Git') From 33a58eb09a924b0acc5761e24d373c50003491c6 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 21 Feb 2018 22:02:45 +0000 Subject: [PATCH 2/2] Update release notes for next version --- RELEASE_NOTES.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 65592b41..954321d1 100755 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,3 +1,10 @@ +3.28.0 (???): + + - + - + - + + 2.0.1 (Tue 19 Dec, 2017): - Fix files created by conflict resolution being moved to the root folder