10 files changed, 24 insertions, 25 deletions
diff --git a/gnu/java/text/AttributedFormatBuffer.java b/gnu/java/text/AttributedFormatBuffer.java
index a02f8a1bc..8cfc8f56d 100644
--- a/gnu/java/text/AttributedFormatBuffer.java
+++ b/gnu/java/text/AttributedFormatBuffer.java
@@ -15,8 +15,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/gnu/java/text/BaseBreakIterator.java b/gnu/java/text/BaseBreakIterator.java
index 40a698f7c..c28a2089a 100644
--- a/gnu/java/text/BaseBreakIterator.java
+++ b/gnu/java/text/BaseBreakIterator.java
@@ -15,8 +15,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/gnu/java/text/CharacterBreakIterator.java b/gnu/java/text/CharacterBreakIterator.java
index c973f7b87..5274543a9 100644
--- a/gnu/java/text/CharacterBreakIterator.java
+++ b/gnu/java/text/CharacterBreakIterator.java
@@ -15,8 +15,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/gnu/java/text/FormatBuffer.java b/gnu/java/text/FormatBuffer.java
index addfcbe5c..e6b682087 100644
--- a/gnu/java/text/FormatBuffer.java
+++ b/gnu/java/text/FormatBuffer.java
@@ -15,8 +15,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/gnu/java/text/FormatCharacterIterator.java b/gnu/java/text/FormatCharacterIterator.java
index 942641a08..60773aa1e 100644
--- a/gnu/java/text/FormatCharacterIterator.java
+++ b/gnu/java/text/FormatCharacterIterator.java
@@ -16,8 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -37,8 +37,6 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 package gnu.java.text;
 
-import gnu.classpath.Configuration;
-
 import java.text.AttributedCharacterIterator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -65,7 +63,8 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
   private int attributeIndex;
   private int[] ranges;
   private HashMap[] attributes;
-  
+  private static final boolean DEBUG = false;
+
   /**
    * This constructor builds an empty iterated strings. The attributes
    * are empty and so is the string. However you may append strings
@@ -496,7 +495,7 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
 
   private void debug(String s)
   {
-    if (Configuration.DEBUG)
+    if (DEBUG)
       System.out.println(s);
   }
 
@@ -504,7 +503,7 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
   {
     int start_range = 0;
     
-    if (!Configuration.DEBUG)
+    if (!DEBUG)
       return;
 
     System.out.println("Dumping internal table:");
diff --git a/gnu/java/text/LineBreakIterator.java b/gnu/java/text/LineBreakIterator.java
index 7f00a95df..ad07479fb 100644
--- a/gnu/java/text/LineBreakIterator.java
+++ b/gnu/java/text/LineBreakIterator.java
@@ -15,8 +15,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/gnu/java/text/SentenceBreakIterator.java b/gnu/java/text/SentenceBreakIterator.java
index 3d3958728..f91d269bb 100644
--- a/gnu/java/text/SentenceBreakIterator.java
+++ b/gnu/java/text/SentenceBreakIterator.java
@@ -15,8 +15,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/gnu/java/text/StringFormatBuffer.java b/gnu/java/text/StringFormatBuffer.java
index ec0ed8641..5772186b4 100644
--- a/gnu/java/text/StringFormatBuffer.java
+++ b/gnu/java/text/StringFormatBuffer.java
@@ -15,8 +15,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/gnu/java/text/WordBreakIterator.java b/gnu/java/text/WordBreakIterator.java
index 85c44da45..f140369f8 100644
--- a/gnu/java/text/WordBreakIterator.java
+++ b/gnu/java/text/WordBreakIterator.java
@@ -15,8 +15,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/gnu/java/text/package.html b/gnu/java/text/package.html
index b379b9b3b..a1025a8e9 100644
--- a/gnu/java/text/package.html
+++ b/gnu/java/text/package.html
@@ -16,8 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and