From 9522b01e8b93e974e5cc6df080431397a731db66 Mon Sep 17 00:00:00 2001 From: Cameron White Date: Sun, 18 May 2014 17:28:46 -0400 Subject: [PATCH] Bump version numbers to 1.6. Although we haven't released 1.5 yet, we need to merge last year's GSOC work into master before this year's GSOC work begins. --- Pinta.Core/Effects/BaseEffect.cs | 2 +- Pinta.Core/Properties/AssemblyInfo.cs | 2 +- Pinta.Effects/Properties/AssemblyInfo.cs | 8 ++++---- Pinta.Gui.Widgets/Properties/AssemblyInfo.cs | 2 +- Pinta.Resources/Properties/AssemblyInfo.cs | 2 +- Pinta.Tools/Properties/AssemblyInfo.cs | 8 ++++---- Pinta/AddinSetupService.cs | 4 ++-- Pinta/Dialogs/AboutPintaTabPage.cs | 4 ++-- Pinta/Properties/AssemblyInfo.cs | 2 +- Wix/common.wxi | 4 ++-- configure.ac | 2 +- osx/Info.plist | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Pinta.Core/Effects/BaseEffect.cs b/Pinta.Core/Effects/BaseEffect.cs index 1ddccac045..fcc0d4de21 100644 --- a/Pinta.Core/Effects/BaseEffect.cs +++ b/Pinta.Core/Effects/BaseEffect.cs @@ -29,7 +29,7 @@ using Mono.Unix; using Mono.Addins; -[assembly: AddinRoot ("Pinta", "1.5")] +[assembly: AddinRoot ("Pinta", "1.6")] namespace Pinta.Core { diff --git a/Pinta.Core/Properties/AssemblyInfo.cs b/Pinta.Core/Properties/AssemblyInfo.cs index aa55acadc9..63947b930d 100644 --- a/Pinta.Core/Properties/AssemblyInfo.cs +++ b/Pinta.Core/Properties/AssemblyInfo.cs @@ -17,7 +17,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.6.0.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/Pinta.Effects/Properties/AssemblyInfo.cs b/Pinta.Effects/Properties/AssemblyInfo.cs index c85bc0c32d..0e1dd4ae9e 100644 --- a/Pinta.Effects/Properties/AssemblyInfo.cs +++ b/Pinta.Effects/Properties/AssemblyInfo.cs @@ -33,10 +33,10 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.5.0.0")] -[assembly: AssemblyFileVersion ("1.5.0.0")] +[assembly: AssemblyVersion ("1.6.0.0")] +[assembly: AssemblyFileVersion ("1.6.0.0")] -[assembly: Addin ("DefaultEffects", "1.5", Category = "Core")] +[assembly: Addin ("DefaultEffects", "1.6", Category = "Core")] [assembly: AddinName ("Default Effects")] [assembly: AddinDescription ("The default adjustments and effects that ship with Pinta")] -[assembly: AddinDependency ("Pinta", "1.5")] +[assembly: AddinDependency ("Pinta", "1.6")] diff --git a/Pinta.Gui.Widgets/Properties/AssemblyInfo.cs b/Pinta.Gui.Widgets/Properties/AssemblyInfo.cs index cdfb0032c0..d96a5eb273 100644 --- a/Pinta.Gui.Widgets/Properties/AssemblyInfo.cs +++ b/Pinta.Gui.Widgets/Properties/AssemblyInfo.cs @@ -42,7 +42,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.6.0.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/Pinta.Resources/Properties/AssemblyInfo.cs b/Pinta.Resources/Properties/AssemblyInfo.cs index c6f42e64bc..3be541803d 100644 --- a/Pinta.Resources/Properties/AssemblyInfo.cs +++ b/Pinta.Resources/Properties/AssemblyInfo.cs @@ -17,7 +17,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.6.0.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/Pinta.Tools/Properties/AssemblyInfo.cs b/Pinta.Tools/Properties/AssemblyInfo.cs index 5bb29b931e..5cfedff1d3 100644 --- a/Pinta.Tools/Properties/AssemblyInfo.cs +++ b/Pinta.Tools/Properties/AssemblyInfo.cs @@ -33,10 +33,10 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.5.0.0")] -[assembly: AssemblyFileVersion ("1.5.0.0")] +[assembly: AssemblyVersion ("1.6.0.0")] +[assembly: AssemblyFileVersion ("1.6.0.0")] -[assembly: Addin ("DefaultTools", "1.5", Category = "Core")] +[assembly: Addin ("DefaultTools", "1.6", Category = "Core")] [assembly: AddinName ("Default Tools")] [assembly: AddinDescription ("The default tools and brushes that ship with Pinta")] -[assembly: AddinDependency ("Pinta", "1.5")] +[assembly: AddinDependency ("Pinta", "1.6")] diff --git a/Pinta/AddinSetupService.cs b/Pinta/AddinSetupService.cs index bec081f550..2d03187da0 100644 --- a/Pinta/AddinSetupService.cs +++ b/Pinta/AddinSetupService.cs @@ -73,13 +73,13 @@ public string GetPlatformRepositoryUrl () platform = "Linux"; //TODO: Need to change version number here - return "http://178.79.177.109:8080/Stable/" + platform + "/" + "1.5" + "/main.mrep"; + return "http://178.79.177.109:8080/Stable/" + platform + "/" + "1.6" + "/main.mrep"; } public string GetAllRepositoryUrl () { //TODO: Need to change version number here - return "http://178.79.177.109:8080/Stable/All/" + "1.5" + "/main.mrep"; + return "http://178.79.177.109:8080/Stable/All/" + "1.6" + "/main.mrep"; } } } diff --git a/Pinta/Dialogs/AboutPintaTabPage.cs b/Pinta/Dialogs/AboutPintaTabPage.cs index 306fc6948b..c69bb020b8 100644 --- a/Pinta/Dialogs/AboutPintaTabPage.cs +++ b/Pinta/Dialogs/AboutPintaTabPage.cs @@ -39,7 +39,7 @@ public AboutPintaTabPage () label.Markup = String.Format ( "{0}\n {1}", Catalog.GetString ("Version"), - "1.5"); + "1.6"); HBox hBoxVersion = new HBox (); hBoxVersion.PackStart (label, false, false, 5); @@ -54,7 +54,7 @@ public AboutPintaTabPage () label = null; label = new Label (); - label.Markup = string.Format ("{0}\n (c) 2010-2013 {1}", Catalog.GetString ("Copyright"), Catalog.GetString ("by Pinta contributors")); + label.Markup = string.Format ("{0}\n (c) 2010-2014 {1}", Catalog.GetString ("Copyright"), Catalog.GetString ("by Pinta contributors")); HBox hBoxCopyright = new HBox (); hBoxCopyright.PackStart (label, false, false, 5); this.PackStart (hBoxCopyright, false, true, 5); diff --git a/Pinta/Properties/AssemblyInfo.cs b/Pinta/Properties/AssemblyInfo.cs index 3b3f345551..eba8646280 100644 --- a/Pinta/Properties/AssemblyInfo.cs +++ b/Pinta/Properties/AssemblyInfo.cs @@ -17,7 +17,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("1.5.0.0")] +[assembly: AssemblyVersion ("1.6.0.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/Wix/common.wxi b/Wix/common.wxi index 0b595c39cd..488a4f70ea 100644 --- a/Wix/common.wxi +++ b/Wix/common.wxi @@ -1,8 +1,8 @@ - - + + diff --git a/configure.ac b/configure.ac index 48db9b6833..3fb2d24fff 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([pinta], [1.5]) +AC_INIT([pinta], [1.6]) AM_INIT_AUTOMAKE([tar-ustar foreign]) diff --git a/osx/Info.plist b/osx/Info.plist index cf1db469d8..fed5802e04 100644 --- a/osx/Info.plist +++ b/osx/Info.plist @@ -116,11 +116,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5 + 1.6 CFBundleSignature xmmd CFBundleVersion - 1.5 + 1.6 NSAppleScriptEnabled NO UTImportedTypeDeclarations