Revert "Clarify licence: LGPL-2.1-only (Meecast#51)"

This reverts commit 021247f.
Olf0 · Jun 12, 2024 · 563e165 · 563e165
1 parent 021247f
commit 563e165
Show file tree

Hide file tree

Showing 27 changed files with 211 additions and 1,120 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/debian/copyright b/debian/copyright
diff --git a/meecast/core/config.h b/meecast/core/config.h
@@ -12,15 +12,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU weather-config.h General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/meecast/core/data.h b/meecast/core/data.h
@@ -12,15 +12,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU weather-config.h General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/meecast/core/data/icons/Beginning/icons_readme.txt b/meecast/core/data/icons/Beginning/icons_readme.txt
@@ -7,36 +7,36 @@ Intended for use with Samurize DesktopWeather.
 All other non-personal use is prohibited unless permission is given by author.
 
 -------------
-Beginning - [[email protected]]
-
-23 of Febrary 2007 
-
-Just use the GPL license, and maybe a bit of recognition.. :)
-
-----------
-vasvlad said the following:
-
-Thank You!!!
-
-But I am sorry.
-One more question:
-What kind of licence I have to use with your iconset: FDL, Artistic License, Common Creative, Public domain or other?
-
-Vlad Vasiliev
-
-----------
-Beginning said the following:
-
-Well I couldn't see why I wouldn't want to let you use then.. :) The more exposure they get the better right? :) Go ahead, i appreciate you taking the time to ask. Please send me a link to see this program in action.. :) Cheers!!
-
-----------
-vasvlad said the following:
-
-Hello,
-I am Vlad Vasiliev. I am the maintainer and developer of OMWeather (Other Maemo Weather) [link]
-This program is licensed under the LGPL-2.1-only and it works on the Linux based platform Maemo (maemo.org)
-Can I take your weather icons for my program?
-What license for your weather icons?
-
-
-Vlad Vasiliev.
+Beginning - [[email protected]]
+
+23 of Febrary 2007 
+
+Just use the GPL license, and maybe a bit of recognition.. :)
+
+----------
+vasvlad said the following:
+
+Thank You!!!
+
+But I am sorry.
+One more question:
+What kind of licence I have to use with your iconset: FDL, Artistic License, Common Creative, Public domain or other?
+
+Vlad Vasiliev
+
+----------
+Beginning said the following:
+
+Well I couldn't see why I wouldn't want to let you use then.. :) The more exposure they get the better right? :) Go ahead, i appreciate you taking the time to ask. Please send me a link to see this program in action.. :) Cheers!!
+
+----------
+vasvlad said the following:
+
+Hello.
+I am Vlad Vasiliev. I am maintainer and developer the OMWeather [link]
+This is program under GPL license and it works in linux based platform Maemo (maemo.org)
+Can I take your weather icons for my program?
+What license for your weather icons?
+
+
+Vlad Vasiliev.
diff --git a/meecast/core/databasesqlite.cpp b/meecast/core/databasesqlite.cpp
@@ -12,15 +12,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU weather-config.h General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/meecast/core/stationlist.h b/meecast/core/stationlist.h
@@ -12,15 +12,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU weather-config.h General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/meecast/qt-qml/UIConstants.js b/meecast/qt-qml/UIConstants.js
@@ -14,10 +14,10 @@
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE included in the packaging
-** of this file.  Please review the following information to ensure the
-** GNU Lesser General Public License version 2.1 requirements will be met:
-** https://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at [email protected].

diff --git a/meecast/qt-qml/main.cpp b/meecast/qt-qml/main.cpp
@@ -11,15 +11,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU weather-config.h General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/meecast/qt-qml/networkingcontrol.cpp b/meecast/qt-qml/networkingcontrol.cpp
@@ -10,15 +10,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU weather-config.h General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/meecast/qt-qml/qmllayoutitem.h b/meecast/qt-qml/qmllayoutitem.h
@@ -11,15 +11,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU weather-config.h General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/meecast/qt-qml/updatethread.cpp b/meecast/qt-qml/updatethread.cpp
@@ -11,15 +11,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU weather-config.h General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/omweather-core/src/omweather-sensor.hpp b/omweather-core/src/omweather-sensor.hpp
@@ -11,15 +11,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/omweather-core/src/omweather-sources.hpp b/omweather-core/src/omweather-sources.hpp
@@ -11,15 +11,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/omweather-meteonova-ru-stations-db/src/hash.h b/omweather-meteonova-ru-stations-db/src/hash.h
@@ -10,15 +10,16 @@
  *	for default icon set (Glance)
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ *  General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU  General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/omweather-meteonova-ru-stations-db/src/meego-main.c b/omweather-meteonova-ru-stations-db/src/meego-main.c
@@ -6,15 +6,16 @@
  * 	for the code
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
+ * modify it under the terms of the GNU  General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that 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.
+ *  General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU  General Public
  * License along with this software; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA

diff --git a/omweather-weather-com-stations-db/omweather-weather-com-stations-db.spec b/omweather-weather-com-stations-db/omweather-weather-com-stations-db.spec
@@ -10,7 +10,7 @@ Summary:    Stations database and source lib for weather.com for Other Maemo Wea
 Version:    1.0.1
 Release:    1
 Group:      Applications/Internet
-License:    LGPL-2.1-only
+License:    GPLv2.1
 URL:        https://garage.maemo.org/projects/omweather/
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  omweather-weather-com-stations-db.yaml

diff --git a/omweather-weather-com-stations-db/omweather-weather-com-stations-db.yaml b/omweather-weather-com-stations-db/omweather-weather-com-stations-db.yaml
@@ -3,7 +3,7 @@ Summary: Stations database and source lib for weather.com for Other Maemo Weathe
 Version: 1.0.1
 Release: 1
 Group: Applications/Internet 
-License: LGPL-2.1-only
+License: GPLv2.1
 URL: https://garage.maemo.org/projects/omweather/ 
 Sources:
     - "%{name}-%{version}.tar.bz2"

diff --git a/omweather-wunderground-com-stations-db/debian/copyright b/omweather-wunderground-com-stations-db/debian/copyright
@@ -5,15 +5,17 @@ Copyright (C) 2006-2009 Pavel Fialko
 	for the code
 
 This software is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public License
-version 2.1 as published by the Free Software Foundation.
+modify it under the terms of the GNU  General Public License
+as published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
 
 This software is distributed in the hope that 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.
+ General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public
+You should have received a copy of the GNU  General Public
 License along with this software; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 02110-1301 USA
+