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.
looknear · May 18, 2014 · 9522b01 · 9522b01
1 parent 11134d1
commit 9522b01
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -39,7 +39,7 @@ public AboutPintaTabPage ()
 			label.Markup = String.Format (
 			    "<b>{0}</b>\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 ("<b>{0}</b>\n    (c) 2010-2013 {1}", Catalog.GetString ("Copyright"), Catalog.GetString ("by Pinta contributors"));
+			label.Markup = string.Format ("<b>{0}</b>\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
@@ -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
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
   <?define ProductShortName = "Pinta" ?>
-  <?define ProductVersion = "1.5.0.1" ?>
-  <?define ProductVersionText = "1.5" ?>
+  <?define ProductVersion = "1.6.0.0" ?>
+  <?define ProductVersionText = "1.6" ?>
   <?define Manufacturer = "Pinta Community" ?>
   <?define UpgradeCode = "C0BCDEDA-62E7-4A43-8435-58323E096912" ?>
 </Include>
diff --git 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
@@ -116,11 +116,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5</string>
+	<string>1.6</string>
 	<key>CFBundleSignature</key>
 	<string>xmmd</string>
 	<key>CFBundleVersion</key>
-	<string>1.5</string>
+	<string>1.6</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>NO</string>
 	<key>UTImportedTypeDeclarations</key>