merge with master

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644 (file)
index 79a79b1..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Seungbae Shin <seungbae.shin at samsung.com>
-Sangchul Lee <sc11.lee at samsung.com>

diff --git a/LICENSE.APLv2 b/LICENSE
similarity index 97%
rename from LICENSE.APLv2
rename to LICENSE
index 3b739e3..9c13a9b 100644 (file)
--- a/LICENSE.APLv2
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved.\r
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
 \r
                                  Apache License\r
                            Version 2.0, January 2004\r

diff --git a/NOTICE b/NOTICE
deleted file mode 100644 (file)
index ccdad52..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Apache License, Version 2.
-Please, see the LICENSE file for Apache License terms and conditions.

diff --git a/mm_session.c b/mm_session.c
index 58c746a..dac8b2f 100644 (file)
--- a/mm_session.c
+++ b/mm_session.c
@@ -1,9 +1,9 @@
 /*
  * libmm-session
  *
- * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: Seungbae Shin <seungbae.shin at samsung.com>, Sangchul Lee <sc11.lee at samsung.com>
+ * Contact: Seungbae Shin <seungbae.shin@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
  *
  */
 
+
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>

diff --git a/mm_session.h b/mm_session.h
index 9bad099..7e38301 100644 (file)
--- a/mm_session.h
+++ b/mm_session.h
@@ -1,9 +1,9 @@
 /*
  * libmm-session
  *
- * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: Seungbae Shin <seungbae.shin at samsung.com>, Sangchul Lee <sc11.lee at samsung.com>
+ * Contact: Seungbae Shin <seungbae.shin@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/mm_session_private.h b/mm_session_private.h
index b4c0a5b..506f451 100644 (file)
--- a/mm_session_private.h
+++ b/mm_session_private.h
@@ -1,9 +1,9 @@
 /*
  * libmm-session
  *
- * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: Seungbae Shin <seungbae.shin at samsung.com>, Sangchul Lee <sc11.lee at samsung.com>
+ * Contact: Seungbae Shin <seungbae.shin@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/packaging/libmm-session.spec b/packaging/libmm-session.spec
index 8e58282..2c15eea 100644 (file)
--- a/packaging/libmm-session.spec
+++ b/packaging/libmm-session.spec
@@ -1,10 +1,9 @@
 Name:       libmm-session
 Summary:    mm-session development pkg for samsung
-Version:    0.2.7
+Version:    0.2.6
 Release:    0
-Group:      System/Libraries
-License:    Apache License, Version 2.0
-URL:        http://source.tizen.org
+Group:      TO_BE/FILLED_IN
+License:    TO BE FILLED IN
 Source0:    libmm-session-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig