2006-02-17 Danilo Piazzalunga <danilopiazza@gmail.com>

	* COPYING: Use the text from the Library GPL 2.0, which is the actual
	license of cairomm. Fixes Bug #5934
    * all: Update FSF's postal address in GPL/LGPL
    comment headings.  Fixes Bug #5933

23 files changed, 70 insertions, 47 deletions

diff --git a/cairomm/cairomm.h b/cairomm/cairomm.h
index a87c4c6..03ff4ca 100644
--- a/cairomm/cairomm.h
+++ b/cairomm/cairomm.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_H
diff --git a/cairomm/context.cc b/cairomm/context.cc
index bdd2230..4c1f41b 100644
--- a/cairomm/context.cc
+++ b/cairomm/context.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/context.h>
diff --git a/cairomm/context.h b/cairomm/context.h
index 77a621a..d73a08e 100644
--- a/cairomm/context.h
+++ b/cairomm/context.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_CONTEXT_H
diff --git a/cairomm/enums.h b/cairomm/enums.h
index 0272c04..abb49c0 100644
--- a/cairomm/enums.h
+++ b/cairomm/enums.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_ENUMS_H
diff --git a/cairomm/exception.cc b/cairomm/exception.cc
index def6738..f416369 100644
--- a/cairomm/exception.cc
+++ b/cairomm/exception.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/exception.h>
diff --git a/cairomm/exception.h b/cairomm/exception.h
index cf5da16..f8d3cfe 100644
--- a/cairomm/exception.h
+++ b/cairomm/exception.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIRO_EXCEPTION_H
diff --git a/cairomm/fontface.cc b/cairomm/fontface.cc
index dc56c89..e173191 100644
--- a/cairomm/fontface.cc
+++ b/cairomm/fontface.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/fontface.h>
diff --git a/cairomm/fontface.h b/cairomm/fontface.h
index 832c542..93b8ed6 100644
--- a/cairomm/fontface.h
+++ b/cairomm/fontface.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_FONTFACE_H
diff --git a/cairomm/fontoptions.cc b/cairomm/fontoptions.cc
index 45e22a9..ce3b4d3 100644
--- a/cairomm/fontoptions.cc
+++ b/cairomm/fontoptions.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/fontoptions.h>
diff --git a/cairomm/fontoptions.h b/cairomm/fontoptions.h
index ae67c95..b760752 100644
--- a/cairomm/fontoptions.h
+++ b/cairomm/fontoptions.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_FONTOPTIONS_H
diff --git a/cairomm/path.cc b/cairomm/path.cc
index 402bfb8..0c4b25c 100644
--- a/cairomm/path.cc
+++ b/cairomm/path.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/path.h>
diff --git a/cairomm/path.h b/cairomm/path.h
index 3217c37..75e49d9 100644
--- a/cairomm/path.h
+++ b/cairomm/path.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_PATH_H
diff --git a/cairomm/pattern.cc b/cairomm/pattern.cc
index 72978ba..ce25e65 100644
--- a/cairomm/pattern.cc
+++ b/cairomm/pattern.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/pattern.h>
diff --git a/cairomm/pattern.h b/cairomm/pattern.h
index 8102103..f42162a 100644
--- a/cairomm/pattern.h
+++ b/cairomm/pattern.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_PATTERN_H
diff --git a/cairomm/private.cc b/cairomm/private.cc
index 72fc091..a435a63 100644
--- a/cairomm/private.cc
+++ b/cairomm/private.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/private.h>
diff --git a/cairomm/private.h b/cairomm/private.h
index da46456..929c81a 100644
--- a/cairomm/private.h
+++ b/cairomm/private.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_PRIVATE_H
diff --git a/cairomm/refptr.h b/cairomm/refptr.h
index 70b9436..e227dbb 100644
--- a/cairomm/refptr.h
+++ b/cairomm/refptr.h
@@ -2,7 +2,7 @@
 #ifndef _cairo_REFPTR_H
 #define _cairo_REFPTR_H
 
-/* $Id: refptr.h,v 1.1 2005-12-20 09:17:53 murrayc Exp $ */
+/* $Id: refptr.h,v 1.2 2006-02-21 05:21:02 jjongsma Exp $ */
 
 /* Copyright 2005 The cairomm Development Team
  *
@@ -17,8 +17,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 
diff --git a/cairomm/surface.cc b/cairomm/surface.cc
index 2b4bdc6..4dec7a6 100644
--- a/cairomm/surface.cc
+++ b/cairomm/surface.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/surface.h>
diff --git a/cairomm/surface.h b/cairomm/surface.h
index 71ef2b6..6865ba8 100644
--- a/cairomm/surface.h
+++ b/cairomm/surface.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_SURFACE_H
diff --git a/cairomm/win32_surface.cc b/cairomm/win32_surface.cc
index 90209dc..746329b 100644
--- a/cairomm/win32_surface.cc
+++ b/cairomm/win32_surface.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/win32_surface.h>
diff --git a/cairomm/win32_surface.h b/cairomm/win32_surface.h
index caa51fe..d907b0d 100644
--- a/cairomm/win32_surface.h
+++ b/cairomm/win32_surface.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_WIN32_SURFACE_H
diff --git a/cairomm/xlib_surface.cc b/cairomm/xlib_surface.cc
index 751fbe0..23a179a 100644
--- a/cairomm/xlib_surface.cc
+++ b/cairomm/xlib_surface.cc
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <cairomm/xlib_surface.h>
diff --git a/cairomm/xlib_surface.h b/cairomm/xlib_surface.h
index 54be4d3..75a3bc7 100644
--- a/cairomm/xlib_surface.h
+++ b/cairomm/xlib_surface.h
@@ -11,8 +11,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef __CAIROMM_XLIB_SURFACE_H