Remove old FSF license from header files

And refresh the COPYING and COPYING.LIB files

https://bugzilla.gnome.org/show_bug.cgi?id=721549

54 files changed, 71 insertions, 125 deletions

diff --git a/egg/egg-armor.c b/egg/egg-armor.c
index acb56df0..23cfba5f 100644
--- a/egg/egg-armor.c
+++ b/egg/egg-armor.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-armor.h b/egg/egg-armor.h
index e32d44d4..f15b994b 100644
--- a/egg/egg-armor.h
+++ b/egg/egg-armor.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-asn1-defs.c b/egg/egg-asn1-defs.c
index e1a6d1ea..3774f321 100644
--- a/egg/egg-asn1-defs.c
+++ b/egg/egg-asn1-defs.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw@collabora.co.uk>
 */
diff --git a/egg/egg-asn1-defs.h b/egg/egg-asn1-defs.h
index ec47287c..cd1eee8a 100644
--- a/egg/egg-asn1-defs.h
+++ b/egg/egg-asn1-defs.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
index 0a4b655a..4ffcdf21 100644
--- a/egg/egg-asn1x.c
+++ b/egg/egg-asn1x.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
@@ -40,7 +39,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with this library; if not, see
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
  */
diff --git a/egg/egg-asn1x.h b/egg/egg-asn1x.h
index 8d8970e8..e74ff8df 100644
--- a/egg/egg-asn1x.h
+++ b/egg/egg-asn1x.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-buffer.c b/egg/egg-buffer.c
index 967e960e..fd0aca27 100644
--- a/egg/egg-buffer.c
+++ b/egg/egg-buffer.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-buffer.h b/egg/egg-buffer.h
index 92495746..bd710f3e 100644
--- a/egg/egg-buffer.h
+++ b/egg/egg-buffer.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-byte-array.c b/egg/egg-byte-array.c
index 15363f5b..abada4e4 100644
--- a/egg/egg-byte-array.c
+++ b/egg/egg-byte-array.c
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
diff --git a/egg/egg-byte-array.h b/egg/egg-byte-array.h
index 23d35780..2eff7270 100644
--- a/egg/egg-byte-array.h
+++ b/egg/egg-byte-array.h
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
diff --git a/egg/egg-cleanup.c b/egg/egg-cleanup.c
index 943c3441..3d06ef66 100644
--- a/egg/egg-cleanup.c
+++ b/egg/egg-cleanup.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-cleanup.h b/egg/egg-cleanup.h
index a3470270..d65de277 100644
--- a/egg/egg-cleanup.h
+++ b/egg/egg-cleanup.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-dbus.c b/egg/egg-dbus.c
index 353f6ce8..dca34251 100644
--- a/egg/egg-dbus.c
+++ b/egg/egg-dbus.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see
  *
  */
 
diff --git a/egg/egg-dbus.h b/egg/egg-dbus.h
index ed87e20c..81dc2e94 100644
--- a/egg/egg-dbus.h
+++ b/egg/egg-dbus.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see
  *
  */
 
diff --git a/egg/egg-dh.c b/egg/egg-dh.c
index 96de7738..ff9ded67 100644
--- a/egg/egg-dh.c
+++ b/egg/egg-dh.c
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-dh.h b/egg/egg-dh.h
index 6c001dbe..6812a6e4 100644
--- a/egg/egg-dh.h
+++ b/egg/egg-dh.h
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_DH_H_
diff --git a/egg/egg-dn.c b/egg/egg-dn.c
index 43bd772f..1c38eacb 100644
--- a/egg/egg-dn.c
+++ b/egg/egg-dn.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-dn.h b/egg/egg-dn.h
index bdf6b921..229338c7 100644
--- a/egg/egg-dn.h
+++ b/egg/egg-dn.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-error.h b/egg/egg-error.h
index 41cc0a5a..6aec1bf1 100644
--- a/egg/egg-error.h
+++ b/egg/egg-error.h
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_ERROR_H_
diff --git a/egg/egg-hkdf.c b/egg/egg-hkdf.c
index cfd597ab..b5e2fe2c 100644
--- a/egg/egg-hkdf.c
+++ b/egg/egg-hkdf.c
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
diff --git a/egg/egg-hkdf.h b/egg/egg-hkdf.h
index 91689e9b..26a3860b 100644
--- a/egg/egg-hkdf.h
+++ b/egg/egg-hkdf.h
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c
index 3d8f95bf..a7f3de66 100644
--- a/egg/egg-libgcrypt.c
+++ b/egg/egg-libgcrypt.c
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-libgcrypt.h b/egg/egg-libgcrypt.h
index 1aee422b..0e39634f 100644
--- a/egg/egg-libgcrypt.h
+++ b/egg/egg-libgcrypt.h
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_LIBGCRYPT_H_
diff --git a/egg/egg-mkdtemp.c b/egg/egg-mkdtemp.c
index 9482d5af..c452c33e 100644
--- a/egg/egg-mkdtemp.c
+++ b/egg/egg-mkdtemp.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   <http://www.gnu.org/licenses/>.
 
 /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
 
diff --git a/egg/egg-mkdtemp.h b/egg/egg-mkdtemp.h
index 6cc32c74..dde7e02f 100644
--- a/egg/egg-mkdtemp.h
+++ b/egg/egg-mkdtemp.h
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   <http://www.gnu.org/licenses/>.
 
 /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
 
diff --git a/egg/egg-oid.c b/egg/egg-oid.c
index 5ab7ea63..96baea6d 100644
--- a/egg/egg-oid.c
+++ b/egg/egg-oid.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-oid.h b/egg/egg-oid.h
index 5b9b5883..e7741769 100644
--- a/egg/egg-oid.h
+++ b/egg/egg-oid.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-openssl.c b/egg/egg-openssl.c
index 5515be12..c8dc3d98 100644
--- a/egg/egg-openssl.c
+++ b/egg/egg-openssl.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-openssl.h b/egg/egg-openssl.h
index 6c94a7ba..592024e9 100644
--- a/egg/egg-openssl.h
+++ b/egg/egg-openssl.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-padding.c b/egg/egg-padding.c
index ee694c86..9590bbbb 100644
--- a/egg/egg-padding.c
+++ b/egg/egg-padding.c
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-padding.h b/egg/egg-padding.h
index 12b99508..230acb05 100644
--- a/egg/egg-padding.h
+++ b/egg/egg-padding.h
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_PADDING_H_
diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c
index 9e605ff7..ac4ce06a 100644
--- a/egg/egg-secure-memory.c
+++ b/egg/egg-secure-memory.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-secure-memory.h b/egg/egg-secure-memory.h
index 51815511..f5b44039 100644
--- a/egg/egg-secure-memory.h
+++ b/egg/egg-secure-memory.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/egg-spawn.c b/egg/egg-spawn.c
index b4e242f1..46f409ba 100644
--- a/egg/egg-spawn.c
+++ b/egg/egg-spawn.c
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-symkey.c b/egg/egg-symkey.c
index c6f69ad0..0f7a939f 100644
--- a/egg/egg-symkey.c
+++ b/egg/egg-symkey.c
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-symkey.h b/egg/egg-symkey.h
index f4938f6a..4cf431fb 100644
--- a/egg/egg-symkey.h
+++ b/egg/egg-symkey.h
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_SYMKEY_H_
diff --git a/egg/egg-testing.c b/egg/egg-testing.c
index ee664a43..7a6b5dff 100644
--- a/egg/egg-testing.c
+++ b/egg/egg-testing.c
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Stef Walter <stefw@collabora.co.uk>
  */
diff --git a/egg/egg-testing.h b/egg/egg-testing.h
index 1ebf56b7..402e667d 100644
--- a/egg/egg-testing.h
+++ b/egg/egg-testing.h
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
diff --git a/egg/egg-timegm.c b/egg/egg-timegm.c
index b42ced95..79648164 100644
--- a/egg/egg-timegm.c
+++ b/egg/egg-timegm.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   <http://www.gnu.org/licenses/>.
 
 /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
 
diff --git a/egg/egg-timegm.h b/egg/egg-timegm.h
index 37a816a3..ae32a1e3 100644
--- a/egg/egg-timegm.h
+++ b/egg/egg-timegm.h
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   <http://www.gnu.org/licenses/>.
 
 /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
 
diff --git a/egg/tests/test-armor.c b/egg/tests/test-armor.c
index 7435a109..3e5cc658 100644
--- a/egg/tests/test-armor.c
+++ b/egg/tests/test-armor.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw@gnome.org>
 */
diff --git a/egg/tests/test-asn1.c b/egg/tests/test-asn1.c
index 3036fa5c..a4373557 100644
--- a/egg/tests/test-asn1.c
+++ b/egg/tests/test-asn1.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-asn1x.c b/egg/tests/test-asn1x.c
index 78810de1..cce6fe8e 100644
--- a/egg/tests/test-asn1x.c
+++ b/egg/tests/test-asn1x.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-cleanup.c b/egg/tests/test-cleanup.c
index 0a89f19b..a83c4868 100644
--- a/egg/tests/test-cleanup.c
+++ b/egg/tests/test-cleanup.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-dh.c b/egg/tests/test-dh.c
index a676f93c..10d612e1 100644
--- a/egg/tests/test-dh.c
+++ b/egg/tests/test-dh.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-dn.c b/egg/tests/test-dn.c
index 6494679b..d1b6f729 100644
--- a/egg/tests/test-dn.c
+++ b/egg/tests/test-dn.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-hex.c b/egg/tests/test-hex.c
index 992f0aab..773b2008 100644
--- a/egg/tests/test-hex.c
+++ b/egg/tests/test-hex.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-hkdf.c b/egg/tests/test-hkdf.c
index de1d1965..e5518a63 100644
--- a/egg/tests/test-hkdf.c
+++ b/egg/tests/test-hkdf.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@collabora.co.uk>
 */
diff --git a/egg/tests/test-oid.c b/egg/tests/test-oid.c
index 37b0e2e8..2c013457 100644
--- a/egg/tests/test-oid.c
+++ b/egg/tests/test-oid.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-openssl.c b/egg/tests/test-openssl.c
index 562f2000..91622b93 100644
--- a/egg/tests/test-openssl.c
+++ b/egg/tests/test-openssl.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-padding.c b/egg/tests/test-padding.c
index 10a6c0eb..aecdd378 100644
--- a/egg/tests/test-padding.c
+++ b/egg/tests/test-padding.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-secmem.c b/egg/tests/test-secmem.c
index e0b6e248..58b0d35f 100644
--- a/egg/tests/test-secmem.c
+++ b/egg/tests/test-secmem.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-spawn.c b/egg/tests/test-spawn.c
index e0ac386e..7c0d1e11 100644
--- a/egg/tests/test-spawn.c
+++ b/egg/tests/test-spawn.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */
diff --git a/egg/tests/test-symkey.c b/egg/tests/test-symkey.c
index 783eebbf..90211d68 100644
--- a/egg/tests/test-symkey.c
+++ b/egg/tests/test-symkey.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef@memberwebs.com>
 */