[Modconf-commits] r189 - in trunk/modconf: . debian

[Frank Lichtenheld]

Author: djpig
Date: 2005-08-28 22:29:03 +0000 (Sun, 28 Aug 2005)
New Revision: 189

Modified:
   trunk/modconf/COPYING
   trunk/modconf/debian/changelog
   trunk/modconf/debian/copyright
Log:
Update FSF address in COPYING and debian/copyright


Modified: trunk/modconf/COPYING
===================================================================
--- trunk/modconf/COPYING	2005-08-28 22:08:07 UTC (rev 188)
+++ trunk/modconf/COPYING	2005-08-28 22:29:03 UTC (rev 189)
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -279,7 +279,7 @@
 
 		     END OF TERMS AND CONDITIONS
 
-	Appendix: How to Apply These Terms to Your New Programs
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -305,14 +305,15 @@
 
     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., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

Modified: trunk/modconf/debian/changelog
===================================================================
--- trunk/modconf/debian/changelog	2005-08-28 22:08:07 UTC (rev 188)
+++ trunk/modconf/debian/changelog	2005-08-28 22:29:03 UTC (rev 189)
@@ -4,6 +4,7 @@
   * Use descriptions both from 2.6 and 2.4 which removes most of
     the "(no description available)" messages
   * Bump Standards-Version to 3.6.2 (no changes)
+  * Update FSF address in COPYING and debian/copyright
 
  -- Frank Lichtenheld <djpig at debian.org>  Sun, 28 Aug 2005 23:59:28 +0200
 

Modified: trunk/modconf/debian/copyright
===================================================================
--- trunk/modconf/debian/copyright	2005-08-28 22:08:07 UTC (rev 188)
+++ trunk/modconf/debian/copyright	2005-08-28 22:29:03 UTC (rev 189)
@@ -23,5 +23,5 @@
 You should have received a copy of the GNU General Public License with
 your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or
 with the Debian GNU/Linux modconf source package as the file COPYING.
-If not, write to the Free Software Foundation, Inc., 59 Temple Place -
-Suite 330, Boston, MA 02111-1307, USA.
+If not, write to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA  02110-1301 USA