From kde-commits  Fri Jun 11 15:44:38 2004
From: Andrew Stanley-Jones <asj () cban ! com>
Date: Fri, 11 Jun 2004 15:44:38 +0000
To: kde-commits
Subject: kdebase/klipper
Message-Id: <20040611154438.6CD589145 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=108696876714360

CVS commit by asj: 

Everyone has agreed to change the license to GPL in 0.9.6


  M +1 -1      applet.cpp   1.9
  M +1 -1      applet.h   1.8
  M +1 -1      clipboardpoll.cpp   1.7
  M +1 -1      clipboardpoll.h   1.3
  M +1 -1      configdialog.cpp   1.68
  M +1 -1      configdialog.h   1.31
  M +1 -1      main.cpp   1.38
  M +2 -2      toplevel.cpp   1.153
  M +1 -1      toplevel.h   1.51
  M +1 -1      urlgrabber.cpp   1.44
  M +1 -1      urlgrabber.h   1.20
  M +2 -2      version.h   1.7


--- kdebase/klipper/applet.cpp  #1.8:1.9
@@ -8,5 +8,5 @@
    Generated with the KDE Application Generator
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/applet.h  #1.7:1.8
@@ -7,5 +7,5 @@
    Generated with the KDE Application Generator
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/clipboardpoll.cpp  #1.6:1.7
@@ -5,5 +5,5 @@
    (C) 2003 by Lubos Lunak <l.lunak@kde.org>
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/clipboardpoll.h  #1.2:1.3
@@ -5,5 +5,5 @@
    (C) 2003 by Lubos Lunak <l.lunak@kde.org>
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/configdialog.cpp  #1.67:1.68
@@ -6,5 +6,5 @@
    (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/configdialog.h  #1.30:1.31
@@ -6,5 +6,5 @@
    (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/main.cpp  #1.37:1.38
@@ -7,5 +7,5 @@
    Generated with the KDE Application Generator
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/toplevel.cpp  #1.152:1.153
@@ -8,5 +8,5 @@
    Generated with the KDE Application Generator
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */
@@ -875,5 +875,5 @@ void KlipperWidget::createAboutData()
 {
   about_data = new KAboutData("klipper", I18N_NOOP("Klipper"),
-    klipper_version, description, KAboutData::License_Artistic,
+    klipper_version, description, KAboutData::License_GPL,
                        "(c) 1998, Andrew Stanley-Jones\n"
                        "1998-2002, Carsten Pfeiffer\n"

--- kdebase/klipper/toplevel.h  #1.50:1.51
@@ -7,5 +7,5 @@
    Generated with the KDE Application Generator
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/urlgrabber.cpp  #1.43:1.44
@@ -5,5 +5,5 @@
    (C) 2000,2001,2002 by Carsten Pfeiffer <pfeiffer@kde.org>
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/urlgrabber.h  #1.19:1.20
@@ -5,5 +5,5 @@
    (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */

--- kdebase/klipper/version.h  #1.6:1.7
@@ -7,5 +7,5 @@
    Generated with the KDE Application Generator
 
-   Licensed under the Artistic License
+   Licensed under the GNU GPL Version 2
 
  ------------------------------------------------------------- */
@@ -15,5 +15,5 @@
 #define _VERSION_H_
 
-static const char * const klipper_version = "v0.9.5";
+static const char * const klipper_version = "v0.9.6";