[dali_1.9.36] Merge branch 'devel/master'

Change-Id: I6e6c163ce501214fcfc44d62731b3121d3c1fbaf

diff --git a/automated-tests/patch-coverage.pl b/automated-tests/patch-coverage.pl
index 702dc0b..3a97dac 100755 (executable)
--- a/automated-tests/patch-coverage.pl
+++ b/automated-tests/patch-coverage.pl
@@ -54,7 +54,7 @@ sub add_counts($$);
 sub info(@);
 
 our $repo = Git->repository();
-our $debug=1;
+our $debug=0;
 our $pd_debug=0;
 our $root;
 our %info_data; # Hash containing all data from .info files
@@ -1316,7 +1316,7 @@ my $cwd = getcwd(); # expect this to be automated-tests folder
 
 # execute coverage.sh, generating build/tizen/dali.info from lib, and
 # *.dir/dali.info. Don't generate html
-`coverage.sh -n`;
+print `./coverage.sh -n`;
 chdir "..";
 $root = getcwd();
 
@@ -1338,12 +1338,7 @@ foreach (@info_files)
 my @cmd=('--no-pager','diff','--no-ext-diff','-U0','--no-color');
 my $status = $repo->command("status", "-s");
 
-if(scalar(@ARGV)) # REMOVE ME
-{
-    # REMOVE ME - temp to get past modifying this script in place.
-    push @cmd, @ARGV;
-}
-elsif( $status eq "" && !scalar(@ARGV))
+if( $status eq "" && !scalar(@ARGV))
 {
     # There are no changes in the index or working tree, and
     # no diff arguments to append. Use the last patch instead.

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index ea39b21..70e0c84 100644 (file)
--- a/dali/public-api/dali-adaptor-version.cpp
+++ b/dali/public-api/dali-adaptor-version.cpp
@@ -27,7 +27,7 @@ namespace Dali
 {
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 9;
-const unsigned int ADAPTOR_MICRO_VERSION = 35;
+const unsigned int ADAPTOR_MICRO_VERSION = 36;
 const char* const  ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index d435c1b..13f8e71 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -17,7 +17,7 @@
 
 Name:       dali2-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.9.35
+Version:    1.9.36
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT