adium 4852:8b73767eed26: I closed the adium-1.5.1 branch, but I ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/8b73767eed26
revision:	4852:8b73767eed26
branch:		adium-1.5.2
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Fri Jun 08 01:49:48 2012 +0200

I closed the adium-1.5.1 branch, but I propose branching 1.5.2 from here, if we ever do it.

diffs (51 lines):

diff -r 64b4f4627211 -r 8b73767eed26 Plists/Info.plist
--- a/Plists/Info.plist	Fri Jun 08 01:36:00 2012 +0200
+++ b/Plists/Info.plist	Fri Jun 08 01:49:48 2012 +0200
@@ -354,7 +354,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.5.1, Copyright © 2001-2012 The Adium Team</string>
+	<string>1.5.2b1, Copyright © 2001-2012 The Adium Team</string>
 	<key>CFBundleHelpBookFolder</key>
 	<string>AdiumHelp</string>
 	<key>CFBundleHelpBookName</key>
@@ -370,7 +370,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.1</string>
+	<string>1.5.2b1</string>
 	<key>CFBundleSignature</key>
 	<string>AdIM</string>
 	<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.5.1</string>
+	<string>1.5.2b1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>
diff -r 64b4f4627211 -r 8b73767eed26 Release/Makefile
--- a/Release/Makefile	Fri Jun 08 01:36:00 2012 +0200
+++ b/Release/Makefile	Fri Jun 08 01:49:48 2012 +0200
@@ -17,9 +17,9 @@
 # - make all
 ###########
 
-VERSION=1.5.1
+VERSION=1.5.2b1
 BUILD_IN_DEBUG_MODE?=FALSE
-BETA?=FALSE
+BETA?=TRUE
 OFFICIAL_BUILD?=TRUE
 
 # Always builds in debug mode.
@@ -216,4 +216,4 @@
 	cd $(BUILD_DIR) && tar zcf $(RELEASE_NAME).tgz Adium*/ && cd ..
 
 tarball:
-	hg archive -t tgz ($TARBALL_DIR).tgz
+	hg archive -t tgz $(TARBALL_DIR).tgz