update OS X identifiers for version 2

qgis · Apr 1, 2013 · e68b322 · e68b322
1 parent 1bfb7ed
commit e68b322
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/mac/app.info.plist.in b/mac/app.info.plist.in
@@ -7,15 +7,15 @@
 	<key>CFBundleName</key>
 	<string>QGIS</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.qgis.qgis</string>
+	<string>org.qgis.qgis2</string>
 	<key>CFBundleExecutable</key>
 	<string>${QGIS_APP_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>QGIS</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2012 QGIS Development Team</string>
+	<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2013 QGIS Development Team</string>
 	<key>CFBundleShortVersionString</key>
 	<string>${COMPLETE_VERSION}</string>
 	<key>CFBundleVersion</key>

diff --git a/mac/browser.info.plist.in b/mac/browser.info.plist.in
@@ -7,15 +7,15 @@
 	<key>CFBundleName</key>
 	<string>QGIS Browser</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.qgis.qgis</string>
+	<string>org.qgis.qgis2_browser</string>
 	<key>CFBundleExecutable</key>
 	<string>QGIS Browser</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>QGSB</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2012 QGIS Development Team</string>
+	<string>${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2013 QGIS Development Team</string>
 	<key>CFBundleShortVersionString</key>
 	<string>${COMPLETE_VERSION}</string>
 	<key>CFBundleVersion</key>

diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -152,7 +152,7 @@ ELSE(NOT APPLE)
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
-    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_analysis
+    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_analysis
     BUILD_WITH_INSTALL_RPATH TRUE
     PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}"
   )

diff --git a/src/analysis/network/CMakeLists.txt b/src/analysis/network/CMakeLists.txt
@@ -53,7 +53,7 @@ ELSE(NOT APPLE)
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
-    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_networkanalysis
+    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_networkanalysis
     BUILD_WITH_INSTALL_RPATH TRUE
     PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}"
   )

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -589,7 +589,7 @@ ELSE(NOT APPLE)
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
-    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_core
+    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_core
     BUILD_WITH_INSTALL_RPATH TRUE
     PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}"
   )

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -375,7 +375,7 @@ ELSE(NOT APPLE)
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
-    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_gui
+    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_gui
     BUILD_WITH_INSTALL_RPATH TRUE
     PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}"
   )

diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -26,7 +26,7 @@ SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
   FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
   MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
   MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
-  MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgisgrass
+  MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_grass
   COMPILE_FLAGS "\"-DGRASS_LIB_EXPORT=${DLLEXPORT}\" \"-DGRASS_EXPORT=${DLLIMPORT}\"" )
 
 #generate unversioned libs for android

diff --git a/src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt b/src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
@@ -33,7 +33,7 @@ SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES
   FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
   MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
   MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
-  MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgisgrass)
+  MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_sqlanyconnection)
 
 #generate unversioned libs for android
 IF (NOT ANDROID)