summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zeuthen <david@fubar.dk>2005-11-02 15:38:14 +0000
committerDavid Zeuthen <david@fubar.dk>2005-11-02 15:38:14 +0000
commite661bc1d368a29e4392b91453e6f9cd9d3076521 (patch)
tree990e0243749ad72a716a09e6543de830e9330cc7
parent1c99fc8520ec16cc186ca6cb5739bb4796fde5c9 (diff)
Update to Academic Free License 2.1. Also fix all C source and header
files.
-rw-r--r--COPYING140
-rw-r--r--ChangeLog5
-rw-r--r--agents/linux/usb/usb_agent.c2
-rw-r--r--agents/linux26/sysfs/hal_block.c2
-rw-r--r--agents/linux26/sysfs/hal_block.h2
-rw-r--r--agents/linux26/sysfs/hal_ide.c2
-rw-r--r--agents/linux26/sysfs/hal_ide.h2
-rw-r--r--agents/linux26/sysfs/hal_input.c2
-rw-r--r--agents/linux26/sysfs/hal_input.h2
-rw-r--r--agents/linux26/sysfs/hal_monitor.h2
-rw-r--r--agents/linux26/sysfs/hal_net.c2
-rw-r--r--agents/linux26/sysfs/hal_net.h2
-rw-r--r--agents/linux26/sysfs/hal_pci.c2
-rw-r--r--agents/linux26/sysfs/hal_pci.h2
-rw-r--r--agents/linux26/sysfs/hal_scsi.c2
-rw-r--r--agents/linux26/sysfs/hal_scsi.h2
-rw-r--r--agents/linux26/sysfs/hal_usb.c2
-rw-r--r--agents/linux26/sysfs/hal_usb.h2
-rw-r--r--agents/linux26/sysfs/main.c2
-rw-r--r--agents/linux26/sysfs/main.h2
-rw-r--r--hald/device.c2
-rw-r--r--hald/device.h2
-rw-r--r--hald/device_info.c2
-rw-r--r--hald/device_info.h2
-rw-r--r--hald/device_store.c2
-rw-r--r--hald/device_store.h2
-rw-r--r--hald/dummy/osspec.c2
-rw-r--r--hald/hald.c2
-rw-r--r--hald/hald.h2
-rw-r--r--hald/hald_dbus.c2
-rw-r--r--hald/hald_dbus.h2
-rw-r--r--hald/hald_test.c2
-rw-r--r--hald/hald_test_libhal.c2
-rw-r--r--hald/linux2/addons/addon-storage.c2
-rw-r--r--hald/linux2/addons/addon-usb-csr.c2
-rw-r--r--hald/linux2/blockdev.c2
-rw-r--r--hald/linux2/blockdev.h2
-rw-r--r--hald/linux2/classdev.c2
-rw-r--r--hald/linux2/classdev.h2
-rw-r--r--hald/linux2/coldplug.c2
-rw-r--r--hald/linux2/coldplug.h2
-rw-r--r--hald/linux2/hotplug.c2
-rw-r--r--hald/linux2/hotplug.h2
-rw-r--r--hald/linux2/hotplug_helper.h2
-rw-r--r--hald/linux2/ids.c2
-rw-r--r--hald/linux2/ids.h2
-rw-r--r--hald/linux2/osspec.c2
-rw-r--r--hald/linux2/osspec_linux.h2
-rw-r--r--hald/linux2/pcmcia_cs.h2
-rw-r--r--hald/linux2/pcmcia_utils.c2
-rw-r--r--hald/linux2/pcmcia_utils.h2
-rw-r--r--hald/linux2/physdev.c2
-rw-r--r--hald/linux2/physdev.h2
-rw-r--r--hald/linux2/probing/probe-hiddev.c2
-rw-r--r--hald/linux2/probing/probe-input.c2
-rw-r--r--hald/linux2/probing/probe-pc-floppy.c2
-rw-r--r--hald/linux2/probing/probe-printer.c2
-rw-r--r--hald/linux2/probing/probe-serial.c2
-rw-r--r--hald/linux2/probing/probe-smbios.c2
-rw-r--r--hald/linux2/probing/probe-storage.c2
-rw-r--r--hald/linux2/probing/probe-volume.c2
-rw-r--r--hald/logger.c2
-rw-r--r--hald/logger.h2
-rw-r--r--hald/osspec.h2
-rw-r--r--hald/property.c2
-rw-r--r--hald/property.h2
-rw-r--r--hald/util.c2
-rw-r--r--hald/util.h2
-rw-r--r--libhal-storage/libhal-storage.c2
-rw-r--r--libhal-storage/libhal-storage.h2
-rw-r--r--libhal/libhal.c2
-rw-r--r--libhal/libhal.h2
-rw-r--r--tools/hal-device.c2
-rw-r--r--tools/hal_find_by_capability.c2
-rw-r--r--tools/hal_find_by_property.c2
-rw-r--r--tools/hal_get_property.c2
-rw-r--r--tools/hal_set_property.c2
-rw-r--r--tools/linux/add_selinux.c2
-rw-r--r--tools/linux/hal_hotplug.c2
-rw-r--r--tools/lshal.c2
80 files changed, 153 insertions, 148 deletions
diff --git a/COPYING b/COPYING
index 7b530208..be903122 100644
--- a/COPYING
+++ b/COPYING
@@ -1,33 +1,32 @@
HAL 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 individual source code files
and/or binaries may be under the GPL only or under the LGPG.
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 37bdcc83..2b7be030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-02 David Zeuthen <david@fubar.dk>
+
+ * COPYING: Update to Academic Free License 2.1. Also fix all C source
+ and header files.
+
2005-11-02 Danny Kukawka <danny.kukawka@web.de>
* doc/spec/hal-spec.xml.in: fixed some bugs in the xml spec code and removed
diff --git a/agents/linux/usb/usb_agent.c b/agents/linux/usb/usb_agent.c
index c237ba31..e1da2f19 100644
--- a/agents/linux/usb/usb_agent.c
+++ b/agents/linux/usb/usb_agent.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_block.c b/agents/linux26/sysfs/hal_block.c
index 7f146ec9..1f764ae9 100644
--- a/agents/linux26/sysfs/hal_block.c
+++ b/agents/linux26/sysfs/hal_block.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_block.h b/agents/linux26/sysfs/hal_block.h
index 67587d3c..d18a7631 100644
--- a/agents/linux26/sysfs/hal_block.h
+++ b/agents/linux26/sysfs/hal_block.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_ide.c b/agents/linux26/sysfs/hal_ide.c
index 33c9ad45..aed62c28 100644
--- a/agents/linux26/sysfs/hal_ide.c
+++ b/agents/linux26/sysfs/hal_ide.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_ide.h b/agents/linux26/sysfs/hal_ide.h
index a27b7db5..952cc948 100644
--- a/agents/linux26/sysfs/hal_ide.h
+++ b/agents/linux26/sysfs/hal_ide.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_input.c b/agents/linux26/sysfs/hal_input.c
index c25443b9..d5662d3a 100644
--- a/agents/linux26/sysfs/hal_input.c
+++ b/agents/linux26/sysfs/hal_input.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_input.h b/agents/linux26/sysfs/hal_input.h
index b30cb452..74363333 100644
--- a/agents/linux26/sysfs/hal_input.h
+++ b/agents/linux26/sysfs/hal_input.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_monitor.h b/agents/linux26/sysfs/hal_monitor.h
index d257aba8..d352d204 100644
--- a/agents/linux26/sysfs/hal_monitor.h
+++ b/agents/linux26/sysfs/hal_monitor.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_net.c b/agents/linux26/sysfs/hal_net.c
index 3c2af4a9..61565100 100644
--- a/agents/linux26/sysfs/hal_net.c
+++ b/agents/linux26/sysfs/hal_net.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_net.h b/agents/linux26/sysfs/hal_net.h
index 281213c0..aa563411 100644
--- a/agents/linux26/sysfs/hal_net.h
+++ b/agents/linux26/sysfs/hal_net.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_pci.c b/agents/linux26/sysfs/hal_pci.c
index 6f35db15..4ba95a7e 100644
--- a/agents/linux26/sysfs/hal_pci.c
+++ b/agents/linux26/sysfs/hal_pci.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_pci.h b/agents/linux26/sysfs/hal_pci.h
index 3a24fd3e..1769d7af 100644
--- a/agents/linux26/sysfs/hal_pci.h
+++ b/agents/linux26/sysfs/hal_pci.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_scsi.c b/agents/linux26/sysfs/hal_scsi.c
index 0b86ebd0..2fe5041e 100644
--- a/agents/linux26/sysfs/hal_scsi.c
+++ b/agents/linux26/sysfs/hal_scsi.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_scsi.h b/agents/linux26/sysfs/hal_scsi.h
index 68dff815..b8560e82 100644
--- a/agents/linux26/sysfs/hal_scsi.h
+++ b/agents/linux26/sysfs/hal_scsi.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_usb.c b/agents/linux26/sysfs/hal_usb.c
index bace4039..a5f783f9 100644
--- a/agents/linux26/sysfs/hal_usb.c
+++ b/agents/linux26/sysfs/hal_usb.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/hal_usb.h b/agents/linux26/sysfs/hal_usb.h
index bb202d83..6fa81fae 100644
--- a/agents/linux26/sysfs/hal_usb.h
+++ b/agents/linux26/sysfs/hal_usb.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/main.c b/agents/linux26/sysfs/main.c
index da06a56b..fc4d6982 100644
--- a/agents/linux26/sysfs/main.c
+++ b/agents/linux26/sysfs/main.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/agents/linux26/sysfs/main.h b/agents/linux26/sysfs/main.h
index 16538993..b01c929c 100644
--- a/agents/linux26/sysfs/main.h
+++ b/agents/linux26/sysfs/main.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/device.c b/hald/device.c
index 14c71de9..e1e56c6d 100644
--- a/hald/device.c
+++ b/hald/device.c
@@ -6,7 +6,7 @@
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
* Copyright (C) 2004 Novell, 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/hald/device.h b/hald/device.h
index eadc32b4..1997ce34 100644
--- a/hald/device.h
+++ b/hald/device.h
@@ -6,7 +6,7 @@
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
* Copyright (C) 2004 Novell, 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/hald/device_info.c b/hald/device_info.c
index ca54ff91..a361760e 100644
--- a/hald/device_info.c
+++ b/hald/device_info.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/device_info.h b/hald/device_info.h
index 67d61598..e37973f8 100644
--- a/hald/device_info.h
+++ b/hald/device_info.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/device_store.c b/hald/device_store.c
index 6c63cf75..96ca58f1 100644
--- a/hald/device_store.c
+++ b/hald/device_store.c
@@ -6,7 +6,7 @@
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
* Copyright (C) 2004 Novell, 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/hald/device_store.h b/hald/device_store.h
index 6f7e5ba3..6a03ea8c 100644
--- a/hald/device_store.h
+++ b/hald/device_store.h
@@ -6,7 +6,7 @@
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
* Copyright (C) 2004 Novell, 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/hald/dummy/osspec.c b/hald/dummy/osspec.c
index ece49f19..e20141e2 100644
--- a/hald/dummy/osspec.c
+++ b/hald/dummy/osspec.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/hald.c b/hald/hald.c
index c30a46b4..b06f0490 100644
--- a/hald/hald.c
+++ b/hald/hald.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/hald.h b/hald/hald.h
index 7326e795..b8109474 100644
--- a/hald/hald.h
+++ b/hald/hald.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index 98fe25cc..45917e8f 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/hald_dbus.h b/hald/hald_dbus.h
index 99ec10e2..ecc9f2b6 100644
--- a/hald/hald_dbus.h
+++ b/hald/hald_dbus.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/hald_test.c b/hald/hald_test.c
index afa3f725..19294296 100644
--- a/hald/hald_test.c
+++ b/hald/hald_test.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2005 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/hald_test_libhal.c b/hald/hald_test_libhal.c
index 09fd45db..c6390de5 100644
--- a/hald/hald_test_libhal.c
+++ b/hald/hald_test_libhal.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2005 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/addons/addon-storage.c b/hald/linux2/addons/addon-storage.c
index cea263e3..ad57ce37 100644
--- a/hald/linux2/addons/addon-storage.c
+++ b/hald/linux2/addons/addon-storage.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/addons/addon-usb-csr.c b/hald/linux2/addons/addon-usb-csr.c
index eeebed0b..5d57fbac 100644
--- a/hald/linux2/addons/addon-usb-csr.c
+++ b/hald/linux2/addons/addon-usb-csr.c
@@ -6,7 +6,7 @@
* Copyright (C) 2004 Sergey V. Udaltsov <svu@gnome.org>
* Copyright (C) 2005 Richard Hughes <richard@hughsie.com>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/blockdev.c b/hald/linux2/blockdev.c
index 335535f9..b62fa3cd 100644
--- a/hald/linux2/blockdev.c
+++ b/hald/linux2/blockdev.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2005 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/blockdev.h b/hald/linux2/blockdev.h
index 7cb1fde3..273b0a7f 100644
--- a/hald/linux2/blockdev.h
+++ b/hald/linux2/blockdev.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/classdev.c b/hald/linux2/classdev.c
index 7bc9016a..3ac0f788 100644
--- a/hald/linux2/classdev.c
+++ b/hald/linux2/classdev.c
@@ -7,7 +7,7 @@
* Copyright (C) 2005 Richard Hughes, <richard@hughsie.com>
* Copyright (C) 2005 Danny Kukawka, <danny.kukawka@web.de>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/classdev.h b/hald/linux2/classdev.h
index 262504d4..c88dc9b3 100644
--- a/hald/linux2/classdev.h
+++ b/hald/linux2/classdev.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/coldplug.c b/hald/linux2/coldplug.c
index df0e8e36..66934a3d 100644
--- a/hald/linux2/coldplug.c
+++ b/hald/linux2/coldplug.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/coldplug.h b/hald/linux2/coldplug.h
index 62a20904..7da868a7 100644
--- a/hald/linux2/coldplug.h
+++ b/hald/linux2/coldplug.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/hotplug.c b/hald/linux2/hotplug.c
index c5aa5654..37e37742 100644
--- a/hald/linux2/hotplug.c
+++ b/hald/linux2/hotplug.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/hotplug.h b/hald/linux2/hotplug.h
index 3fa8819e..eaf75d9b 100644
--- a/hald/linux2/hotplug.h
+++ b/hald/linux2/hotplug.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/hotplug_helper.h b/hald/linux2/hotplug_helper.h
index ff631245..27670374 100644
--- a/hald/linux2/hotplug_helper.h
+++ b/hald/linux2/hotplug_helper.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/ids.c b/hald/linux2/ids.c
index 5681ad53..cf7638e6 100644
--- a/hald/linux2/ids.c
+++ b/hald/linux2/ids.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/ids.h b/hald/linux2/ids.h
index 8cba1000..c1893202 100644
--- a/hald/linux2/ids.h
+++ b/hald/linux2/ids.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/osspec.c b/hald/linux2/osspec.c
index 7d150680..8fa23059 100644
--- a/hald/linux2/osspec.c
+++ b/hald/linux2/osspec.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/osspec_linux.h b/hald/linux2/osspec_linux.h
index 0eafbb8f..88d516c1 100644
--- a/hald/linux2/osspec_linux.h
+++ b/hald/linux2/osspec_linux.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/pcmcia_cs.h b/hald/linux2/pcmcia_cs.h
index aeab3bd4..8324650d 100644
--- a/hald/linux2/pcmcia_cs.h
+++ b/hald/linux2/pcmcia_cs.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 Dan Williams <dcbw@redhat.com>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* Most of this code was derived from pcmcia-cs code, originally
* developed by David A. Hinds <dahinds@users.sourceforge.net>.
diff --git a/hald/linux2/pcmcia_utils.c b/hald/linux2/pcmcia_utils.c
index 7e941c02..21f51ad8 100644
--- a/hald/linux2/pcmcia_utils.c
+++ b/hald/linux2/pcmcia_utils.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 Dan Williams <dcbw@redhat.com>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* Some of this code was derived from pcmcia-cs code, originally
* developed by David A. Hinds <dahinds@users.sourceforge.net>.
diff --git a/hald/linux2/pcmcia_utils.h b/hald/linux2/pcmcia_utils.h
index 3af0dca6..119f8c62 100644
--- a/hald/linux2/pcmcia_utils.h
+++ b/hald/linux2/pcmcia_utils.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 Dan Williams <dcbw@redhat.com>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/physdev.c b/hald/linux2/physdev.c
index a1be01fa..af8e4791 100644
--- a/hald/linux2/physdev.c
+++ b/hald/linux2/physdev.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/physdev.h b/hald/linux2/physdev.h
index 86e43527..6c16cc2f 100644
--- a/hald/linux2/physdev.h
+++ b/hald/linux2/physdev.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/probing/probe-hiddev.c b/hald/linux2/probing/probe-hiddev.c
index ac114583..9e8839b8 100644
--- a/hald/linux2/probing/probe-hiddev.c
+++ b/hald/linux2/probing/probe-hiddev.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/probing/probe-input.c b/hald/linux2/probing/probe-input.c
index 77cd81c0..3af49bb8 100644
--- a/hald/linux2/probing/probe-input.c
+++ b/hald/linux2/probing/probe-input.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/probing/probe-pc-floppy.c b/hald/linux2/probing/probe-pc-floppy.c
index 9fdbeaaa..70173e94 100644
--- a/hald/linux2/probing/probe-pc-floppy.c
+++ b/hald/linux2/probing/probe-pc-floppy.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/probing/probe-printer.c b/hald/linux2/probing/probe-printer.c
index 06fe9022..9a2d212d 100644
--- a/hald/linux2/probing/probe-printer.c
+++ b/hald/linux2/probing/probe-printer.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2005 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/probing/probe-serial.c b/hald/linux2/probing/probe-serial.c
index 9cd30950..577c0320 100644
--- a/hald/linux2/probing/probe-serial.c
+++ b/hald/linux2/probing/probe-serial.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2005 Pierre Ossman <drzeus@drzeus.cx>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/probing/probe-smbios.c b/hald/linux2/probing/probe-smbios.c
index e4fa66fe..dd92f748 100644
--- a/hald/linux2/probing/probe-smbios.c
+++ b/hald/linux2/probing/probe-smbios.c
@@ -6,7 +6,7 @@
* Copyright (C) 2005 David Zeuthen, <david@fubar.dk>
* Copyright (C) 2005 Richard Hughes, <richard@hughsie.com>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/probing/probe-storage.c b/hald/linux2/probing/probe-storage.c
index 0aa760b8..6aeeac8d 100644
--- a/hald/linux2/probing/probe-storage.c
+++ b/hald/linux2/probing/probe-storage.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/linux2/probing/probe-volume.c b/hald/linux2/probing/probe-volume.c
index 0c1f9a78..e515b5cb 100644
--- a/hald/linux2/probing/probe-volume.c
+++ b/hald/linux2/probing/probe-volume.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/logger.c b/hald/logger.c
index b94afab4..2dc1cc46 100644
--- a/hald/logger.c
+++ b/hald/logger.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/logger.h b/hald/logger.h
index 51689df7..2b27ad45 100644
--- a/hald/logger.h
+++ b/hald/logger.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/osspec.h b/hald/osspec.h
index e0533795..83a43439 100644
--- a/hald/osspec.h
+++ b/hald/osspec.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/property.c b/hald/property.c
index 39c152ca..ac0ef999 100644
--- a/hald/property.c
+++ b/hald/property.c
@@ -6,7 +6,7 @@
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
* Copyright (C) 2004 Novell, 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/hald/property.h b/hald/property.h
index ab43c232..48d6845d 100644
--- a/hald/property.h
+++ b/hald/property.h
@@ -6,7 +6,7 @@
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
* Copyright (C) 2004 Novell, 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/hald/util.c b/hald/util.c
index f0ca1f45..a1bb6e7a 100644
--- a/hald/util.c
+++ b/hald/util.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hald/util.h b/hald/util.h
index fd1622c9..25ce1335 100644
--- a/hald/util.h
+++ b/hald/util.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/libhal-storage/libhal-storage.c b/libhal-storage/libhal-storage.c
index 0641aada..098e2449 100644
--- a/libhal-storage/libhal-storage.c
+++ b/libhal-storage/libhal-storage.c
@@ -7,7 +7,7 @@
*
* Author: David Zeuthen <davidz@redhat.com>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/libhal-storage/libhal-storage.h b/libhal-storage/libhal-storage.h
index ffd3d174..73c18746 100644
--- a/libhal-storage/libhal-storage.h
+++ b/libhal-storage/libhal-storage.h
@@ -7,7 +7,7 @@
*
* Author: David Zeuthen <davidz@redhat.com>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/libhal/libhal.c b/libhal/libhal.c
index fba1ddb5..e5f10a25 100644
--- a/libhal/libhal.c
+++ b/libhal/libhal.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/libhal/libhal.h b/libhal/libhal.h
index c561547d..4ade6e4c 100644
--- a/libhal/libhal.h
+++ b/libhal/libhal.h
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free 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/hal-device.c b/tools/hal-device.c
index da1ac65e..ab370245 100644
--- a/tools/hal-device.c
+++ b/tools/hal-device.c
@@ -8,7 +8,7 @@
* Authors:
* Steffen Winterfeldt <snwint@suse.de>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free 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/hal_find_by_capability.c b/tools/hal_find_by_capability.c
index 26490be5..27d70f88 100644
--- a/tools/hal_find_by_capability.c
+++ b/tools/hal_find_by_capability.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2005 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free 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/hal_find_by_property.c b/tools/hal_find_by_property.c
index 59e333d3..fa4899f4 100644
--- a/tools/hal_find_by_property.c
+++ b/tools/hal_find_by_property.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2005 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free 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/hal_get_property.c b/tools/hal_get_property.c
index 0045db56..1f624847 100644
--- a/tools/hal_get_property.c
+++ b/tools/hal_get_property.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free 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/hal_set_property.c b/tools/hal_set_property.c
index fbde75c8..087f5e29 100644
--- a/tools/hal_set_property.c
+++ b/tools/hal_set_property.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free 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/linux/add_selinux.c b/tools/linux/add_selinux.c
index ea51b10a..0a1537da 100644
--- a/tools/linux/add_selinux.c
+++ b/tools/linux/add_selinux.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2005 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free 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/linux/hal_hotplug.c b/tools/linux/hal_hotplug.c
index 9a9dae13..361f8ee1 100644
--- a/tools/linux/hal_hotplug.c
+++ b/tools/linux/hal_hotplug.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free 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/lshal.c b/tools/lshal.c
index e071f669..61442996 100644
--- a/tools/lshal.c
+++ b/tools/lshal.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
*
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by