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.

diff --git a/COPYING b/COPYING
index 0fac0d6bf37488961d6d7b465bbdef8ed9ff342e..90085d3bdfd71e2298fc7b6f7f802e2153e53bef 100644 (file)
--- 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 9baa48a26e923819752d7afcd7e16ad778a4b6e3..f54f01e3d9f97e6a8104d6004af7dd6791754062 100644 (file)
--- 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 b799948f8006fab473368046487099873e1eb44a..9010b941439bcb755d012f9a1b1c5307b9018ca8 100644 (file)
--- 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 fbac5d1f721803f50da69757dff69cf06ca6e2b4..d12d87186fd39e796b1ffe9c0a7ec835d129670a 100644 (file)
--- 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 61f6d7d307333ebc0241343a9fb96f03d9a6523b..c732280d77490efac91aa972a0ab368dd5e22b1d 100644 (file)
--- 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 eab79347ebae97f6b79dff9652fb54761abcac6e..79adf83abf9875e8567b417099e3c8ef2f706244 100644 (file)
--- 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 ed973ac16fadec47aa911b48484a7cde716b5226..44e2ea6117f970f66428ebd17319ba5b62bcebd6 100644 (file)
--- 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 51ee1e5993b6ec12c3e614887d0db0eca2597e99..d9892d1b471dd64f537fac71dbf41d0297d2110c 100644 (file)
--- 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 89492f03a1664a52b13e1c8ea3a4640285fc3dc4..acf4022832ba98d950e03865f7142f95cf00960d 100644 (file)
--- 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 77b925514d5a0e0dda2ecd26d32c9e195f003c5f..75004000f281e0c34c6e0451dee619cb7bb26dd3 100644 (file)
--- 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 b751cca81a789d44bb6ef81b31fe484ff72443df..a16a22cde8e8212f223299adee3e7f740084c91c 100644 (file)
--- 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 ee1291fab139029fa53b835203955634742a6b20..a0703c551a3e6dac8009692baddd98a4833e6280 100644 (file)
--- 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 59f0f509361e159addd429c0bc7563556e26c8ba..5ba9983211169075a52fc7746aad3d596bd616e9 100644 (file)
--- 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 d1d049541f89182837ea7648b1ca326e177f204a..279641ef8ec68ed1d5061d1acd36d71f3c54db19 100644 (file)
--- 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 51112ce73d2db7add10a649567a2a05a60167b23..f808a8e47744091635c580a875cd07375d774ab0 100644 (file)
--- 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 740a6b041c6834ee0e7c2e019bd3ee54c527980c..f29a1e0f1785b1b08694aeda3c34bb37d1d67e53 100644 (file)
--- 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 a0d433f044a56278f0106372a5673fc67760ec44..5c4f4020ecf8a653949b2cd994f863da2afb8bbd 100644 (file)
--- 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 bc3c371d28b63bebf44b60b269c14611c627cc63..f971838a527c6fe36015b041b06bba39acc95ac0 100644 (file)
--- 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 f1485dc1b0369fd06c872f76f80245b58b426446..422f3e4084181bfc7e423673f823972a58b0bea0 100644 (file)
--- 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 9baa36da4ed347de3f23ea4b5afc083be024be42..cc77867ee5eb700344a4013a62e8039d8389190f 100644 (file)
--- 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 32a6161b8531a6bfe6db199498692bcae520747f..391627ff32bebc51100684a778f9b3b520413a8a 100644 (file)
--- 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 c7359c8d228001e636a2fd41d09e56f9d419017f..3de693f77b13615c3b779c2f38a47a1b4824062a 100644 (file)
--- 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 f2bac8cc5cdffab9aef9d97e3b958fb840ab222c..61e089a7dd0c5764d906df1cfc0642b96bb3aecf 100644 (file)
--- 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 f7fbf319b4a0008ac3d8ccfe8e0f78f2fa15d982..2477233b8c8281fa0fc1eb764a3023acc8e8d738 100644 (file)
--- 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 79a9f98b2ee763f596fb4c27a1d502facf2c3ee9..08ea3a023df1e37c8cfb1fb6f923e40c1d523cf4 100644 (file)
--- 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 81e3eaf3cdf94a4a2b3c662243c98ddfe5377b4a..f5ef4cc28ef4ad479049e22706bdcc0643975c51 100644 (file)
--- 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 fa7a3a1150b5d8f87331bde11a33380934c1490b..e411aeccd8077b9ffac2882e7dfb02f826495878 100644 (file)
--- 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 60c88117a5edbc0ab254274b39e0ff5eeec67e33..f235c8c406a3b81785d3586e5f138342ed3a4a37 100644 (file)
--- 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 447109b5c9c4a579c32e82451a8c63bfbf83ec84..c9bd5c913aae50fe7fcddd64244dada1d7634ea5 100644 (file)
--- 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 6d453b404df1df2d29d3f9769263df8223bc6a9c..d92e3fee02a6223c142720edecdea0f39cd9736f 100644 (file)
--- 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 51764bcd232ec10dbb69ae4ee396827325f58f04..4071fb184da9de51bec8aa4d9a509124f6911367 100644 (file)
--- 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 236afbf12ad5b46b966438b9a3c28779e9c0bd0d..986df078b5008fb75b7d38df1eb53bf553d3d73a 100644 (file)
--- 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 c4d31fa6d9965504bd0fad5ba30cd881eb27f8d3..ee729c41c0df16243f39d8ca191108ee3a11ac21 100644 (file)
--- 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 6a5d61ff0056c5a85b259221a12f7768cae71b7d..5281ec7e14cd23b3efeab56536c85117bb2c687a 100644 (file)
--- 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 ef163ce3479dfb5e87d2f869a372d9847c721183..44675197c3f6bf63e98403f109d3452361f58588 100644 (file)
--- 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 497578f7527927d070b56197bd0c179cf948ac42..a98682e645d235a0ef61dc132a4d976f67667567 100644 (file)
--- 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 acb1e32ba78a0bd1874219c3bbd148ce427198e6..2ed2af37e9afafbfa1189f8393cfb08d8f57f54f 100644 (file)
--- 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 799241d8429e17dea29f989c4ae70dd41e416ada..7d1d34ae678ff1d27f500c5c18d98ae111455f6c 100644 (file)
--- 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 ee3b878d01a1532997e8dc8dd53a7abf389ee366..be3cc302b725a52a55f35c6c9cdcadde8751dacc 100644 (file)
--- 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 aa20ed52588f9913ba3e446ce36eaf7bf688b5a0..1951df07ab0ab5c710fa76c41171a6162041e384 100644 (file)
--- 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 567468ff3fc8096c67ab7b693b31e093bce9c869..ec8d7b6a6e446def617159ba8ffec4dde39f2b30 100644 (file)
--- 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 536f5014db9fe5dadbf67c9b6a1a484c96545d54..5f40b7e2fca65dfe7b459fd537eaa451dba85df9 100644 (file)
--- 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 b79aef786a7efe0bc7e83164f76741885e3c0578..b8b8fc6d756f59f690a78b5f3834cecaadee2e29 100644 (file)
--- 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 91a2100e8edcab1eeffc329a9671dfe817bb0a98..6dcc2687455480eb2aa7f949f3ea0e05f84557d1 100644 (file)
--- 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 c8c66a39901a7e48ac0a9873bc1b02eb2c5b607a..090f0ad82a69bec2524d533cc401555043d03131 100644 (file)
--- 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 0f7b8c762a21bef39439a26a66452b905245e149..ef4a493be7ba2fffe98d3aaa2c4e00fe96cb186b 100644 (file)
--- 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 86877af28ef3f0fb685019b929102f45e7cf5066..f90f5b315c29e7fa35318ed8d5588432363d97e5 100644 (file)
--- 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 ea38df9aba0878c93b70234a898862cda4ce6e76..287b4d79ab63b2636a23747f8dd074fbe485194f 100644 (file)
--- 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 344c449c3e69dba14cc1dedd3a545024d7f78ff0..cc9600ad9a30992a494fe5dd6872c4c0a4328487 100644 (file)
--- 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 ac2cfa86e396c3abe946cb5d55c1f7c9bc7c882c..f95867db835a1d564e1b68fd7aeb3c6662aee935 100644 (file)
--- 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 08c397654a74e2a7f4738287b39a04855af1b333..10ddc9c38acf27624704c53f6419eb1e155036fd 100644 (file)
--- 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 aa03c59db5fe320246989d2eac201ccc726e31b0..c2ebb0f0ebf5302b1730c8fdb0f9611b879fe31c 100644 (file)
--- 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 de6afec2c64fb0d751273a7442ad13ed0c0cdc32..28d275a04b6d9772311ebf0e16f9ad9343a96969 100644 (file)
--- 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 a8a46c6d735631895258d0d97d194226e93ed7dc..e390e4d5a03e12742a6a7001c62c8f98d6855261 100644 (file)
--- 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 0138fb3087c66063a46e42a453d6a6cbd57e818e..512954d608d24896b2118fccf13aa0cfab4ac335 100644 (file)
--- 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 dd22fb64fa694bfced83f5818cc40aead76646cd..d1444350616e841cf255fa47defe3b80d20c78bf 100644 (file)
--- 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 66cecf9e3a637e6b8d22a0c28fcdc6525158a567..d353bf49c30034e6a3d655190578386e01c7667f 100644 (file)
--- 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 68f89f23fc662a02420fb641176235bcd81bd974..00b03d419e716ff09f3c2844243f995077e56d95 100644 (file)
--- 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 2b4bc8906d269940a5366d703af5f0d71b708e6e..50bd9e28316a25a3b16a338ba49f0be67e4390dd 100644 (file)
--- 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 a5f664c8aa8ca1fd60b7bb8954c351dd8263db76..37c147cf7610ad37aaab28ea4382a3192dfdab05 100644 (file)
--- 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 a998ccea78fd9636cfb211a041c9fc413ea8eaaf..886ff0493b1ec87a92eeaed87db7f1a8d3fd5bff 100644 (file)
--- 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 61c06f657c661e2ef9a88a1da6a8e2e0e168c1b7..cc23129b9069a56041d8dd88f6bfdc83c76d68cb 100644 (file)
--- 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 267fa0f6cfa24face756891cb0feed7f91605a04..00821daf2980fba2e77d6af535449925c02fcd81 100644 (file)
--- 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 919d6b08d0435ecb0298cb62cdb65e36503484a8..0a34920f96d8d7348489d2ab6fa9ffee56c9b0a2 100644 (file)
--- 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 079a6ba359d2badb1b2962ea9dcbf6ce5959d124..6038705b5ee7197c703dc4daa2054886d82fa825 100644 (file)
--- 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 8ee65ee3bbb9ed28c9b3b8d86738efdcd8161091..8ed84c7e2b57de35bcf288c3881cd6842e2a038a 100644 (file)
--- 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 d13ea6eac5b90d075dd257c642399f11ba434306..628ff9d865ce689b87440f43b657c51bbf5c190b 100644 (file)
--- 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 25a7464da1c96b424d4666defc753714ad207c26..c9fa846c6fb25cea5ff37c5abc4146f5ac77acd0 100644 (file)
--- 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 5b2a29d446a62a56dfb4cded91fa69e2c9466121..8bda2b1334b2b1609f7fe42a77f4848c708ac372 100644 (file)
--- 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 4e1502a669ba27809d3ad5c58b82d5b3a9070b94..7b2b67ef97b01cd272d4141560a86d9318e2b492 100644 (file)
--- 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 955dbb632cf2e73ba3b174d5401f3073b939223d..67ff0aa3554e32fc42b85480fa80d805fad0e34c 100644 (file)
--- 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 5990b05c871e0dd4a481ef049fe9e0a3979678f3..e045fb26e33f74d108c4e5d299312adbb1390a52 100644 (file)
--- 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 1db8bd9c89a3923864fa117e73da5cff2baed253..dc0a6a6462622afc89679aefaf248b062dec602d 100644 (file)
--- 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 046cad56c82a8ecc80cff8071e9352027e882f6c..4cd702d8467bedbaa268fa4ea8b186ebe22d5c1e 100644 (file)
--- 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 4f82d6f56b9602d774c4df2fa3b2432e07003f05..afce24422d96ce430020d678208f9e108a6a0bb9 100644 (file)
--- 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 56b66ffbf37a5f0d8efa74c9c43a5fbcec5398e6..70c3ef9bfcd809cd20aafa6e66073899265a1071 100644 (file)
--- 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 5ea62c59df77b05c4b6d67ad5052eadaaa3ef6b7..d6b343b061db4d32b25b9d4ca6a2525b4880c260 100644 (file)
--- 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 5d9e8bc25f341c2ccac44fdad3b29311651334d2..075a1cf561edff4a7d59c32eb53e099c3f0b9fb7 100644 (file)
--- 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 00c3ba7d04b9d5d89b11c90d4c6b7e9b92609c94..ce49a38d6a0963ddeb64c840eb08ccce710d8726 100644 (file)
--- 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 0d78739cda03279b373cea4707a23fedf071fa5d..8f1e089200940324888846c83fdc56c4c8cc3f14 100644 (file)
--- 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 77f31f3eb5e4d9effc1386915bee906f8e4d9d33..94c75b90e0ed325904bd0d9ec4e99c3dd80a8720 100644 (file)
--- 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 9f1d55f22b3209c600ba44278d986a8463c5029d..0f8f1eda9e03a5b9c5a03d5ef321c4ce34e65fa7 100644 (file)
--- 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 b7aaded46fa8233dcd00e535a481d54600a24645..564b7e47dc019383075dab3fcf13fc9b9e3f47c7 100644 (file)
--- 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 a1c5ab795bf5664f0e65c9498d3ece49943c74ec..fcfb194b87144457237bc006401cb3f3b777a4d6 100644 (file)
--- 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 4c79c3727ab1b473bd4249e4986ab645c2541630..6e0e0f494e4b94ed9932a60099a852c2c8a1cb05 100644 (file)
--- 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 c9aecd7de33be1ca039d8efd9e3816f6d14ec255..5aeed50e9017e7f3951c76830e3542cf0cb61973 100644 (file)
--- 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 9661927a81eb8f9dae7c89e65a40b981befd60aa..4c706191373711b4b2bfa2603c3da3dfb8441ef3 100644 (file)
--- 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 ba9894e9f2d7683858cd65064ecd885a0e048030..2305af8ba77305a21650777036a30296fbe1e0c9 100644 (file)
--- 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 54f851a91f1cb8504bcdba905615001f3bbbaa35..d26fb320f975442d50d11f45eee1cf0433ceb46a 100644 (file)
--- 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 7d319d32e89d8abc4e3a66ae947340a7ac79d836..cb6fba230eac4293bdf9285f2a481b3e72722005 100644 (file)
--- 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 29889754344da06976b2dc459f09e5b85385b5ad..a1c8b1cec25e3efe2e06aa0dc7aaaf562b0b0a55 100644 (file)
--- 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 821be25c4fde45b92ccd879c50de24b116cb8d14..a70083037afbfdd70a2ac81ee9a5accca499cab9 100644 (file)
--- 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 a392513d82f9d7597b1e891953f869449f8f9d20..0f50d6c2ded5960217892055b65622e85b6c1990 100644 (file)
--- 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 41a156651327360e9a915ce26fdf21921b367206..90605057613b810e1c10029e5e4fe5cc2584fdd2 100644 (file)
--- 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 31ea6fcbc9b9e5e92c7afded4438f8599045446f..2061e8be71661832df21623745351ed4fa893836 100644 (file)
--- 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 2a42879567b2e507d9cb311f91dc61880c2aaeca..ec2095445088161abc5cdc36bddb40705c4ddbe1 100644 (file)
--- 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 3a0947e178165281d0d8de051341bfa6c60fd90f..b6f2efecf6e136dfaa42b6d0bbf8c4d1712f219f 100644 (file)
--- 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 df4c8d6cd16c031683770a01040a0eacf1b0462f..ecfef69a0ce82565cc4900ca7aaf01d5b1cf2ae1 100644 (file)
--- 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 80e005eea904a74a0ca5b9b56805b44d83731c8b..d44aee855cf5f1c3f61aa763203363cb0d309289 100644 (file)
--- 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 9fd035d0aa2abc04aab92a68eaebaa0b818ed21a..df45ba6fb6301e7d299dd18cd522e7cd20eaf620 100644 (file)
--- 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 df3b2845e78ca214ef0e7e9b7cc8dc1be751f699..1933c79b77f04d7ffcddf1f813ac527451d33aa2 100644 (file)
--- 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 bfb790081cb0c2534bdd473ef950c9263bcffcb6..b3ab132dd911fbd7c521c79db489a1c341f5f8d8 100644 (file)
--- 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 116cd2d815857d6bf0841dd216cb191e3ea65d89..eb13b2514e3d4458a31b4a1b00294cbd6ca35bac 100644 (file)
--- 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 5655a054adad98b0529ec0d4481820018ae08053..bea86eb9d06679dcb39590489e390ff2f1a4094e 100644 (file)
--- 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 f02ca83440082b0b162592655d04bbe67ecae298..2e48f304a391a49efe335b53cda90d7ac42f65ae 100644 (file)
--- 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 4a9ce96d9c74743bfd3372927f6d6c4d988885aa..51af959433b9cad791f841301111262490f8af6a 100644 (file)
--- 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 3447ae1da0984acc8d81027f9e64c1355ccf30fc..455e9c328aa27b48003259d9f713b6a3a64a1b1d 100644 (file)
--- 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 962178c7e3049c78cc610feb7a4067901618b81a..a4d57880acda8deba8d0703946532bea3a1daf9e 100644 (file)
--- 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 dde1c6d28c43b39fc4390bfc00764373a63b73ab..da487cc7f2f5c1542db023671fa10ccd041ff233 100644 (file)
--- 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 88193f38610e41a0e5a3d57417ce8bd8501f1e3a..e2185989350db48c1e65e88ad9b3a79e3f8d85dc 100644 (file)
--- 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 4dcb7ec11c7a6f342dbcc7e61dc66088f5f7bd40..9f41c3c31f822a5bf64e6523656ec28b69a340a7 100644 (file)
--- 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 e2b6c496048ada119253b26a3e63330e24a14371..1e105b29b5afd30f2430cb3fbfaa56131de6fa77 100644 (file)
--- 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 693df07feb36be9d366356d246e2ff2e9843d24e..683b0b760b5f809ae0d85b5ce734a444d06c1cbc 100644 (file)
--- 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 eb4aa8a06f2bcdf7115e41096e4952bcd6be4e40..02bfbb8323b8034d3732726bb84cb0be71d1d500 100644 (file)
--- 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 18fe393216b3f72ceca622f2d56411b07b38e136..90c01356d768c326363d36cecea7c0b20c1b73b2 100644 (file)
--- 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 e4031177d382066c6ee84658a6b6734f27bd2497..3c6efd39949a4d8b9f6d37415db0d70e188791c8 100644 (file)
--- 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 0f12388768d01bd4e116497a6b831243ad83b638..0ae876a406c3924e08309979773aed621a312949 100644 (file)
--- 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 c8efc46d1bd2efb31591e411c2e8b6936273d0ca..6fa839167fbef042fedbdc70e42752460b88d206 100644 (file)
--- 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 254fa942eca9198815dfb7bdb62a6b0161987ed9..47b4f093dde4c4425e614f076f4e89029d69b34d 100644 (file)
--- 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 bd66e18d929dc46839a2833afdc7c2f2a87ee0c2..c460a352e6878be2ce2d75fe397730ad2cf08acd 100644 (file)
--- 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 476e5cd251e3bc2ac4c435f06bf5ce30b64676da..b5f5920df2c305117f827afcff792df8628fdd3a 100644 (file)
--- 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 bda652f8cc2c8a57a81bdad53956c21d8e9ec90d..fa7e3692c2025962a1f0e30fefdc7f7e7c95c443 100644 (file)
--- 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 c0741ac28a70621bb52932de82976023d2265eb6..23c5a78c6fea37aec3f8e9ee2fe881ee69332979 100644 (file)
--- 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 dfd33f3eb1d3a55d2018a2cf5432878658d20a7c..df9ff9d67a24eab6a07129c3517ee76557d767e2 100644 (file)
--- 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 2cdca81f167701a583e2174cda8503bd4aa4198e..2318c015e3f8d0a13308844751006a455376e539 100644 (file)
--- 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 766063b8a3a0c0edee04b182f52e67f53608af46..d1b0aa04c3fdc2edc194d8c4239c284954da316a 100644 (file)
--- 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 a5827be9a79ba7873d1ea77b2d0ef0e89b8ec537..fe285ab39b318a98f79cfd3029e9b683f22aa8d7 100644 (file)
--- 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 a86839e057df260abf5b3df34f89193aa41ad779..c23c5c1ea20f396923dae113b82983bbbdd1745f 100644 (file)
--- 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 f583e3ba93e97469ac2edb6aaa9048ecb2097ac7..77e2e7b2675c85b91a3de3e46c4895a43a77e732 100644 (file)
--- 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 f0ef02e41d63671abac81d9444e6830d16080b96..b68ab23fe11e4450be6cb3f02cabe057b4857f5b 100644 (file)
--- 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 8bc55a57c11aa212d032ed7a798e104c34075769..f7b6fafba6a388a8222526902709ee3bd3dc098a 100644 (file)
--- 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 73c272355fabaaa6bc7aa9d8c1b0bfa470b2e44a..971264eae7bf27d95db925b900b9263dd0aacf4e 100644 (file)
--- 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 dd8739a69132fbb13322bab4f3486b0c26287a63..a40e3603e3980ecc4e6e6fc7ef1fd99c17dd2e75 100644 (file)
--- 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 bed2d29560995a5040ebad9c13a098fd4a81cbbb..fd2cac885e193f1068c1ff5de508a2f080072c3a 100644 (file)
--- 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 285fa66b7b58a17922c54eca39858c642c58830c..ca962b105c014f0c5c5fe0d4f174e41a578c0881 100644 (file)
--- 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 481dc79925a45281cbc394620cedfafba29165b8..179f5355001091cfa00f5e139c410a5633ee591e 100644 (file)
--- 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 32d03a3d5b8ded6e6374c0a5deac2016fceadce6..70e2a7f2d455911d88745b671c51f332e766eb95 100644 (file)
--- 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 2524a7a6713bbddd42d1440e27a0f78b6ae6b37e..5e26b8190898e25d76b3b10f6becfd529526d33b 100644 (file)
--- 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 a329de6052f203451a74df09211e86036a7105bb..36c729ab84ebcdf0808ec4dc426b6c45ed9e6097 100644 (file)
--- 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 5cdc86543721a2509d7684841fa9ae05efb68754..cb7dc19c719d950c6429c040ea551e06c47adf3e 100644 (file)
--- 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 d35a32354bc489cc69ff2d1bf6c91bdacc68dbe3..6a00ee5e26060cb64bfe750457b7a53cd44a16ae 100644 (file)
--- 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 ef4517347b84faac2cd2d4ab154ee4f0ed22d367..01d1a9f9bee743a4162e172251dc877d345386fa 100644 (file)
--- 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 d756a5080cca231a47ac897c45095a0f09cba9b0..afcda0fe432ed1fa73664d1f3f92ebbf0f0d8bf6 100644 (file)
--- 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 1bc61f6b910847926500cd42822016328e30cea7..e0b82e2491cdd385ee3f7990529e0844d8db6bde 100644 (file)
--- 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 cb832e0c623b184d0ec87bbc30a4e4c3c0dd4bbe..9c57b22998b907be27160c09a3e5b15becf5f06a 100644 (file)
--- 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