From 2e48b9ce418470df656c0cfc47f2ca73f8ea60cb Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:13:14 +0900 Subject: [PATCH] merge with master --- AUTHORS | 5 ++--- LICENSE.APLv2.0 => LICENSE | 2 ++ NOTICE | 3 --- include/dr-common.h | 11 ++++++++--- include/dr-ipc.h | 11 ++++++++--- include/dr-main.h | 11 ++++++++--- include/dr-modem.h | 11 ++++++++--- include/dr-noti-handler.h | 11 ++++++++--- include/dr-parser.h | 11 ++++++++--- include/dr-usb.h | 11 ++++++++--- include/dr-util.h | 11 ++++++++--- packaging/data-router.spec | 2 +- src/dr-common.c | 11 ++++++++--- src/dr-ipc.c | 11 ++++++++--- src/dr-main.c | 11 ++++++++--- src/dr-modem.c | 11 ++++++++--- src/dr-noti-handler.c | 11 ++++++++--- src/dr-parser.c | 11 ++++++++--- src/dr-usb.c | 11 ++++++++--- src/dr-util.c | 11 ++++++++--- 20 files changed, 133 insertions(+), 55 deletions(-) mode change 100755 => 100644 AUTHORS rename LICENSE.APLv2.0 => LICENSE (99%) mode change 100755 => 100644 delete mode 100755 NOTICE mode change 100755 => 100644 include/dr-common.h mode change 100755 => 100644 include/dr-ipc.h mode change 100755 => 100644 include/dr-main.h mode change 100755 => 100644 include/dr-modem.h mode change 100755 => 100644 include/dr-noti-handler.h mode change 100755 => 100644 include/dr-parser.h mode change 100755 => 100644 include/dr-usb.h mode change 100755 => 100644 include/dr-util.h mode change 100755 => 100644 packaging/data-router.spec mode change 100755 => 100644 src/dr-common.c mode change 100755 => 100644 src/dr-ipc.c mode change 100755 => 100644 src/dr-main.c mode change 100755 => 100644 src/dr-modem.c mode change 100755 => 100644 src/dr-noti-handler.c mode change 100755 => 100644 src/dr-parser.c mode change 100755 => 100644 src/dr-usb.c mode change 100755 => 100644 src/dr-util.c diff --git a/AUTHORS b/AUTHORS old mode 100755 new mode 100644 index 4d93362..acd267e --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,2 @@ -Hocheol Seo -Injun Yang -Seungyoun Ju +Hocheol Seo +Injun Yang diff --git a/LICENSE.APLv2.0 b/LICENSE old mode 100755 new mode 100644 similarity index 99% rename from LICENSE.APLv2.0 rename to LICENSE index d645695..a06208b --- a/LICENSE.APLv2.0 +++ b/LICENSE @@ -1,3 +1,4 @@ +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. Apache License Version 2.0, January 2004 @@ -200,3 +201,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + diff --git a/NOTICE b/NOTICE deleted file mode 100755 index 0e0f016..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.APLv2 file for Apache License terms and conditions. diff --git a/include/dr-common.h b/include/dr-common.h old mode 100755 new mode 100644 index 2cbd087..46b3f25 --- a/include/dr-common.h +++ b/include/dr-common.h @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/include/dr-ipc.h b/include/dr-ipc.h old mode 100755 new mode 100644 index 48a79eb..7708ff7 --- a/include/dr-ipc.h +++ b/include/dr-ipc.h @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/include/dr-main.h b/include/dr-main.h old mode 100755 new mode 100644 index 1213f73..37399c9 --- a/include/dr-main.h +++ b/include/dr-main.h @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/include/dr-modem.h b/include/dr-modem.h old mode 100755 new mode 100644 index 8b9c273..1c51539 --- a/include/dr-modem.h +++ b/include/dr-modem.h @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/include/dr-noti-handler.h b/include/dr-noti-handler.h old mode 100755 new mode 100644 index c00a4ed..8f07d16 --- a/include/dr-noti-handler.h +++ b/include/dr-noti-handler.h @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/include/dr-parser.h b/include/dr-parser.h old mode 100755 new mode 100644 index b28e307..d6a609e --- a/include/dr-parser.h +++ b/include/dr-parser.h @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/include/dr-usb.h b/include/dr-usb.h old mode 100755 new mode 100644 index d0493ba..d088e0e --- a/include/dr-usb.h +++ b/include/dr-usb.h @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/include/dr-util.h b/include/dr-util.h old mode 100755 new mode 100644 index 790aab6..69b1eb5 --- a/include/dr-util.h +++ b/include/dr-util.h @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/packaging/data-router.spec b/packaging/data-router.spec old mode 100755 new mode 100644 index e498328..f5acd57 --- a/packaging/data-router.spec +++ b/packaging/data-router.spec @@ -3,7 +3,7 @@ Summary: Data Router Version: 0.2.17 Release: 1 Group: TO_BE/FILLED_IN -License: Apache License Version 2.0 +License: TO BE FILLED IN Source0: %{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconfig(dlog) diff --git a/src/dr-common.c b/src/dr-common.c old mode 100755 new mode 100644 index 152b8a7..634da3d --- a/src/dr-common.c +++ b/src/dr-common.c @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/src/dr-ipc.c b/src/dr-ipc.c old mode 100755 new mode 100644 index b0a9e9b..99b5b33 --- a/src/dr-ipc.c +++ b/src/dr-ipc.c @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/src/dr-main.c b/src/dr-main.c old mode 100755 new mode 100644 index 648bfbb..c3703d9 --- a/src/dr-main.c +++ b/src/dr-main.c @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/src/dr-modem.c b/src/dr-modem.c old mode 100755 new mode 100644 index 91114f5..204278e --- a/src/dr-modem.c +++ b/src/dr-modem.c @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/src/dr-noti-handler.c b/src/dr-noti-handler.c old mode 100755 new mode 100644 index fea1ae4..fca6253 --- a/src/dr-noti-handler.c +++ b/src/dr-noti-handler.c @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/src/dr-parser.c b/src/dr-parser.c old mode 100755 new mode 100644 index 9833c78..f47a0b2 --- a/src/dr-parser.c +++ b/src/dr-parser.c @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/src/dr-usb.c b/src/dr-usb.c old mode 100755 new mode 100644 index 75aa8f5..cf6ded4 --- a/src/dr-usb.c +++ b/src/dr-usb.c @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ diff --git a/src/dr-util.c b/src/dr-util.c old mode 100755 new mode 100644 index 411aa71..db8a7d5 --- a/src/dr-util.c +++ b/src/dr-util.c @@ -1,18 +1,23 @@ /* * Data-Router - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. * - * Licensed under the Apache License, Version 2.0 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Injun Yang + * + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ -- 2.7.4