[Ktutorial-commits] SF.net SVN: ktutorial:[388] trunk/web-src

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 388
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=388&view=rev
Author:   danxuliu
Date:     2012-09-04 22:38:45 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Update web page to reflect the license change from GPLv3+ to GPLv2+. Two of the example tutorials where also licensed under the GPLv2+ (the third one was a derivated work, so I couldn't change its license).

Modified Paths:
--------------
    trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml
    trunk/web-src/data/files/examples/gwenview.patch
    trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml
    trunk/web-src/data/files/examples/kdenlive.patch
    trunk/web-src/newsList.xml
    trunk/web-src/pages/about.xml
    trunk/web-src/pages/index.xml
    trunk/web-src/pages/news.xml

Modified: trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml
===================================================================

--- trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml	2012-09-04 21:48:04 UTC (rev 387)
+++ trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml	2012-09-04 22:38:45 UTC (rev 388)
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tutorial name="Full screen interface">
     <description>An overview of the full screen interface of Gwenview.</description>
+    <license>Copyright (C) 2012 by Daniel Calviño Sánchez &lt;dan...@gm...&gt;
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; If not, see &lt;http://www.gnu.org/licenses/&gt;.</license>
     <step id="start">
         <text>&lt;para&gt;Gwenview features two modes: browse and view. In versions prior to 2.9 only the view mode had also a full screen interface. In Gwenview 2.9 a full screen interface was added for the browse mode too.&lt;/para&gt;
 

Modified: trunk/web-src/data/files/examples/gwenview.patch
===================================================================
--- trunk/web-src/data/files/examples/gwenview.patch	2012-09-04 21:48:04 UTC (rev 387)
+++ trunk/web-src/data/files/examples/gwenview.patch	2012-09-04 22:38:45 UTC (rev 388)
@@ -110,10 +110,27 @@
 +install(FILES fullScreenInterface.js DESTINATION ${DATA_INSTALL_DIR}/gwenview/tutorials/)
 diff --git a/tutorials/fullScreenInterface.js b/tutorials/fullScreenInterface.js
 new file mode 100644
-index 0000000..0c4153d
+index 0000000..92665f0
 --- /dev/null
 +++ b/tutorials/fullScreenInterface.js
-@@ -0,0 +1,191 @@
+@@ -0,0 +1,208 @@
++/****************************************************************************
++ *   Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...>      *
++ *                                                                          *
++ *   This program is free software; you can redistribute it and/or modify   *
++ *   it under the terms of the GNU General Public License as published by   *
++ *   the Free Software Foundation; either version 2 of the License, or      *
++ *   (at your option) any later version.                                    *
++ *                                                                          *
++ *   This program 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 General Public License for more details.                           *
++ *                                                                          *
++ *   You should have received a copy of the GNU General Public License      *
++ *   along with this program; If not, see <http://www.gnu.org/licenses/>.   *
++ ****************************************************************************/
++
 +t = Kross.module("kdetranslation");
 +
 +tutorial.tutorialInformationAsObject().setName(t.i18n("Full screen interface"));

Modified: trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml
===================================================================
--- trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml	2012-09-04 21:48:04 UTC (rev 387)
+++ trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml	2012-09-04 22:38:45 UTC (rev 388)
@@ -3,7 +3,18 @@
     <description>Basic usage of &quot;slide&quot; transition.</description>
     <license>Copyright (C) 2012 by Daniel Calviño Sánchez &lt;dan...@gm...&gt;
 
-This tutorial is licensed under the Creative Commons Attribution-ShareAlike License (http://creativecommons.org/licenses/by-sa/3.0/).</license>
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; If not, see &lt;http://www.gnu.org/licenses/&gt;.</license>
     <step id="start">
         <text>&lt;para&gt;In this tutorial you will learn how to add a &lt;emphasis&gt;slide&lt;/emphasis&gt; transition between two clips and how to do some basic changes in the transition.&lt;/para&gt;
 

Modified: trunk/web-src/data/files/examples/kdenlive.patch
===================================================================
--- trunk/web-src/data/files/examples/kdenlive.patch	2012-09-04 21:48:04 UTC (rev 387)
+++ trunk/web-src/data/files/examples/kdenlive.patch	2012-09-04 22:38:45 UTC (rev 388)
@@ -21,15 +21,26 @@
 +install(FILES simpleSlideTransitionBetweenTwoClips.js DESTINATION ${DATA_INSTALL_DIR}/kdenlive/tutorials)
 diff --git a/data/simpleSlideTransitionBetweenTwoClips.js b/data/simpleSlideTransitionBetweenTwoClips.js
 new file mode 100644
-index 0000000..375f877
+index 0000000..a05a9cf
 --- /dev/null
 +++ b/data/simpleSlideTransitionBetweenTwoClips.js
-@@ -0,0 +1,310 @@
-+/*********************************************************************************************************************************************
-+ *   Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...>                                                                       *
-+ *                                                                                                                                           *
-+ *   This tutorial is licensed under the Creative Commons Attribution-ShareAlike License (http://creativecommons.org/licenses/by-sa/3.0/).   *
-+ *********************************************************************************************************************************************/
+@@ -0,0 +1,321 @@
++/****************************************************************************
++ *   Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...>      *
++ *                                                                          *
++ *   This program is free software; you can redistribute it and/or modify   *
++ *   it under the terms of the GNU General Public License as published by   *
++ *   the Free Software Foundation; either version 2 of the License, or      *
++ *   (at your option) any later version.                                    *
++ *                                                                          *
++ *   This program 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 General Public License for more details.                           *
++ *                                                                          *
++ *   You should have received a copy of the GNU General Public License      *
++ *   along with this program; If not, see <http://www.gnu.org/licenses/>.   *
++ ****************************************************************************/
 +
 +t = Kross.module("kdetranslation");
 +

Modified: trunk/web-src/newsList.xml
===================================================================
--- trunk/web-src/newsList.xml	2012-09-04 21:48:04 UTC (rev 387)
+++ trunk/web-src/newsList.xml	2012-09-04 22:38:45 UTC (rev 388)
@@ -79,4 +79,17 @@
 			<date>2012-08-30</date>
 		</fullDate>
 	</new>
+
+	<new>
+		<title>License changed from GPLv3+ to GPLv2+</title>
+		<summary>
+			<div xmlns="http://www.w3.org/1999/xhtml">
+				<p>I have changed the KTutorial license from GPLv3+ to GPLv2+ to ensure that any KDE application can use KTutorial (with the previous license it could be used only in applications that did not link against any GPLv2 only libraries) and to be able to move the code to KDE repositories.</p>
+				<p>I will release a new KTutorial version featuring the new license soon.</p>
+			</div>
+		</summary>
+		<fullDate>
+			<date>2012-09-04</date>
+		</fullDate>
+	</new>
 </news>

Modified: trunk/web-src/pages/about.xml
===================================================================
--- trunk/web-src/pages/about.xml	2012-09-04 21:48:04 UTC (rev 387)
+++ trunk/web-src/pages/about.xml	2012-09-04 22:38:45 UTC (rev 388)
@@ -18,7 +18,7 @@
 			<h2><a id="project" class="anchorLink">Project overview</a></h2>
 		</div>
 		<p>KTutorial is a library (and a graphical editor) for interactive tutorials in KDE applications. Tutorials are embeded in the application itself, and react to user actions: wait for some task to be accomplished, warn if something wasn't done as it should, etcetera. As the tutorial is being followed, the system gives feedback to the user.</p>
-		<p>It is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html" title="GNU General Public License page">GNU GPL license</a>. It is also free as in "free beer".</p>
+		<p>It is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html" title="GNU General Public License page">GNU GPL version 2 or later</a>. It is also free as in "free beer".</p>
 
 		<div class="h2Rounded">
 			<h2><a id="author" class="anchorLink">Author</a></h2>
@@ -34,6 +34,6 @@
 		<p>The web is divided in several sections that can be accessed through the links in the menu in each page. I'm not going to explain its structure, as it seems very clear and I have better things to spend my time on :P</p>
 		<p>You can find information about how this web is built in its own page: <a href="aboutWeb.html" title="About KTutorial project web building">About web</a>.</p>
 
-		<p class="lastUpdated">Last updated: 2012-08-21</p>
+		<p class="lastUpdated">Last updated: 2012-09-04</p>
 	</page:content>
 </page>

Modified: trunk/web-src/pages/index.xml
===================================================================
--- trunk/web-src/pages/index.xml	2012-09-04 21:48:04 UTC (rev 387)
+++ trunk/web-src/pages/index.xml	2012-09-04 22:38:45 UTC (rev 388)
@@ -16,7 +16,7 @@
 	<page:content xmlns:page="http://lusi.berlios.de/namespaces/page" xmlns="http://www.w3.org/1999/xhtml">
 		<h1>Main</h1>
 		<p>KTutorial is a library for interactive tutorials in KDE applications. Tutorials are embeded in the application itself, and reacts to user actions: waits for some task to be accomplished, warns if something wasn't done as it should, etcetera. As the tutorial is being followed, the system gives feedback to the user.</p>
-		<p>It is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html" title="GNU General Public License page">GNU GPL license</a>. It is also free as in "free beer".</p>
+		<p>It is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html" title="GNU General Public License page">GNU GPL version 2 or later</a>. It is also free as in "free beer".</p>
 		<h1>News</h1>
 		<p id="rssFeed">
 			<a href="feed/atom/news.xml" type="application/atom+xml" title="Atom feed">
@@ -26,6 +26,20 @@
 		<div id="news">
 			<div class="new">
 				<h2 class="newTitle">
+					<a id="newId7" class="anchorLink">License changed from GPLv3+ to GPLv2+</a>
+				</h2>
+				<div class="newBody">
+					<p class="newDate">2012-09-04</p>
+					<div class="newContent">
+						<div>
+							<p>I have changed the KTutorial license from GPLv3+ to GPLv2+ to ensure that any KDE application can use KTutorial (with the previous license it could be used only in applications that did not link against any GPLv2 only libraries) and to be able to move the code to KDE repositories.</p>
+							<p>I will release a new KTutorial version featuring the new license soon.</p>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="new">
+				<h2 class="newTitle">
 					<a id="newId6" class="anchorLink">Examples of KTutorial for the real world</a>
 				</h2>
 				<div class="newBody">

Modified: trunk/web-src/pages/news.xml
===================================================================
--- trunk/web-src/pages/news.xml	2012-09-04 21:48:04 UTC (rev 387)
+++ trunk/web-src/pages/news.xml	2012-09-04 22:38:45 UTC (rev 388)
@@ -23,6 +23,20 @@
 		<div id="news">
 			<div class="new">
 				<h2 class="newTitle">
+					<a id="newId7" class="anchorLink">License changed from GPLv3+ to GPLv2+</a>
+				</h2>
+				<div class="newBody">
+					<p class="newDate">2012-09-04</p>
+					<div class="newContent">
+						<div>
+							<p>I have changed the KTutorial license from GPLv3+ to GPLv2+ to ensure that any KDE application can use KTutorial (with the previous license it could be used only in applications that did not link against any GPLv2 only libraries) and to be able to move the code to KDE repositories.</p>
+							<p>I will release a new KTutorial version featuring the new license soon.</p>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="new">
+				<h2 class="newTitle">
 					<a id="newId6" class="anchorLink">Examples of KTutorial for the real world</a>
 				</h2>
 				<div class="newBody">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



