The following commit has been merged in the master branch:
commit 1725d46fddf746b5809022b6ca31591145f9cae1
Author: Patrick Schoenfeld <[email protected]>
Date: Thu Oct 7 13:49:39 2010 +0200
Replace occurences of old FSF address with the FSF recommendation what
should be written inside of source files. (Closes: #502512)
diff --git a/Devscripts/PackageDeps.pm b/Devscripts/PackageDeps.pm
index d554d8a..d3b8bfb 100644
--- a/Devscripts/PackageDeps.pm
+++ b/Devscripts/PackageDeps.pm
@@ -18,8 +18,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 <http://www.gnu.org/licenses/>.
use strict;
use Carp;
diff --git a/Devscripts/Packages.pm b/Devscripts/Packages.pm
index ba7fd8f..321938d 100644
--- a/Devscripts/Packages.pm
+++ b/Devscripts/Packages.pm
@@ -14,8 +14,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 <http://www.gnu.org/licenses/>.
package Devscripts::Packages;
diff --git a/Devscripts/Set.pm b/Devscripts/Set.pm
index 4ec15aa..041288e 100644
--- a/Devscripts/Set.pm
+++ b/Devscripts/Set.pm
@@ -12,8 +12,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 <http://www.gnu.org/licenses/>.
package Devscripts::Set;
diff --git a/Devscripts/Versort.pm b/Devscripts/Versort.pm
index d2f5ecd..dbf3bd0 100644
--- a/Devscripts/Versort.pm
+++ b/Devscripts/Versort.pm
@@ -10,8 +10,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
-# For a copy of the GNU General Public License write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# The functions in this Perl module are versort and deb_versort. They
# each take as input an array of elements of the form [version, data, ...]
diff --git a/debian/changelog b/debian/changelog
index e81272c..2b97d83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,12 @@ devscripts (2.10.69) UNRELEASED; urgency=low
[ David Prévot ]
* Update French translation. (Closes: #599234)
- -- James Vega <[email protected]> Thu, 23 Sep 2010 22:51:16 -0400
+ [ Patrick Schoenfeld ]
+ * Replace occurences of old FSF address with the FSF recommendation
+ what should be written inside of source files.
+ (Closes: #502512)
+
+ -- Patrick Schoenfeld <[email protected]> Thu, 07 Oct 2010 13:48:06 +0200
devscripts (2.10.68) unstable; urgency=low
diff --git a/examples/debian.procmail b/examples/debian.procmail
index 2b5f514..b700197 100644
--- a/examples/debian.procmail
+++ b/examples/debian.procmail
@@ -12,8 +12,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 <http://www.gnu.org/licenses/>.
#
# On Debian GNU/Linux systems, the complete text of the GNU General
# Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/examples/master.procmail b/examples/master.procmail
index c92245f..a5c3879 100644
--- a/examples/master.procmail
+++ b/examples/master.procmail
@@ -12,8 +12,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 <http://www.gnu.org/licenses/>.
#
# On Debian GNU/Linux systems, the complete text of the GNU General
# Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/scripts/annotate-output.sh b/scripts/annotate-output.sh
index 686d99c..75c531c 100755
--- a/scripts/annotate-output.sh
+++ b/scripts/annotate-output.sh
@@ -18,8 +18,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 <http://www.gnu.org/licenses/>.
progname=$(basename $0)
diff --git a/scripts/archpath.sh b/scripts/archpath.sh
index b48690a..54e8da3 100755
--- a/scripts/archpath.sh
+++ b/scripts/archpath.sh
@@ -15,8 +15,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 <http://www.gnu.org/licenses/>.
# Which arch implementation should we use?
if type baz >/dev/null 2>&1; then
diff --git a/scripts/bts.pl b/scripts/bts.pl
index a6ee622..a189396 100755
--- a/scripts/bts.pl
+++ b/scripts/bts.pl
@@ -21,8 +21,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 <http://www.gnu.org/licenses/>.
=head1 NAME
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index df3eee1..c04d94e 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -13,8 +13,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 <http://www.gnu.org/licenses/>.
=head1 NAME
diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
index e7a6f83..5c3252c 100755
--- a/scripts/checkbashisms.pl
+++ b/scripts/checkbashisms.pl
@@ -18,10 +18,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, you can find it on the World Wide
-# Web at http://www.gnu.org/copyleft/gpl.html, or 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/>.
use strict;
use Getopt::Long;
diff --git a/scripts/cvs-debi.sh b/scripts/cvs-debi.sh
index 12a357f..65c284a 100755
--- a/scripts/cvs-debi.sh
+++ b/scripts/cvs-debi.sh
@@ -19,8 +19,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 <http://www.gnu.org/licenses/>.
PROGNAME=`basename $0 .sh` # .sh for debugging purposes
diff --git a/scripts/cvs-debrelease.sh b/scripts/cvs-debrelease.sh
index 5ee3474..97e7f72 100755
--- a/scripts/cvs-debrelease.sh
+++ b/scripts/cvs-debrelease.sh
@@ -19,8 +19,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 <http://www.gnu.org/licenses/>.
PROGNAME=`basename $0 .sh` # .sh for debugging purposes
diff --git a/scripts/cvs-debuild.pl b/scripts/cvs-debuild.pl
index 80a2527..79eee88 100755
--- a/scripts/cvs-debuild.pl
+++ b/scripts/cvs-debuild.pl
@@ -16,8 +16,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 <http://www.gnu.org/licenses/>.
# We will do simple option processing. The calling syntax of this
diff --git a/scripts/dd-list.1 b/scripts/dd-list.1
index d920dd2..3f78758 100644
--- a/scripts/dd-list.1
+++ b/scripts/dd-list.1
@@ -11,8 +11,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 <http://www.gnu.org/licenses/>.
.\"
.TH DD\-LIST 1 2005-06-28 "Debian"
.\" --------------------------------------------------------------------
diff --git a/scripts/dd-list.pl b/scripts/dd-list.pl
index 214c75e..4991dd5 100755
--- a/scripts/dd-list.pl
+++ b/scripts/dd-list.pl
@@ -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 <http://www.gnu.org/licenses/>.
use strict;
use Getopt::Long;
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 4b62eea..bf63740 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -26,8 +26,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 <http://www.gnu.org/licenses/>.
use 5.008; # We're using PerlIO layers
use strict;
diff --git a/scripts/debi.pl b/scripts/debi.pl
index 18b07b0..cb1b903 100755
--- a/scripts/debi.pl
+++ b/scripts/debi.pl
@@ -21,8 +21,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 <http://www.gnu.org/licenses/>.
use 5.008;
use strict;
diff --git a/scripts/debpkg.pl b/scripts/debpkg.pl
index c04df9b..9fcee6b 100755
--- a/scripts/debpkg.pl
+++ b/scripts/debpkg.pl
@@ -16,8 +16,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 <http://www.gnu.org/licenses/>.
# All this program does is to check that it is either running as root
diff --git a/scripts/debrelease.sh b/scripts/debrelease.sh
index f54bee9..c7b9d84 100755
--- a/scripts/debrelease.sh
+++ b/scripts/debrelease.sh
@@ -19,8 +19,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 <http://www.gnu.org/licenses/>.
set -e
diff --git a/scripts/debrsign.sh b/scripts/debrsign.sh
index 4b776b1..5133dae 100755
--- a/scripts/debrsign.sh
+++ b/scripts/debrsign.sh
@@ -39,8 +39,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 <http://www.gnu.org/licenses/>.
# Abort if anything goes wrong
set -e
diff --git a/scripts/debsign.sh b/scripts/debsign.sh
index 1625112..52bf7e5 100755
--- a/scripts/debsign.sh
+++ b/scripts/debsign.sh
@@ -31,8 +31,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 <http://www.gnu.org/licenses/>.
# Abort if anything goes wrong
set -e
diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index fc903f8..7c2a786 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -16,9 +16,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 <http://www.gnu.org/licenses/>.
# We will do simple option processing. The calling syntax of this
# program is:
diff --git a/scripts/dpkg-depcheck.pl b/scripts/dpkg-depcheck.pl
index e986cc0..7b99f59 100755
--- a/scripts/dpkg-depcheck.pl
+++ b/scripts/dpkg-depcheck.pl
@@ -14,8 +14,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 <http://www.gnu.org/licenses/>.
use strict;
use 5.006_000; # our() commands
diff --git a/scripts/dscverify.pl b/scripts/dscverify.pl
index fa14bdb..7baf0cf 100755
--- a/scripts/dscverify.pl
+++ b/scripts/dscverify.pl
@@ -18,8 +18,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
-# For a copy of the GNU General Public License write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
use 5.004; # correct pipe close behavior
use strict;
diff --git a/scripts/grep-excuses.pl b/scripts/grep-excuses.pl
index 3022e15..67f0b6f 100755
--- a/scripts/grep-excuses.pl
+++ b/scripts/grep-excuses.pl
@@ -16,8 +16,7 @@
#
# 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/>.
use 5.006;
use strict;
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 5d729b7..7d8140c 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -16,8 +16,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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program. If not, see <http://www.gnu.org/licenses/>.
=head1 NAME
diff --git a/scripts/mass-bug.pl b/scripts/mass-bug.pl
index a969529..e125e31 100755
--- a/scripts/mass-bug.pl
+++ b/scripts/mass-bug.pl
@@ -16,8 +16,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 <http://www.gnu.org/licenses/>.
=head1 NAME
diff --git a/scripts/mergechanges.sh b/scripts/mergechanges.sh
index e7fefb4..28fbf60 100755
--- a/scripts/mergechanges.sh
+++ b/scripts/mergechanges.sh
@@ -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 <http://www.gnu.org/licenses/>.
set -e
diff --git a/scripts/nmudiff.sh b/scripts/nmudiff.sh
index 3488b7c..e2e39b2 100755
--- a/scripts/nmudiff.sh
+++ b/scripts/nmudiff.sh
@@ -11,8 +11,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 <http://www.gnu.org/licenses/>.
PROGNAME=`basename $0`
MODIFIED_CONF_MSG='Default settings modified by devscripts configuration
files:'
diff --git a/scripts/plotchangelog.pl b/scripts/plotchangelog.pl
index 0f68ff9..190e792 100755
--- a/scripts/plotchangelog.pl
+++ b/scripts/plotchangelog.pl
@@ -21,8 +21,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 <http://www.gnu.org/licenses/>.
use 5.006;
use strict;
diff --git a/scripts/rc-alert.pl b/scripts/rc-alert.pl
index 3c0a62d..6db03ac 100755
--- a/scripts/rc-alert.pl
+++ b/scripts/rc-alert.pl
@@ -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 <http://www.gnu.org/licenses/>.
use strict;
use warnings;
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index ec0df77..49a775a 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -19,8 +19,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 <http://www.gnu.org/licenses/>.
use 5.008; # uses 'our' variables and filetest
use strict;
diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh
index 86851b4..e90787e 100755
--- a/scripts/uupdate.sh
+++ b/scripts/uupdate.sh
@@ -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 <http://www.gnu.org/licenses/>.
# Command line syntax is one of:
diff --git a/scripts/who-uploads.sh b/scripts/who-uploads.sh
index 18a556c..aa94f67 100755
--- a/scripts/who-uploads.sh
+++ b/scripts/who-uploads.sh
@@ -19,8 +19,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 <http://www.gnu.org/licenses/>.
PROGNAME=`basename $0`
MODIFIED_CONF_MSG='Default settings modified by devscripts configuration
files:'
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
