* gdb.base/step-line.c: Switch license to GPL version 3, and

        update copyright year.
        * gdb.base/step-line.inp: Likewise.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1106d0da9a88ce82b4becc60dfe290ea0b210505..8f95b3ff2eccd224b9f81a2fd151d2830c7c8188 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-17  Joel Brobecker  <brobecker@adacore.com>
+
+       * gdb.base/step-line.c: Switch license to GPL version 3, and
+       update copyright year.
+       * gdb.base/step-line.inp: Likewise.
+

 2007-08-17  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.base/gdb1555.exp: Make expected output immune to formatting
 2007-08-17  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.base/gdb1555.exp: Make expected output immune to formatting

diff --git a/gdb/testsuite/gdb.base/step-line.c b/gdb/testsuite/gdb.base/step-line.c
index f961120ab1c745569f6fa982d7c1f59534219718..a677a2f99bbc6b492d5b4ec5ca62527bed89194d 100644 (file)
--- a/gdb/testsuite/gdb.base/step-line.c
+++ b/gdb/testsuite/gdb.base/step-line.c
@@ -1,12 +1,12 @@
 /* Test step/next in presence of #line directives.
 /* Test step/next in presence of #line directives.

-   Copyright 2001
+   Copyright 2001, 2007

    Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    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
    Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    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

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +15,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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 <http://www.gnu.org/licenses/>.  */
+
+

 
 void dummy (int, int);
 int f1 (int);
 
 void dummy (int, int);
 int f1 (int);

diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp
index ffc2ee66db376ed9131e84840c8c31f96fcbb4f7..f40c58a233a94456fbb2a8fcd368afc23a99495f 100644 (file)
--- a/gdb/testsuite/gdb.base/step-line.exp
+++ b/gdb/testsuite/gdb.base/step-line.exp
@@ -2,17 +2,16 @@
 
 # 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
 
 # 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

-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 # (at your option) any later version.

-# 
+#

 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-# 
+#

 # You should have received a copy of the GNU General Public License
 # 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 <http://www.gnu.org/licenses/>.  */

 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-gdb@prep.ai.mit.edu
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-gdb@prep.ai.mit.edu

diff --git a/gdb/testsuite/gdb.base/step-line.inp b/gdb/testsuite/gdb.base/step-line.inp
index f4060a941521c4d12372faefe7d2d6ee44cd6fe9..4d6c1605da42247576a732223ad7519a90c6cc1d 100644 (file)
--- a/gdb/testsuite/gdb.base/step-line.inp
+++ b/gdb/testsuite/gdb.base/step-line.inp
@@ -1,10 +1,10 @@
 # Test step/next in presence of #line directives
 # Test step/next in presence of #line directives

-# Copyright 2001
+# Copyright 2001, 2007

 # Free Software Foundation, Inc.
 
 # 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
 # Free Software Foundation, Inc.
 
 # 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

-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,


@@ -13,12 +13,12 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # 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 <http://www.gnu.org/licenses/>.

 
 # We pretend that this file has been transformed by some other tool
 # into step-line.c.
 
 
 # We pretend that this file has been transformed by some other tool
 # into step-line.c.
 

+

 FUNCTION f1 (i : INTEGER);
   BEGIN
     i = f2 (i);
 FUNCTION f1 (i : INTEGER);
   BEGIN
     i = f2 (i);