commit 65dad9967ef5ba3ef72581c3be2f99796752800d
author Lars Greiss <kufikugel@googlemail.com> Fri Mar 08 00:01:04 2013 +0100
committer Gerrit Code Review <root@grapefruit.slimroms.net> Fri Mar 08 00:01:04 2013 +0100
tree 47a19f5eeed57e26c4defe6e8840f96570e6418a
parent c3b10dd2916d223f77e110937fdd60552becd2c9
parent 0e7669ec2de278f889f2fdeffbab5c14b08be1b1

Merge "Push to 1.3 and changing unofficial and nightly naming" into jb4.2

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 8d53ca2..0184841 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -157,7 +157,7 @@
 include vendor/slim/config/themes_common.mk
 PRODUCT_VERSION_MAJOR = 4.2.2
 PRODUCT_VERSION_MINOR = build
-PRODUCT_VERSION_MAINTENANCE = 1.2
+PRODUCT_VERSION_MAINTENANCE = 1.3
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=JDQ39
 
@@ -166,8 +166,8 @@
 
 ifdef SLIM_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-NIGHTLY-$(shell date +%m%d%Y) \
-        ro.modversion=Slim-$(PRODUCT_RELEASE_NAME)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-NIGHTLY-$(shell date +%m%d%Y)
+        ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-NIGHTLY-$(shell date +"%Y%m%d-%H%M") \
+        ro.modversion=Slim-$(PRODUCT_RELEASE_NAME)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-NIGHTLY-$(shell date +"%Y%m%d-%H%M")
 else
     ifdef SLIM_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
@@ -175,7 +175,7 @@
             ro.modversion=Slim-$(PRODUCT_RELEASE_NAME)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-OFFICIAL
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(shell date +"%Y%m%d-%H%M")-UNOFFICIAL \
-            ro.modversion=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-$(shell date +"%Y%m%d-%H%M")-UNOFFICIAL
+            ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-UNOFFICIAL-$(shell date +"%Y%m%d-%H%M") \
+            ro.modversion=Slim-$(PRODUCT_RELEASE_NAME)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-UNOFFICIAL-$(shell date +"%Y%m%d-%H%M")
     endif
 endif