From 57a6dfe5046c12e04d32ae2dae2cb314bfb047d9 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 12 Jan 2015 16:55:05 +0100
Subject: [PATCH] Revert the changes to the versioning. We will use the git
 version in the about page, it makes more sense.

---
 Classes/AboutViewController.m      |  6 +++---
 Tools/buildNumber.sh               | 13 -------------
 linphone-Info.plist                |  4 ++--
 linphone.xcodeproj/project.pbxproj | 14 --------------
 4 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100755 Tools/buildNumber.sh

diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m
index f198a87f2..c0f3ef92b 100644
--- a/Classes/AboutViewController.m
+++ b/Classes/AboutViewController.m
@@ -20,6 +20,7 @@
 #import "AboutViewController.h"
 #import "LinphoneManager.h"
 #include "linphone/lpconfig.h"
+#include "LinphoneIOSVersion.h"
 
 @implementation AboutViewController
 
@@ -73,10 +74,9 @@
     
 	[linphoneLabel setText:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]];
 	
-    [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"%@ iPhone %@-b%@",
+    [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"%@ iPhone %@",
 										 [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"],
-										 [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
-										 [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]
+										 [NSString stringWithUTF8String:LINPHONE_IOS_VERSION]]
 	 ];
 
     [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"%@ Core %s", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"], linphone_core_get_version()]];
diff --git a/Tools/buildNumber.sh b/Tools/buildNumber.sh
deleted file mode 100755
index ddc6bc8ba..000000000
--- a/Tools/buildNumber.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-#increment build number each time we build
-
-if [[ $CONFIGURATION = "Release" ]]; then
-	buildNumber=$(/usr/libexec/PlistBuddy -c "Print CFBundleVersion" "$INFOPLIST_FILE")
-	buildNumber=$(($buildNumber + 1))
-	/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $buildNumber" "$INFOPLIST_FILE"
-	echo "Incremented build number to $buildNumber"
-else
-	echo "Skip build increment when building for $CONFIGURATION"
-fi
-
diff --git a/linphone-Info.plist b/linphone-Info.plist
index 04f2f867e..735a1a1b1 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -59,7 +59,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.0</string>
+	<string>3.7.4</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -88,7 +88,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>10</string>
+	<string>2.2.4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 6f536beee..ad9060c64 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -3006,7 +3006,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "linphone" */;
 			buildPhases = (
-				F0D05C871A64164000AB87CD /* ShellScript */,
 				1D60588D0D05DD3D006BFB54 /* Resources */,
 				63DCC71D1A07B08E00916627 /* Run Script */,
 				D33CF34715D3985000CD4B85 /* ShellScript */,
@@ -3778,19 +3777,6 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ \"$RUN_UNIT_TEST_WITH_IOS_SIM\" = \"YES\" ]; then\ntest_bundle_path=\"$BUILT_PRODUCTS_DIR/$PRODUCT_NAME.$WRAPPER_EXTENSION\"\nios-sim launch \"$(dirname \"$TEST_HOST\")\" --setenv DYLD_INSERT_LIBRARIES=/../../Library/PrivateFrameworks/IDEBundleInjection.framework/IDEBundleInjection --setenv XCInjectBundle=\"$test_bundle_path\" --setenv XCInjectBundleInto=\"$TEST_HOST\" --args -SenTest All \"$test_bundle_path\"\necho \"Finished running tests with ios-sim\"\nelse\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\nfi";
 		};
-		F0D05C871A64164000AB87CD /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/bash;
-			shellScript = "$SRCROOT/Tools/buildNumber.sh\n";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */