[meego-packaging] 4922: Changes to Trunk:Handset/contextkit-meego
Chris Ferron
chris.e.ferron at linux.intel.com
Fri Jun 25 17:16:51 PDT 2010
Please clean up your changes file and re-submit.
" Upgraded license to Apache 2.0 "
That doesn't sound right.
-Chris
On 06/25/2010 04:58 PM, Kevron Rees wrote:
> Hi,
> I have made the following changes to contextkit-meego in project Trunk:Handset. Please review and accept ASAP.
>
> Thank You,
> Kevron Rees
>
> [This message was auto-generated]
>
> ---
>
> Request #4922:
>
> submit: devel:ux:handset/contextkit-meego(r15) -> Trunk:Handset/contextkit-meego
>
>
> Message:
> apache 2.0 licensed bmc #3513
>
> State: new 2010-06-25T11:55:21 kevronx_m_rees
> Comment: None
>
>
>
> changes files:
> --------------
> --- contextkit-meego-providers.changes
> +++ contextkit-meego-providers.changes
> @@ -0,0 +1,4 @@
> +* Fri Jun 25 2010 Kevron Rees<kevron.m.rees at intel.com> - 0.0.6
> +- Upgraded license to Apache 2.0
> +- Added license file
> +
>
> old:
> ----
> contextkit-meego-providers-0.0.5.tar.bz2
>
> new:
> ----
> contextkit-meego-providers-0.0.6.tar.bz2
>
> spec files:
> -----------
> --- contextkit-meego-providers.spec
> +++ contextkit-meego-providers.spec
> @@ -7,14 +7,13 @@
>
> Name: contextkit-meego-providers
> Summary: Contextkit providers for various functions
> -Version: 0.0.5
> +Version: 0.0.6
> Release: 1
> Group: System/GUI/Other
> -License: LGPL v2.1
> +License: Apache 2.0
> URL: http://www.meego.com
> Source0: %{name}-%{version}.tar.bz2
> Source100: contextkit-meego-providers.yaml
> -Patch0: 0001-squish-3324.patch
> Requires: %{name}>= %{version}
> Requires: contextkit-maemo>= 0.7.12
> BuildRequires: pkgconfig(QtCore)>= 4.6.0
> @@ -34,8 +33,6 @@
> %prep
> %setup -q -n %{name}-%{version}
>
> -# 0001-squish-3324.patch
> -%patch0 -p1
> #>> setup
> #<< setup
>
>
> other changes:
> --------------
>
> ++++++ contextkit-meego-providers-0.0.5.tar.bz2 -> contextkit-meego-providers-0.0.6.tar.bz2
> --- LICENSE
> +++ LICENSE
> +
> + Apache License
> + Version 2.0, January 2004
> + http://www.apache.org/licenses/
> +
> + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
> +
> + 1. Definitions.
> +
> + "License" shall mean the terms and conditions for use, reproduction,
> + and distribution as defined by Sections 1 through 9 of this document.
> +
> + "Licensor" shall mean the copyright owner or entity authorized by
> + the copyright owner that is granting the License.
> +
> + "Legal Entity" shall mean the union of the acting entity and all
> + other entities that control, are controlled by, or are under common
> + control with that entity. For the purposes of this definition,
> + "control" means (i) the power, direct or indirect, to cause the
> + direction or management of such entity, whether by contract or
> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
> + outstanding shares, or (iii) beneficial ownership of such entity.
> +
> + "You" (or "Your") shall mean an individual or Legal Entity
> + exercising permissions granted by this License.
> +
> + "Source" form shall mean the preferred form for making modifications,
> + including but not limited to software source code, documentation
> + source, and configuration files.
> +
> + "Object" form shall mean any form resulting from mechanical
> + transformation or translation of a Source form, including but
> + not limited to compiled object code, generated documentation,
> + and conversions to other media types.
> +
> + "Work" shall mean the work of authorship, whether in Source or
> + Object form, made available under the License, as indicated by a
> + copyright notice that is included in or attached to the work
> + (an example is provided in the Appendix below).
> +
> + "Derivative Works" shall mean any work, whether in Source or Object
> + form, that is based on (or derived from) the Work and for which the
> + editorial revisions, annotations, elaborations, or other modifications
> + represent, as a whole, an original work of authorship. For the purposes
> + of this License, Derivative Works shall not include works that remain
> + separable from, or merely link (or bind by name) to the interfaces of,
> + the Work and Derivative Works thereof.
> +
> + "Contribution" shall mean any work of authorship, including
> + the original version of the Work and any modifications or additions
> + to that Work or Derivative Works thereof, that is intentionally
> + submitted to Licensor for inclusion in the Work by the copyright owner
> + or by an individual or Legal Entity authorized to submit on behalf of
> + the copyright owner. For the purposes of this definition, "submitted"
> + means any form of electronic, verbal, or written communication sent
> + to the Licensor or its representatives, including but not limited to
> + communication on electronic mailing lists, source code control systems,
> + and issue tracking systems that are managed by, or on behalf of, the
> + Licensor for the purpose of discussing and improving the Work, but
> + excluding communication that is conspicuously marked or otherwise
> + designated in writing by the copyright owner as "Not a Contribution."
> +
> + "Contributor" shall mean Licensor and any individual or Legal Entity
> + on behalf of whom a Contribution has been received by Licensor and
> + subsequently incorporated within the Work.
> +
> + 2. Grant of Copyright License. Subject to the terms and conditions of
> + this License, each Contributor hereby grants to You a perpetual,
> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> + copyright license to reproduce, prepare Derivative Works of,
> + publicly display, publicly perform, sublicense, and distribute the
> + Work and such Derivative Works in Source or Object form.
> +
> + 3. Grant of Patent License. Subject to the terms and conditions of
> + this License, each Contributor hereby grants to You a perpetual,
> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> + (except as stated in this section) patent license to make, have made,
> + use, offer to sell, sell, import, and otherwise transfer the Work,
> + where such license applies only to those patent claims licensable
> + by such Contributor that are necessarily infringed by their
> + Contribution(s) alone or by combination of their Contribution(s)
> + with the Work to which such Contribution(s) was submitted. If You
> + institute patent litigation against any entity (including a
> + cross-claim or counterclaim in a lawsuit) alleging that the Work
> + or a Contribution incorporated within the Work constitutes direct
> + or contributory patent infringement, then any patent licenses
> + granted to You under this License for that Work shall terminate
> + as of the date such litigation is filed.
> +
> + 4. Redistribution. You may reproduce and distribute copies of the
> + Work or Derivative Works thereof in any medium, with or without
> + modifications, and in Source or Object form, provided that You
> + meet the following conditions:
> +
> + (a) You must give any other recipients of the Work or
> + Derivative Works a copy of this License; and
> +
> + (b) You must cause any modified files to carry prominent notices
> + stating that You changed the files; and
> +
> + (c) You must retain, in the Source form of any Derivative Works
> + that You distribute, all copyright, patent, trademark, and
> + attribution notices from the Source form of the Work,
> + excluding those notices that do not pertain to any part of
> + the Derivative Works; and
> +
> + (d) If the Work includes a "NOTICE" text file as part of its
> + distribution, then any Derivative Works that You distribute must
> + include a readable copy of the attribution notices contained
> + within such NOTICE file, excluding those notices that do not
> + pertain to any part of the Derivative Works, in at least one
> + of the following places: within a NOTICE text file distributed
> + as part of the Derivative Works; within the Source form or
> + documentation, if provided along with the Derivative Works; or,
> + within a display generated by the Derivative Works, if and
> + wherever such third-party notices normally appear. The contents
> + of the NOTICE file are for informational purposes only and
> + do not modify the License. You may add Your own attribution
> + notices within Derivative Works that You distribute, alongside
> + or as an addendum to the NOTICE text from the Work, provided
> + that such additional attribution notices cannot be construed
> + as modifying the License.
> +
> + You may add Your own copyright statement to Your modifications and
> + may provide additional or different license terms and conditions
> + for use, reproduction, or distribution of Your modifications, or
> + for any such Derivative Works as a whole, provided Your use,
> + reproduction, and distribution of the Work otherwise complies with
> + the conditions stated in this License.
> +
> + 5. Submission of Contributions. Unless You explicitly state otherwise,
> + any Contribution intentionally submitted for inclusion in the Work
> + by You to the Licensor shall be under the terms and conditions of
> + this License, without any additional terms or conditions.
> + Notwithstanding the above, nothing herein shall supersede or modify
> + the terms of any separate license agreement you may have executed
> + with Licensor regarding such Contributions.
> +
> + 6. Trademarks. This License does not grant permission to use the trade
> + names, trademarks, service marks, or product names of the Licensor,
> + except as required for reasonable and customary use in describing the
> + origin of the Work and reproducing the content of the NOTICE file.
> +
> + 7. Disclaimer of Warranty. Unless required by applicable law or
> + agreed to in writing, Licensor provides the Work (and each
> + Contributor provides its Contributions) on an "AS IS" BASIS,
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> + implied, including, without limitation, any warranties or conditions
> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
> + PARTICULAR PURPOSE. You are solely responsible for determining the
> + appropriateness of using or redistributing the Work and assume any
> + risks associated with Your exercise of permissions under this License.
> +
> + 8. Limitation of Liability. In no event and under no legal theory,
> + whether in tort (including negligence), contract, or otherwise,
> + unless required by applicable law (such as deliberate and grossly
> + negligent acts) or agreed to in writing, shall any Contributor be
> + liable to You for damages, including any direct, indirect, special,
> + incidental, or consequential damages of any character arising as a
> + result of this License or out of the use or inability to use the
> + Work (including but not limited to damages for loss of goodwill,
> + work stoppage, computer failure or malfunction, or any and all
> + other commercial damages or losses), even if such Contributor
> + has been advised of the possibility of such damages.
> +
> + 9. Accepting Warranty or Additional Liability. While redistributing
> + the Work or Derivative Works thereof, You may choose to offer,
> + and charge a fee for, acceptance of support, warranty, indemnity,
> + or other liability obligations and/or rights consistent with this
> + License. However, in accepting such obligations, You may act only
> + on Your own behalf and on Your sole responsibility, not on behalf
> + of any other Contributor, and only if You agree to indemnify,
> + defend, and hold each Contributor harmless for any liability
> + incurred by, or claims asserted against, such Contributor by reason
> + of your accepting any such warranty or additional liability.
> +
> + END OF TERMS AND CONDITIONS
> +
> + APPENDIX: How to apply the Apache License to your work.
> +
> + To apply the Apache License to your work, attach the following
> + boilerplate notice, with the fields enclosed by brackets "[]"
> + replaced with your own identifying information. (Don't include
> + the brackets!) The text should be enclosed in the appropriate
> + comment syntax for the file format. We also recommend that a
> + file or class name and description of purpose be included on the
> + same "printed page" as the copyright notice for easier
> + identification within third-party archives.
> +
> + Copyright [yyyy] [name of copyright owner]
> +
> + 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
> +
> + 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.
> --- battery/src/devicekitprovider.cpp
> +++ battery/src/devicekitprovider.cpp
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- battery/src/devicekitprovider.h
> +++ battery/src/devicekitprovider.h
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- battery/tests/battery.cpp
> +++ battery/tests/battery.cpp
> @@ -1,3 +1,14 @@
> +/* -*- Mode: C++ -*-
> + *
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> + *
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + */
> +
> #include "battery.h"
> #include<contextsubscriber/contextproperty.h>
> #include<QtDebug>
> --- battery/tests/battery.h
> +++ battery/tests/battery.h
> @@ -1,3 +1,14 @@
> +/* -*- Mode: C++ -*-
> + *
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> + *
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + */
> +
> #ifndef BATTERY_H
> #define BATTERY_H
>
> --- battery/tests/main.cpp
> +++ battery/tests/main.cpp
> @@ -1,3 +1,14 @@
> +/* -*- Mode: C++ -*-
> + *
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> + *
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + */
> +
> #include<QCoreApplication>
>
> #include "battery.h"
> --- cellular/src/cellularprovider.cpp
> +++ cellular/src/cellularprovider.cpp
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- cellular/src/cellularprovider.h
> +++ cellular/src/cellularprovider.h
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- cellular/tests/cellulartest.cpp
> +++ cellular/tests/cellulartest.cpp
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- cellular/tests/cellulartest.h
> +++ cellular/tests/cellulartest.h
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- cellular/tests/main.cpp
> +++ cellular/tests/main.cpp
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- contextkit-meego-providers.pro
> +++ contextkit-meego-providers.pro
> @@ -1,11 +1,11 @@
> -VERSION=0.0.1
> +VERSION=0.0.6
>
> TEMPLATE = subdirs
>
> SUBDIRS += battery \
> cellular \
> phone \
> -# internet \
> + internet \
> # presence \
> # useralarm \
> # location
> --- internet/connmanprovider.cpp
> +++ internet/connmanprovider.cpp
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- internet/connmanprovider.h
> +++ internet/connmanprovider.h
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/src/callitem.cpp
> +++ phone/src/callitem.cpp
> @@ -1,18 +1,11 @@
> -/*
> - * Copyright (c) 2009, Intel Corporation.
> +/* -*- Mode: C++ -*-
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
> - * License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License
> - * along with this program; if not, write to the Free Software Foundation,
> - * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/src/callitem.h
> +++ phone/src/callitem.h
> @@ -1,18 +1,11 @@
> -/*
> - * Copyright (c) 2009, Intel Corporation.
> +/* -*- Mode: C++ -*-
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
> - * License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License
> - * along with this program; if not, write to the Free Software Foundation,
> - * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/src/callitemmodel.h
> +++ phone/src/callitemmodel.h
> @@ -1,18 +1,11 @@
> -/*
> - * Copyright (c) 2009, Intel Corporation.
> +/* -*- Mode: C++ -*-
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
> - * License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License
> - * along with this program; if not, write to the Free Software Foundation,
> - * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/src/callmanager.cpp
> +++ phone/src/callmanager.cpp
> @@ -1,18 +1,11 @@
> -/*
> - * Copyright (c) 2009, Intel Corporation.
> +/* -*- Mode: C++ -*-
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
> - * License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License
> - * along with this program; if not, write to the Free Software Foundation,
> - * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/src/callmanager.h
> +++ phone/src/callmanager.h
> @@ -1,18 +1,11 @@
> -/*
> - * Copyright (c) 2009, Intel Corporation.
> +/* -*- Mode: C++ -*-
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
> - * License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License
> - * along with this program; if not, write to the Free Software Foundation,
> - * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/src/callproxy.cpp
> +++ phone/src/callproxy.cpp
> @@ -1,18 +1,11 @@
> -/*
> - * Copyright (c) 2009, Intel Corporation.
> +/* -*- Mode: C++ -*-
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
> - * License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License
> - * along with this program; if not, write to the Free Software Foundation,
> - * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/src/callproxy.h
> +++ phone/src/callproxy.h
> @@ -1,18 +1,11 @@
> -/*
> - * Copyright (c) 2009, Intel Corporation.
> +/* -*- Mode: C++ -*-
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> + * contextkit-meego
> + * Copyright © 2010, Intel Corporation.
> *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
> - * License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License
> - * along with this program; if not, write to the Free Software Foundation,
> - * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/src/phoneprovider.cpp
> +++ phone/src/phoneprovider.cpp
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/src/phoneprovider.h
> +++ phone/src/phoneprovider.h
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/tests/main.cpp
> +++ phone/tests/main.cpp
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/tests/phonetest.cpp
> +++ phone/tests/phonetest.cpp
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
> --- phone/tests/phonetest.h
> +++ phone/tests/phonetest.h
> @@ -3,18 +3,9 @@
> * contextkit-meego
> * Copyright © 2010, Intel Corporation.
> *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU Lesser General Public License,
> - * version 2.1, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public License along with
> - * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St
> - * - Fifth Floor, Boston, MA 02110-1301 USA
> + * This program is licensed under the terms and conditions of the
> + * Apache License, version 2.0. The full text of the Apache License is at
> + * http://www.apache.org/licenses/LICENSE-2.0
> *
> */
>
>
> ++++++ contextkit-meego-providers.yaml
> --- contextkit-meego-providers.yaml
> +++ contextkit-meego-providers.yaml
> @@ -1,14 +1,12 @@
> Name: contextkit-meego-providers
> Summary: Contextkit providers for various functions
> -Version: 0.0.5
> +Version: 0.0.6
> Release: 1
> Group: System/GUI/Other
> -License: LGPL v2.1
> +License: Apache 2.0
> URL: http://www.meego.com
> Sources:
> - "%{name}-%{version}.tar.bz2"
> -Patches:
> - - 0001-squish-3324.patch
> Requires:
> - "%{name}>= %{version}"
> - contextkit-maemo>= 0.7.12
> _______________________________________________
> Meego-packaging mailing list
> Meego-packaging at meego.com
> http://lists.meego.com/listinfo/meego-packaging
>
>
More information about the Meego-packaging
mailing list