Merge pull request #1812 from hbons/feature/gnome-release-schedule

Use GNOME version numbers
This commit is contained in:
Hylke Bons 2018-02-22 22:15:08 +00:00 committed by GitHub
commit 5adac2162a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 5 deletions

View file

@ -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

View file

@ -9,9 +9,9 @@
<key>CFBundleName</key>
<string>SparkleShare</string>
<key>CFBundleShortVersionString</key>
<string>2.0.1</string>
<string>3.28.0</string>
<key>CFBundleVersion</key>
<string>2.0.1</string>
<string>3.28.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>

View file

@ -2,7 +2,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name='SparkleShare' Id='184950D5-67F6-4D06-9717-7E2F1607A7B0' UpgradeCode='D3DF1D99-87F5-47A7-A349-863DD6E4B73A'
Language='1033' Codepage='1252' Version='2.0.1' Manufacturer='SparkleShare'>
Language='1033' Codepage='1252' Version='3.28.0' Manufacturer='SparkleShare'>
<Package Id='*' Keywords='Installer' Description="SparkleShare Setup" Manufacturer='SparkleShare'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />

View file

@ -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 {

View file

@ -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')