summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--COPYING140
-rw-r--r--ChangeLog5
-rw-r--r--bus/activation.c2
-rw-r--r--bus/activation.h2
-rw-r--r--bus/bus.c2
-rw-r--r--bus/bus.h2
-rw-r--r--bus/config-loader-expat.c2
-rw-r--r--bus/config-loader-libxml.c2
-rw-r--r--bus/config-parser.c2
-rw-r--r--bus/config-parser.h2
-rw-r--r--bus/connection.c2
-rw-r--r--bus/connection.h2
-rw-r--r--bus/desktop-file.c2
-rw-r--r--bus/desktop-file.h2
-rw-r--r--bus/dispatch.c2
-rw-r--r--bus/dispatch.h2
-rw-r--r--bus/driver.c2
-rw-r--r--bus/driver.h2
-rw-r--r--bus/expirelist.c2
-rw-r--r--bus/expirelist.h2
-rw-r--r--bus/main.c2
-rw-r--r--bus/policy.c2
-rw-r--r--bus/policy.h2
-rw-r--r--bus/selinux.c2
-rw-r--r--bus/selinux.h2
-rw-r--r--bus/services.c2
-rw-r--r--bus/services.h2
-rw-r--r--bus/signals.c2
-rw-r--r--bus/signals.h2
-rw-r--r--bus/test-main.c2
-rw-r--r--bus/test.c2
-rw-r--r--bus/test.h2
-rw-r--r--bus/utils.c2
-rw-r--r--bus/utils.h2
-rw-r--r--dbus/dbus-address.c2
-rw-r--r--dbus/dbus-address.h2
-rw-r--r--dbus/dbus-auth-script.c2
-rw-r--r--dbus/dbus-auth-script.h2
-rw-r--r--dbus/dbus-auth.c2
-rw-r--r--dbus/dbus-auth.h2
-rw-r--r--dbus/dbus-bus.c2
-rw-r--r--dbus/dbus-bus.h2
-rw-r--r--dbus/dbus-connection-internal.h2
-rw-r--r--dbus/dbus-connection.c2
-rw-r--r--dbus/dbus-connection.h2
-rw-r--r--dbus/dbus-dataslot.c2
-rw-r--r--dbus/dbus-dataslot.h2
-rw-r--r--dbus/dbus-errors.c2
-rw-r--r--dbus/dbus-errors.h2
-rw-r--r--dbus/dbus-glib-lowlevel.h2
-rw-r--r--dbus/dbus-glib.h2
-rw-r--r--dbus/dbus-hash.c2
-rw-r--r--dbus/dbus-hash.h2
-rw-r--r--dbus/dbus-internals.c2
-rw-r--r--dbus/dbus-internals.h2
-rw-r--r--dbus/dbus-keyring.c2
-rw-r--r--dbus/dbus-keyring.h2
-rw-r--r--dbus/dbus-list.c2
-rw-r--r--dbus/dbus-list.h2
-rw-r--r--dbus/dbus-macros.h2
-rw-r--r--dbus/dbus-mainloop.c2
-rw-r--r--dbus/dbus-mainloop.h2
-rw-r--r--dbus/dbus-marshal.c2
-rw-r--r--dbus/dbus-marshal.h2
-rw-r--r--dbus/dbus-md5.h2
-rw-r--r--dbus/dbus-memory.c2
-rw-r--r--dbus/dbus-memory.h2
-rw-r--r--dbus/dbus-mempool.c2
-rw-r--r--dbus/dbus-mempool.h2
-rw-r--r--dbus/dbus-message-builder.c2
-rw-r--r--dbus/dbus-message-builder.h2
-rw-r--r--dbus/dbus-message-internal.h2
-rw-r--r--dbus/dbus-message.c2
-rw-r--r--dbus/dbus-message.h2
-rw-r--r--dbus/dbus-object-tree.c2
-rw-r--r--dbus/dbus-object-tree.h2
-rw-r--r--dbus/dbus-pending-call.c2
-rw-r--r--dbus/dbus-pending-call.h2
-rw-r--r--dbus/dbus-protocol.h2
-rw-r--r--dbus/dbus-resources.c2
-rw-r--r--dbus/dbus-resources.h2
-rw-r--r--dbus/dbus-server-debug-pipe.c2
-rw-r--r--dbus/dbus-server-debug-pipe.h2
-rw-r--r--dbus/dbus-server-protected.h2
-rw-r--r--dbus/dbus-server-unix.c2
-rw-r--r--dbus/dbus-server-unix.h2
-rw-r--r--dbus/dbus-server.c2
-rw-r--r--dbus/dbus-server.h2
-rw-r--r--dbus/dbus-sha.c2
-rw-r--r--dbus/dbus-sha.h2
-rw-r--r--dbus/dbus-shared.h2
-rw-r--r--dbus/dbus-spawn.c2
-rw-r--r--dbus/dbus-spawn.h2
-rw-r--r--dbus/dbus-string-private.h2
-rw-r--r--dbus/dbus-string.c2
-rw-r--r--dbus/dbus-string.h2
-rw-r--r--dbus/dbus-sysdeps.c2
-rw-r--r--dbus/dbus-sysdeps.h2
-rw-r--r--dbus/dbus-test-main.c2
-rw-r--r--dbus/dbus-test.c2
-rw-r--r--dbus/dbus-test.h2
-rw-r--r--dbus/dbus-threads.c2
-rw-r--r--dbus/dbus-threads.h2
-rw-r--r--dbus/dbus-timeout.c2
-rw-r--r--dbus/dbus-timeout.h2
-rw-r--r--dbus/dbus-transport-protected.h2
-rw-r--r--dbus/dbus-transport-unix.c2
-rw-r--r--dbus/dbus-transport-unix.h2
-rw-r--r--dbus/dbus-transport.c2
-rw-r--r--dbus/dbus-transport.h2
-rw-r--r--dbus/dbus-types.h2
-rw-r--r--dbus/dbus-userdb.c2
-rw-r--r--dbus/dbus-userdb.h2
-rw-r--r--dbus/dbus-watch.c2
-rw-r--r--dbus/dbus-watch.h2
-rw-r--r--dbus/dbus.h2
-rw-r--r--doc/file-boilerplate.c2
-rw-r--r--glib/dbus-gidl.c2
-rw-r--r--glib/dbus-gidl.h2
-rw-r--r--glib/dbus-glib-tool.c2
-rw-r--r--glib/dbus-glib.c2
-rw-r--r--glib/dbus-gloader-expat.c2
-rw-r--r--glib/dbus-gmain.c2
-rw-r--r--glib/dbus-gobject.c2
-rw-r--r--glib/dbus-gparser.c2
-rw-r--r--glib/dbus-gparser.h2
-rw-r--r--glib/dbus-gproxy.c4
-rw-r--r--glib/dbus-gtest-main.c2
-rw-r--r--glib/dbus-gtest.c2
-rw-r--r--glib/dbus-gtest.h2
-rw-r--r--glib/dbus-gthread.c2
-rw-r--r--glib/dbus-gtool-test.h2
-rw-r--r--glib/dbus-gutils.c2
-rw-r--r--glib/dbus-gutils.h2
-rw-r--r--qt/connection.h2
-rw-r--r--qt/dbus-qt.h2
-rw-r--r--qt/integrator.h2
-rw-r--r--qt/message.h2
-rw-r--r--qt/server.h2
-rw-r--r--test/break-loader.c2
-rw-r--r--test/glib/test-profile.c2
-rw-r--r--tools/dbus-launch.c2
-rw-r--r--tools/dbus-tree-view.c2
-rw-r--r--tools/dbus-tree-view.h2
-rw-r--r--tools/dbus-viewer.c2
145 files changed, 219 insertions, 214 deletions
diff --git a/COPYING b/COPYING
index 0fac0d6b..90085d3b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,33 +1,32 @@
D-BUS is licensed to you under your choice of the Academic Free
-License version 2.0, or the GNU General Public License version 2.
+License version 2.1, or the GNU General Public License version 2.
Both licenses are included here. Some of the standalone binaries are
under the GPL only; in particular, but not limited to,
tools/dbus-cleanup-sockets.c and test/decode-gcov.c. Each source code
file is marked with the proper copyright information.
- The Academic Free License
- v. 2.0
-This Academic Free License (the "License") applies to any original
-work of authorship (the "Original Work") whose owner (the "Licensor")
-has placed the following notice immediately following the copyright
-notice for the Original Work:
-Licensed under the Academic Free License version 2.0
+The Academic Free License
+v. 2.1
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 2.1
1) Grant of Copyright License. Licensor hereby grants You a
world-wide, royalty-free, non-exclusive, perpetual, sublicenseable
license to do the following:
-a) to reproduce the Original Work in copies;
+a) to reproduce the Original Work in copies;
-b) to prepare derivative works ("Derivative Works") based upon the Original Work;
+b) to prepare derivative works ("Derivative Works") based upon the Original Work;
-c) to distribute copies of the Original Work and Derivative Works to the public;
+c) to distribute copies of the Original Work and Derivative Works to the public;
-d) to perform the Original Work publicly; and
+d) to perform the Original Work publicly; and
-e) to display the Original Work publicly.
+e) to display the Original Work publicly.
2) Grant of Patent License. Licensor hereby grants You a world-wide,
royalty-free, non-exclusive, perpetual, sublicenseable license, under
@@ -38,38 +37,38 @@ offer for sale the Original Work and Derivative Works.
3) Grant of Source Code License. The term "Source Code" means the
preferred form of the Original Work for making modifications to it and
all available documentation describing how to modify the Original
-Work. Licensor hereby agrees to provide a machine-readable copy of
-the Source Code of the Original Work along with each copy of the
-Original Work that Licensor distributes. Licensor reserves the right
-to satisfy this obligation by placing a machine-readable copy of the
-Source Code in an information repository reasonably calculated to
-permit inexpensive and convenient access by You for as long as
-Licensor continues to distribute the Original Work, and by publishing
-the address of that information repository in a notice immediately
+Work. Licensor hereby agrees to provide a machine-readable copy of the
+Source Code of the Original Work along with each copy of the Original
+Work that Licensor distributes. Licensor reserves the right to satisfy
+this obligation by placing a machine-readable copy of the Source Code
+in an information repository reasonably calculated to permit
+inexpensive and convenient access by You for as long as Licensor
+continues to distribute the Original Work, and by publishing the
+address of that information repository in a notice immediately
following the copyright notice that applies to the Original Work.
4) Exclusions From License Grant. Neither the names of Licensor, nor
the names of any contributors to the Original Work, nor any of their
trademarks or service marks, may be used to endorse or promote
products derived from this Original Work without express prior written
-permission of the Licensor. Nothing in this License shall be deemed
-to grant any rights to trademarks, copyrights, patents, trade secrets
-or any other intellectual property of Licensor except as expressly
-stated herein. No patent license is granted to make, use, sell or
-offer to sell embodiments of any patent claims other than the licensed
-claims defined in Section 2. No right is granted to the trademarks of
-Licensor even if such marks are included in the Original Work.
-Nothing in this License shall be interpreted to prohibit Licensor from
+permission of the Licensor. Nothing in this License shall be deemed to
+grant any rights to trademarks, copyrights, patents, trade secrets or
+any other intellectual property of Licensor except as expressly stated
+herein. No patent license is granted to make, use, sell or offer to
+sell embodiments of any patent claims other than the licensed claims
+defined in Section 2. No right is granted to the trademarks of
+Licensor even if such marks are included in the Original Work. Nothing
+in this License shall be interpreted to prohibit Licensor from
licensing under different terms from this License any Original Work
that Licensor otherwise would have a right to license.
-5) This section intentionally omitted.
+5) This section intentionally omitted.
6) Attribution Rights. You must retain, in the Source Code of any
Derivative Works that You create, all copyright, patent or trademark
notices from the Source Code of the Original Work, as well as any
notices of licensing and any descriptive text identified therein as an
-"Attribution Notice." You must cause the Source Code for any
+"Attribution Notice." You must cause the Source Code for any
Derivative Works that You create to carry a prominent Attribution
Notice reasonably calculated to inform recipients that You have
modified the Original Work.
@@ -78,15 +77,15 @@ modified the Original Work.
warrants that the copyright in and to the Original Work and the patent
rights granted herein by Licensor are owned by the Licensor or are
sublicensed to You under the terms of this License with the permission
-of the contributor(s) of those copyrights and patent rights. Except
-as expressly stated in the immediately proceeding sentence, the
-Original Work is provided under this License on an "AS IS" BASIS and
-WITHOUT WARRANTY, either express or implied, including, without
-limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY
-OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY
-constitutes an essential part of this License. No license to Original
-Work is granted hereunder except under this disclaimer.
+of the contributor(s) of those copyrights and patent rights. Except as
+expressly stated in the immediately proceeding sentence, the Original
+Work is provided under this License on an "AS IS" BASIS and WITHOUT
+WARRANTY, either express or implied, including, without limitation,
+the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL
+WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential
+part of this License. No license to Original Work is granted hereunder
+except under this disclaimer.
8) Limitation of Liability. Under no circumstances and under no legal
theory, whether in tort (including negligence), contract, or
@@ -95,80 +94,81 @@ indirect, special, incidental, or consequential damages of any
character arising as a result of this License or the use of the
Original Work including, without limitation, damages for loss of
goodwill, work stoppage, computer failure or malfunction, or any and
-all other commercial damages or losses. This limitation of liability
+all other commercial damages or losses. This limitation of liability
shall not apply to liability for death or personal injury resulting
from Licensor's negligence to the extent applicable law prohibits such
-limitation. Some jurisdictions do not allow the exclusion or
+limitation. Some jurisdictions do not allow the exclusion or
limitation of incidental or consequential damages, so this exclusion
and limitation may not apply to You.
9) Acceptance and Termination. If You distribute copies of the
Original Work or a Derivative Work, You must make a reasonable effort
under the circumstances to obtain the express assent of recipients to
-the terms of this License. Nothing else but this License (or another
+the terms of this License. Nothing else but this License (or another
written agreement between Licensor and You) grants You permission to
create Derivative Works based upon the Original Work or to exercise
any of the rights granted in Section 1 herein, and any attempt to do
so except under the terms of this License (or another written
agreement between Licensor and You) is expressly prohibited by
U.S. copyright law, the equivalent laws of other countries, and by
-international treaty. Therefore, by exercising any of the rights
+international treaty. Therefore, by exercising any of the rights
granted to You in Section 1 herein, You indicate Your acceptance of
this License and all of its terms and conditions.
10) Termination for Patent Action. This License shall terminate
automatically and You may no longer exercise any of the rights granted
to You by this License as of the date You commence an action,
-including a cross-claim or counterclaim, for patent infringement (i)
-against Licensor with respect to a patent applicable to software or
-(ii) against any entity with respect to a patent applicable to the
-Original Work (but excluding combinations of the Original Work with
-other software or hardware).
+including a cross-claim or counterclaim, against Licensor or any
+licensee alleging that the Original Work infringes a patent. This
+termination provision shall not apply for an action alleging patent
+infringement by combinations of the Original Work with other software
+or hardware.
11) Jurisdiction, Venue and Governing Law. Any action or suit relating
to this License may be brought only in the courts of a jurisdiction
wherein the Licensor resides or in which Licensor conducts its primary
business, and under the laws of that jurisdiction excluding its
-conflict-of-law provisions. The application of the United Nations
+conflict-of-law provisions. The application of the United Nations
Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any use of the Original Work outside the scope of
+expressly excluded. Any use of the Original Work outside the scope of
this License or after its termination shall be subject to the
-requirements and penalties of the U.S. Copyright Act, 17 U.S.C. \u00a4
-101 et seq., the equivalent laws of other countries, and international
-treaty. This section shall survive the termination of this License.
+requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101
+et seq., the equivalent laws of other countries, and international
+treaty. This section shall survive the termination of this License.
12) Attorneys Fees. In any action to enforce the terms of this License
or seeking damages relating thereto, the prevailing party shall be
entitled to recover its costs and expenses, including, without
limitation, reasonable attorneys' fees and costs incurred in
-connection with such action, including any appeal of such action.
-This section shall survive the termination of this License.
+connection with such action, including any appeal of such action. This
+section shall survive the termination of this License.
13) Miscellaneous. This License represents the complete agreement
-concerning the subject matter hereof. If any provision of this
-License is held to be unenforceable, such provision shall be reformed
-only to the extent necessary to make it enforceable.
+concerning the subject matter hereof. If any provision of this License
+is held to be unenforceable, such provision shall be reformed only to
+the extent necessary to make it enforceable.
14) Definition of "You" in This License. "You" throughout this
License, whether in upper or lower case, means an individual or a
legal entity exercising rights under, and complying with all of the
-terms of, this License. For legal entities, "You" includes any entity
-that controls, is controlled by, or is under common control with you.
-For 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.
+terms of, this License. For legal entities, "You" includes any entity
+that controls, is controlled by, or is under common control with
+you. For 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.
15) Right to Use. You may use the Original Work in all ways not
otherwise restricted or conditioned by this License or by law, and
Licensor promises not to interfere with or be responsible for such
uses by You.
-This license is Copyright (C) 2003 Lawrence E. Rosen. All rights
-reserved. Permission is hereby granted to copy and distribute this
-license without modification. This license may not be modified
-without the express written permission of its copyright owner.
+This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights
+reserved. Permission is hereby granted to copy and distribute this
+license without modification. This license may not be modified without
+the express written permission of its copyright owner.
+
--
END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential
diff --git a/ChangeLog b/ChangeLog
index 9baa48a2..f54f01e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-09 Havoc Pennington <hp@redhat.com>
+
+ * COPYING: switch to Academic Free License version 2.1 instead of
+ 2.0, to resolve complaints about patent termination clause.
+
2004-07-31 John (J5) Palmieri <johnp@redhat.com>
* README: added documentation for the --enable-python
diff --git a/bus/activation.c b/bus/activation.c
index b799948f..9010b941 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -5,7 +5,7 @@
* Copyright (C) 2003 Red Hat, Inc.
* Copyright (C) 2004 Imendio HB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/activation.h b/bus/activation.h
index fbac5d1f..d12d8718 100644
--- a/bus/activation.h
+++ b/bus/activation.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/bus.c b/bus/bus.c
index 61f6d7d3..c732280d 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/bus.h b/bus/bus.h
index eab79347..79adf83a 100644
--- a/bus/bus.h
+++ b/bus/bus.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
index ed973ac1..44e2ea61 100644
--- a/bus/config-loader-expat.c
+++ b/bus/config-loader-expat.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/config-loader-libxml.c b/bus/config-loader-libxml.c
index 51ee1e59..d9892d1b 100644
--- a/bus/config-loader-libxml.c
+++ b/bus/config-loader-libxml.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/config-parser.c b/bus/config-parser.c
index 89492f03..acf40228 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/config-parser.h b/bus/config-parser.h
index 77b92551..75004000 100644
--- a/bus/config-parser.h
+++ b/bus/config-parser.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/connection.c b/bus/connection.c
index b751cca8..a16a22cd 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/connection.h b/bus/connection.h
index ee1291fa..a0703c55 100644
--- a/bus/connection.h
+++ b/bus/connection.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/desktop-file.c b/bus/desktop-file.c
index 59f0f509..5ba99832 100644
--- a/bus/desktop-file.c
+++ b/bus/desktop-file.c
@@ -4,7 +4,7 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/desktop-file.h b/bus/desktop-file.h
index d1d04954..279641ef 100644
--- a/bus/desktop-file.h
+++ b/bus/desktop-file.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/dispatch.c b/bus/dispatch.c
index 51112ce7..f808a8e4 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -5,7 +5,7 @@
* Copyright (C) 2003 Red Hat, Inc.
* Copyright (C) 2004 Imendio HB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/dispatch.h b/bus/dispatch.h
index 740a6b04..f29a1e0f 100644
--- a/bus/dispatch.h
+++ b/bus/dispatch.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/driver.c b/bus/driver.c
index a0d433f0..5c4f4020 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -4,7 +4,7 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/driver.h b/bus/driver.h
index bc3c371d..f971838a 100644
--- a/bus/driver.h
+++ b/bus/driver.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/expirelist.c b/bus/expirelist.c
index f1485dc1..422f3e40 100644
--- a/bus/expirelist.c
+++ b/bus/expirelist.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/expirelist.h b/bus/expirelist.h
index 9baa36da..cc77867e 100644
--- a/bus/expirelist.h
+++ b/bus/expirelist.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/main.c b/bus/main.c
index 32a6161b..391627ff 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/policy.c b/bus/policy.c
index c7359c8d..3de693f7 100644
--- a/bus/policy.c
+++ b/bus/policy.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/policy.h b/bus/policy.h
index f2bac8cc..61e089a7 100644
--- a/bus/policy.h
+++ b/bus/policy.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/selinux.c b/bus/selinux.c
index f7fbf319..2477233b 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -2,7 +2,7 @@
*
* Author: Matthew Rickard <mjricka@epoch.ncsc.mil>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/selinux.h b/bus/selinux.h
index 79a9f98b..08ea3a02 100644
--- a/bus/selinux.h
+++ b/bus/selinux.h
@@ -2,7 +2,7 @@
*
* Author: Matthew Rickard <mjricka@epoch.ncsc.mil>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/services.c b/bus/services.c
index 81e3eaf3..f5ef4cc2 100644
--- a/bus/services.c
+++ b/bus/services.c
@@ -4,7 +4,7 @@
* Copyright (C) 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/services.h b/bus/services.h
index fa7a3a11..e411aecc 100644
--- a/bus/services.h
+++ b/bus/services.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/signals.c b/bus/signals.c
index 60c88117..f235c8c4 100644
--- a/bus/signals.c
+++ b/bus/signals.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/signals.h b/bus/signals.h
index 447109b5..c9bd5c91 100644
--- a/bus/signals.h
+++ b/bus/signals.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/test-main.c b/bus/test-main.c
index 6d453b40..d92e3fee 100644
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/test.c b/bus/test.c
index 51764bcd..4071fb18 100644
--- a/bus/test.c
+++ b/bus/test.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/test.h b/bus/test.h
index 236afbf1..986df078 100644
--- a/bus/test.h
+++ b/bus/test.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/utils.c b/bus/utils.c
index c4d31fa6..ee729c41 100644
--- a/bus/utils.c
+++ b/bus/utils.c
@@ -4,7 +4,7 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/bus/utils.h b/bus/utils.h
index 6a5d61ff..5281ec7e 100644
--- a/bus/utils.h
+++ b/bus/utils.h
@@ -4,7 +4,7 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-address.c b/dbus/dbus-address.c
index ef163ce3..44675197 100644
--- a/dbus/dbus-address.c
+++ b/dbus/dbus-address.c
@@ -4,7 +4,7 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-address.h b/dbus/dbus-address.h
index 497578f7..a98682e6 100644
--- a/dbus/dbus-address.h
+++ b/dbus/dbus-address.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index acb1e32b..2ed2af37 100644
--- a/dbus/dbus-auth-script.c
+++ b/dbus/dbus-auth-script.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-auth-script.h b/dbus/dbus-auth-script.h
index 799241d8..7d1d34ae 100644
--- a/dbus/dbus-auth-script.h
+++ b/dbus/dbus-auth-script.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index ee3b878d..be3cc302 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-auth.h b/dbus/dbus-auth.h
index aa20ed52..1951df07 100644
--- a/dbus/dbus-auth.h
+++ b/dbus/dbus-auth.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index 567468ff..ec8d7b6a 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -4,7 +4,7 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-bus.h b/dbus/dbus-bus.h
index 536f5014..5f40b7e2 100644
--- a/dbus/dbus-bus.h
+++ b/dbus/dbus-bus.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
index b79aef78..b8b8fc6d 100644
--- a/dbus/dbus-connection-internal.h
+++ b/dbus/dbus-connection-internal.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 91a2100e..6dcc2687 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h
index c8c66a39..090f0ad8 100644
--- a/dbus/dbus-connection.h
+++ b/dbus/dbus-connection.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c
index 0f7b8c76..ef4a493b 100644
--- a/dbus/dbus-dataslot.c
+++ b/dbus/dbus-dataslot.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-dataslot.h b/dbus/dbus-dataslot.h
index 86877af2..f90f5b31 100644
--- a/dbus/dbus-dataslot.h
+++ b/dbus/dbus-dataslot.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c
index ea38df9a..287b4d79 100644
--- a/dbus/dbus-errors.c
+++ b/dbus/dbus-errors.c
@@ -4,7 +4,7 @@
* Copyright (C) 2002, 2004 Red Hat Inc.
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-errors.h b/dbus/dbus-errors.h
index 344c449c..cc9600ad 100644
--- a/dbus/dbus-errors.h
+++ b/dbus/dbus-errors.h
@@ -4,7 +4,7 @@
* Copyright (C) 2002 Red Hat Inc.
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-glib-lowlevel.h b/dbus/dbus-glib-lowlevel.h
index ac2cfa86..f95867db 100644
--- a/dbus/dbus-glib-lowlevel.h
+++ b/dbus/dbus-glib-lowlevel.h
@@ -4,7 +4,7 @@
* Copyright (C) 2002, 2003 CodeFactory AB
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h
index 08c39765..10ddc9c3 100644
--- a/dbus/dbus-glib.h
+++ b/dbus/dbus-glib.h
@@ -4,7 +4,7 @@
* Copyright (C) 2002, 2003 CodeFactory AB
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-hash.c b/dbus/dbus-hash.c
index aa03c59d..c2ebb0f0 100644
--- a/dbus/dbus-hash.c
+++ b/dbus/dbus-hash.c
@@ -10,7 +10,7 @@
* code from tclHash.c; the Tcl license follows this standad D-BUS
* license information.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-hash.h b/dbus/dbus-hash.h
index de6afec2..28d275a0 100644
--- a/dbus/dbus-hash.h
+++ b/dbus/dbus-hash.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index a8a46c6d..e390e4d5 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 0138fb30..512954d6 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index dd22fb64..d1444350 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-keyring.h b/dbus/dbus-keyring.h
index 66cecf9e..d353bf49 100644
--- a/dbus/dbus-keyring.h
+++ b/dbus/dbus-keyring.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c
index 68f89f23..00b03d41 100644
--- a/dbus/dbus-list.c
+++ b/dbus/dbus-list.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-list.h b/dbus/dbus-list.h
index 2b4bc890..50bd9e28 100644
--- a/dbus/dbus-list.h
+++ b/dbus/dbus-list.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
index a5f664c8..37c147cf 100644
--- a/dbus/dbus-macros.h
+++ b/dbus/dbus-macros.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
index a998ccea..886ff049 100644
--- a/dbus/dbus-mainloop.c
+++ b/dbus/dbus-mainloop.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-mainloop.h b/dbus/dbus-mainloop.h
index 61c06f65..cc23129b 100644
--- a/dbus/dbus-mainloop.h
+++ b/dbus/dbus-mainloop.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-marshal.c b/dbus/dbus-marshal.c
index 267fa0f6..00821daf 100644
--- a/dbus/dbus-marshal.c
+++ b/dbus/dbus-marshal.c
@@ -4,7 +4,7 @@
* Copyright (C) 2002 CodeFactory AB
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-marshal.h b/dbus/dbus-marshal.h
index 919d6b08..0a34920f 100644
--- a/dbus/dbus-marshal.h
+++ b/dbus/dbus-marshal.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-md5.h b/dbus/dbus-md5.h
index 079a6ba3..6038705b 100644
--- a/dbus/dbus-md5.h
+++ b/dbus/dbus-md5.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index 8ee65ee3..8ed84c7e 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-memory.h b/dbus/dbus-memory.h
index d13ea6ea..628ff9d8 100644
--- a/dbus/dbus-memory.h
+++ b/dbus/dbus-memory.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-mempool.c b/dbus/dbus-mempool.c
index 25a7464d..c9fa846c 100644
--- a/dbus/dbus-mempool.c
+++ b/dbus/dbus-mempool.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-mempool.h b/dbus/dbus-mempool.h
index 5b2a29d4..8bda2b13 100644
--- a/dbus/dbus-mempool.h
+++ b/dbus/dbus-mempool.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-message-builder.c b/dbus/dbus-message-builder.c
index 4e1502a6..7b2b67ef 100644
--- a/dbus/dbus-message-builder.c
+++ b/dbus/dbus-message-builder.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-message-builder.h b/dbus/dbus-message-builder.h
index 955dbb63..67ff0aa3 100644
--- a/dbus/dbus-message-builder.h
+++ b/dbus/dbus-message-builder.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h
index 5990b05c..e045fb26 100644
--- a/dbus/dbus-message-internal.h
+++ b/dbus/dbus-message-internal.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 1db8bd9c..dc0a6a64 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -4,7 +4,7 @@
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
* Copyright (C) 2002, 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
index 046cad56..4cd702d8 100644
--- a/dbus/dbus-message.h
+++ b/dbus/dbus-message.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index 4f82d6f5..afce2442 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-object-tree.h b/dbus/dbus-object-tree.h
index 56b66ffb..70c3ef9b 100644
--- a/dbus/dbus-object-tree.h
+++ b/dbus/dbus-object-tree.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
index 5ea62c59..d6b343b0 100644
--- a/dbus/dbus-pending-call.c
+++ b/dbus/dbus-pending-call.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-pending-call.h b/dbus/dbus-pending-call.h
index 5d9e8bc2..075a1cf5 100644
--- a/dbus/dbus-pending-call.h
+++ b/dbus/dbus-pending-call.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h
index 00c3ba7d..ce49a38d 100644
--- a/dbus/dbus-protocol.h
+++ b/dbus/dbus-protocol.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-resources.c b/dbus/dbus-resources.c
index 0d78739c..8f1e0892 100644
--- a/dbus/dbus-resources.c
+++ b/dbus/dbus-resources.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-resources.h b/dbus/dbus-resources.h
index 77f31f3e..94c75b90 100644
--- a/dbus/dbus-resources.h
+++ b/dbus/dbus-resources.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c
index 9f1d55f2..0f8f1eda 100644
--- a/dbus/dbus-server-debug-pipe.c
+++ b/dbus/dbus-server-debug-pipe.c
@@ -4,7 +4,7 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-server-debug-pipe.h b/dbus/dbus-server-debug-pipe.h
index b7aaded4..564b7e47 100644
--- a/dbus/dbus-server-debug-pipe.h
+++ b/dbus/dbus-server-debug-pipe.h
@@ -4,7 +4,7 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h
index a1c5ab79..fcfb194b 100644
--- a/dbus/dbus-server-protected.h
+++ b/dbus/dbus-server-protected.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
index 4c79c372..6e0e0f49 100644
--- a/dbus/dbus-server-unix.c
+++ b/dbus/dbus-server-unix.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-server-unix.h b/dbus/dbus-server-unix.h
index c9aecd7d..5aeed50e 100644
--- a/dbus/dbus-server-unix.h
+++ b/dbus/dbus-server-unix.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
index 9661927a..4c706191 100644
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-server.h b/dbus/dbus-server.h
index ba9894e9..2305af8b 100644
--- a/dbus/dbus-server.h
+++ b/dbus/dbus-server.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-sha.c b/dbus/dbus-sha.c
index 54f851a9..d26fb320 100644
--- a/dbus/dbus-sha.c
+++ b/dbus/dbus-sha.c
@@ -4,7 +4,7 @@
* Copyright (C) 2003 Red Hat Inc.
* Copyright (C) 1995 A. M. Kuchling
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-sha.h b/dbus/dbus-sha.h
index 7d319d32..cb6fba23 100644
--- a/dbus/dbus-sha.h
+++ b/dbus/dbus-sha.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-shared.h b/dbus/dbus-shared.h
index 29889754..a1c8b1ce 100644
--- a/dbus/dbus-shared.h
+++ b/dbus/dbus-shared.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index 821be25c..a7008303 100644
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -4,7 +4,7 @@
* Copyright (C) 2002, 2003, 2004 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-spawn.h b/dbus/dbus-spawn.h
index a392513d..0f50d6c2 100644
--- a/dbus/dbus-spawn.h
+++ b/dbus/dbus-spawn.h
@@ -4,7 +4,7 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h
index 41a15665..90605057 100644
--- a/dbus/dbus-string-private.h
+++ b/dbus/dbus-string-private.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c
index 31ea6fcb..2061e8be 100644
--- a/dbus/dbus-string.c
+++ b/dbus/dbus-string.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h
index 2a428795..ec209544 100644
--- a/dbus/dbus-string.h
+++ b/dbus/dbus-string.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 3a0947e1..b6f2efec 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -4,7 +4,7 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index df4c8d6c..ecfef69a 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -4,7 +4,7 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-test-main.c b/dbus/dbus-test-main.c
index 80e005ee..d44aee85 100644
--- a/dbus/dbus-test-main.c
+++ b/dbus/dbus-test-main.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c
index 9fd035d0..df45ba6f 100644
--- a/dbus/dbus-test.c
+++ b/dbus/dbus-test.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-test.h b/dbus/dbus-test.h
index df3b2845..1933c79b 100644
--- a/dbus/dbus-test.h
+++ b/dbus/dbus-test.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c
index bfb79008..b3ab132d 100644
--- a/dbus/dbus-threads.c
+++ b/dbus/dbus-threads.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-threads.h b/dbus/dbus-threads.h
index 116cd2d8..eb13b251 100644
--- a/dbus/dbus-threads.h
+++ b/dbus/dbus-threads.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-timeout.c b/dbus/dbus-timeout.c
index 5655a054..bea86eb9 100644
--- a/dbus/dbus-timeout.c
+++ b/dbus/dbus-timeout.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-timeout.h b/dbus/dbus-timeout.h
index f02ca834..2e48f304 100644
--- a/dbus/dbus-timeout.h
+++ b/dbus/dbus-timeout.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-transport-protected.h b/dbus/dbus-transport-protected.h
index 4a9ce96d..51af9594 100644
--- a/dbus/dbus-transport-protected.h
+++ b/dbus/dbus-transport-protected.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
index 3447ae1d..455e9c32 100644
--- a/dbus/dbus-transport-unix.c
+++ b/dbus/dbus-transport-unix.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-transport-unix.h b/dbus/dbus-transport-unix.h
index 962178c7..a4d57880 100644
--- a/dbus/dbus-transport-unix.h
+++ b/dbus/dbus-transport-unix.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index dde1c6d2..da487cc7 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-transport.h b/dbus/dbus-transport.h
index 88193f38..e2185989 100644
--- a/dbus/dbus-transport.h
+++ b/dbus/dbus-transport.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2004 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-types.h b/dbus/dbus-types.h
index 4dcb7ec1..9f41c3c3 100644
--- a/dbus/dbus-types.h
+++ b/dbus/dbus-types.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index e2b6c496..1e105b29 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-userdb.h b/dbus/dbus-userdb.h
index 693df07f..683b0b76 100644
--- a/dbus/dbus-userdb.h
+++ b/dbus/dbus-userdb.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c
index eb4aa8a0..02bfbb83 100644
--- a/dbus/dbus-watch.c
+++ b/dbus/dbus-watch.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus-watch.h b/dbus/dbus-watch.h
index 18fe3932..90c01356 100644
--- a/dbus/dbus-watch.h
+++ b/dbus/dbus-watch.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/dbus/dbus.h b/dbus/dbus.h
index e4031177..3c6efd39 100644
--- a/dbus/dbus.h
+++ b/dbus/dbus.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/doc/file-boilerplate.c b/doc/file-boilerplate.c
index 0f123887..0ae876a4 100644
--- a/doc/file-boilerplate.c
+++ b/doc/file-boilerplate.c
@@ -3,7 +3,7 @@
*
* Copyright (C) YEAR COPYRIGHT HOLDER
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gidl.c b/glib/dbus-gidl.c
index c8efc46d..6fa83916 100644
--- a/glib/dbus-gidl.c
+++ b/glib/dbus-gidl.c
@@ -4,7 +4,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gidl.h b/glib/dbus-gidl.h
index 254fa942..47b4f093 100644
--- a/glib/dbus-gidl.h
+++ b/glib/dbus-gidl.h
@@ -4,7 +4,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-glib-tool.c b/glib/dbus-glib-tool.c
index bd66e18d..c460a352 100644
--- a/glib/dbus-glib-tool.c
+++ b/glib/dbus-glib-tool.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-glib.c b/glib/dbus-glib.c
index 476e5cd2..b5f5920d 100644
--- a/glib/dbus-glib.c
+++ b/glib/dbus-glib.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gloader-expat.c b/glib/dbus-gloader-expat.c
index bda652f8..fa7e3692 100644
--- a/glib/dbus-gloader-expat.c
+++ b/glib/dbus-gloader-expat.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c
index c0741ac2..23c5a78c 100644
--- a/glib/dbus-gmain.c
+++ b/glib/dbus-gmain.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index dfd33f3e..df9ff9d6 100644
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gparser.c b/glib/dbus-gparser.c
index 2cdca81f..2318c015 100644
--- a/glib/dbus-gparser.c
+++ b/glib/dbus-gparser.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gparser.h b/glib/dbus-gparser.h
index 766063b8..d1b0aa04 100644
--- a/glib/dbus-gparser.h
+++ b/glib/dbus-gparser.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c
index a5827be9..fe285ab3 100644
--- a/glib/dbus-gproxy.c
+++ b/glib/dbus-gproxy.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
@@ -903,7 +903,7 @@ dbus_g_proxy_new_for_service (DBusGConnection *connection,
g_return_val_if_fail (interface_name != NULL, NULL);
proxy = dbus_g_proxy_new (connection, service_name,
- path_name, interface_name);
+ path_name, interface_name);
return proxy;
}
diff --git a/glib/dbus-gtest-main.c b/glib/dbus-gtest-main.c
index a86839e0..c23c5c1e 100644
--- a/glib/dbus-gtest-main.c
+++ b/glib/dbus-gtest-main.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gtest.c b/glib/dbus-gtest.c
index f583e3ba..77e2e7b2 100644
--- a/glib/dbus-gtest.c
+++ b/glib/dbus-gtest.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gtest.h b/glib/dbus-gtest.h
index f0ef02e4..b68ab23f 100644
--- a/glib/dbus-gtest.h
+++ b/glib/dbus-gtest.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gthread.c b/glib/dbus-gthread.c
index 8bc55a57..f7b6fafb 100644
--- a/glib/dbus-gthread.c
+++ b/glib/dbus-gthread.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002 CodeFactory AB
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gtool-test.h b/glib/dbus-gtool-test.h
index 73c27235..971264ea 100644
--- a/glib/dbus-gtool-test.h
+++ b/glib/dbus-gtool-test.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gutils.c b/glib/dbus-gutils.c
index dd8739a6..a40e3603 100644
--- a/glib/dbus-gutils.c
+++ b/glib/dbus-gutils.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/glib/dbus-gutils.h b/glib/dbus-gutils.h
index bed2d295..fd2cac88 100644
--- a/glib/dbus-gutils.h
+++ b/glib/dbus-gutils.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/qt/connection.h b/qt/connection.h
index 285fa66b..ca962b10 100644
--- a/qt/connection.h
+++ b/qt/connection.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/qt/dbus-qt.h b/qt/dbus-qt.h
index 481dc799..179f5355 100644
--- a/qt/dbus-qt.h
+++ b/qt/dbus-qt.h
@@ -4,7 +4,7 @@
*
* Copyright (C) 2002 DBus Developers
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/qt/integrator.h b/qt/integrator.h
index 32d03a3d..70e2a7f2 100644
--- a/qt/integrator.h
+++ b/qt/integrator.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/qt/message.h b/qt/message.h
index 2524a7a6..5e26b819 100644
--- a/qt/message.h
+++ b/qt/message.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/qt/server.h b/qt/server.h
index a329de60..36c729ab 100644
--- a/qt/server.h
+++ b/qt/server.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/test/break-loader.c b/test/break-loader.c
index 5cdc8654..cb7dc19c 100644
--- a/test/break-loader.c
+++ b/test/break-loader.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/test/glib/test-profile.c b/test/glib/test-profile.c
index d35a3235..6a00ee5e 100644
--- a/test/glib/test-profile.c
+++ b/test/glib/test-profile.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index ef451734..01d1a9f9 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/tools/dbus-tree-view.c b/tools/dbus-tree-view.c
index d756a508..afcda0fe 100644
--- a/tools/dbus-tree-view.c
+++ b/tools/dbus-tree-view.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/tools/dbus-tree-view.h b/tools/dbus-tree-view.h
index 1bc61f6b..e0b82e24 100644
--- a/tools/dbus-tree-view.h
+++ b/tools/dbus-tree-view.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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
diff --git a/tools/dbus-viewer.c b/tools/dbus-viewer.c
index cb832e0c..9c57b229 100644
--- a/tools/dbus-viewer.c
+++ b/tools/dbus-viewer.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* 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