From 8ec5067368dae17d6e9f7f06e9dc9cf6c9011341 Mon Sep 17 00:00:00 2001 From: lxoliva Date: Tue, 20 Mar 2012 05:10:42 +0000 Subject: [PATCH] GNU Linux-libre 3.[012]-gnu. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@8456 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-3.0 | 36 ++++++++++++++++++++---------------- deblob-3.1 | 36 ++++++++++++++++++++---------------- deblob-3.2 | 36 ++++++++++++++++++++---------------- 3 files changed, 60 insertions(+), 48 deletions(-) diff --git a/deblob-3.0 b/deblob-3.0 index 80406cd157b..543f31552a9 100755 --- a/deblob-3.0 +++ b/deblob-3.0 @@ -1,10 +1,13 @@ #!/bin/sh -# Copyright (C) 2008, 2009, 2010, 2011, 2012 -# Alexandre Oliva +# Copyright (C) 2008-2012 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # +# This program is part of GNU Linux-libre, a GNU project that +# publishes scripts to clean up Linux so as to make it suitable for +# use in the GNU Project and in Free System Distributions. +# # 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 @@ -45,7 +48,7 @@ # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=3.0 extra=0++ +kver=3.0 extra= case $1 in --force) @@ -280,19 +283,19 @@ for f in \ done # Identify the tarball. -grep -q 'EXTRAVERSION.*-libre' Makefile || -clean_sed "s,^EXTRAVERSION.*,&-libre$extra, -" Makefile 'added -libre to EXTRAVERSION' +grep -q 'EXTRAVERSION.*-gnu' Makefile || +clean_sed "s,^EXTRAVERSION.*,&-gnu$extra, +" Makefile 'added -gnu to EXTRAVERSION' grep -q Linux-libre README || clean_sed ' -1,3 s,Linux kernel release.*kernel\.org.*,Linux-libre , -2,5 s,Linux version [0-9.]*,Linux-libre, +1,3 s,Linux kernel release.*kernel\.org.*,GNU Linux-libre , +2,5 s,Linux version [0-9.]*,GNU Linux-libre, 1,20 s,\(operating system \)\?Unix,Unix kernel, /WHAT IS LINUX/i\ -WHAT IS Linux-libre?\ +WHAT IS GNU Linux-libre?\ \ - Linux-libre is a Free version of the kernel Linux (see below),\ + GNU Linux-libre is a Free version of the kernel Linux (see below),\ suitable for use with the GNU Operating System in 100% Free\ GNU/Linux-libre System Distributions.\ http://www.gnu.org/distros/\ @@ -306,12 +309,13 @@ WHAT IS Linux-libre?\ \ Linux-libre started within the gNewSense GNU/Linux distribution.\ It was later adopted by Jeff Moe, who coined its name, and in 2008\ - it became a project maintained by FSF Latin America.\ + it became a project maintained by FSF Latin America. In 2012, it\ + became part of the GNU Project.\ \ - The Linux-libre project takes a minimal-changes approach to cleaning\ - up Linux, making no effort to substitute components that need to be\ - removed with functionally equivalent Free ones. Nevertheless, we\ - encourage and support efforts towards doing so.\ + The GNU Linux-libre project takes a minimal-changes approach to\ + cleaning up Linux, making no effort to substitute components that\ + need to be removed with functionally equivalent Free ones.\ + Nevertheless, we encourage and support efforts towards doing so.\ http://libreplanet.org/wiki/LinuxLibre:Devices_that_require_non-free_firmware\ \ Our mascot is Freedo, a light-blue penguin that has just come out\ @@ -320,7 +324,7 @@ WHAT IS Linux-libre?\ promotion. See our web page for their images.\ http://linux-libre.fsfla.org/\ -' README 'added blurb about Linux-libre' +' README 'added blurb about GNU Linux-libre' # Add reject_firmware and maybe_reject_firmware grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || diff --git a/deblob-3.1 b/deblob-3.1 index 53fcdf39b3c..d88dab24e46 100755 --- a/deblob-3.1 +++ b/deblob-3.1 @@ -1,10 +1,13 @@ #!/bin/sh -# Copyright (C) 2008, 2009, 2010, 2011, 2012 -# Alexandre Oliva +# Copyright (C) 2008-2012 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # +# This program is part of GNU Linux-libre, a GNU project that +# publishes scripts to clean up Linux so as to make it suitable for +# use in the GNU Project and in Free System Distributions. +# # 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 @@ -45,7 +48,7 @@ # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=3.1 extra=0++ +kver=3.1 extra= case $1 in --force) @@ -284,19 +287,19 @@ for f in \ done # Identify the tarball. -grep -q 'EXTRAVERSION.*-libre' Makefile || -clean_sed "s,^EXTRAVERSION.*,&-libre$extra, -" Makefile 'added -libre to EXTRAVERSION' +grep -q 'EXTRAVERSION.*-gnu' Makefile || +clean_sed "s,^EXTRAVERSION.*,&-gnu$extra, +" Makefile 'added -gnu to EXTRAVERSION' grep -q Linux-libre README || clean_sed ' -1,3 s,Linux kernel release.*kernel\.org.*,Linux-libre , -2,5 s,Linux version [0-9.]*,Linux-libre, +1,3 s,Linux kernel release.*kernel\.org.*,GNU Linux-libre , +2,5 s,Linux version [0-9.]*,GNU Linux-libre, 1,20 s,\(operating system \)\?Unix,Unix kernel, /WHAT IS LINUX/i\ -WHAT IS Linux-libre?\ +WHAT IS GNU Linux-libre?\ \ - Linux-libre is a Free version of the kernel Linux (see below),\ + GNU Linux-libre is a Free version of the kernel Linux (see below),\ suitable for use with the GNU Operating System in 100% Free\ GNU/Linux-libre System Distributions.\ http://www.gnu.org/distros/\ @@ -310,12 +313,13 @@ WHAT IS Linux-libre?\ \ Linux-libre started within the gNewSense GNU/Linux distribution.\ It was later adopted by Jeff Moe, who coined its name, and in 2008\ - it became a project maintained by FSF Latin America.\ + it became a project maintained by FSF Latin America. In 2012, it\ + became part of the GNU Project.\ \ - The Linux-libre project takes a minimal-changes approach to cleaning\ - up Linux, making no effort to substitute components that need to be\ - removed with functionally equivalent Free ones. Nevertheless, we\ - encourage and support efforts towards doing so.\ + The GNU Linux-libre project takes a minimal-changes approach to\ + cleaning up Linux, making no effort to substitute components that\ + need to be removed with functionally equivalent Free ones.\ + Nevertheless, we encourage and support efforts towards doing so.\ http://libreplanet.org/wiki/LinuxLibre:Devices_that_require_non-free_firmware\ \ Our mascot is Freedo, a light-blue penguin that has just come out\ @@ -324,7 +328,7 @@ WHAT IS Linux-libre?\ promotion. See our web page for their images.\ http://linux-libre.fsfla.org/\ -' README 'added blurb about Linux-libre' +' README 'added blurb about GNU Linux-libre' # Add reject_firmware and maybe_reject_firmware grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || diff --git a/deblob-3.2 b/deblob-3.2 index 23bbc4731b1..23fa55dedd4 100755 --- a/deblob-3.2 +++ b/deblob-3.2 @@ -1,10 +1,13 @@ #!/bin/sh -# Copyright (C) 2008, 2009, 2010, 2011, 2012 -# Alexandre Oliva +# Copyright (C) 2008-2012 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # +# This program is part of GNU Linux-libre, a GNU project that +# publishes scripts to clean up Linux so as to make it suitable for +# use in the GNU Project and in Free System Distributions. +# # 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 @@ -45,7 +48,7 @@ # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=3.2 extra=0++ +kver=3.2 extra= case $1 in --force) @@ -284,19 +287,19 @@ for f in \ done # Identify the tarball. -grep -q 'EXTRAVERSION.*-libre' Makefile || -clean_sed "s,^EXTRAVERSION.*,&-libre$extra, -" Makefile 'added -libre to EXTRAVERSION' +grep -q 'EXTRAVERSION.*-gnu' Makefile || +clean_sed "s,^EXTRAVERSION.*,&-gnu$extra, +" Makefile 'added -gnu to EXTRAVERSION' grep -q Linux-libre README || clean_sed ' -1,3 s,Linux kernel release.*kernel\.org.*,Linux-libre , -2,5 s,Linux version [0-9.]*,Linux-libre, +1,3 s,Linux kernel release.*kernel\.org.*,GNU Linux-libre , +2,5 s,Linux version [0-9.]*,GNU Linux-libre, 1,20 s,\(operating system \)\?Unix,Unix kernel, /WHAT IS LINUX/i\ -WHAT IS Linux-libre?\ +WHAT IS GNU Linux-libre?\ \ - Linux-libre is a Free version of the kernel Linux (see below),\ + GNU Linux-libre is a Free version of the kernel Linux (see below),\ suitable for use with the GNU Operating System in 100% Free\ GNU/Linux-libre System Distributions.\ http://www.gnu.org/distros/\ @@ -310,12 +313,13 @@ WHAT IS Linux-libre?\ \ Linux-libre started within the gNewSense GNU/Linux distribution.\ It was later adopted by Jeff Moe, who coined its name, and in 2008\ - it became a project maintained by FSF Latin America.\ + it became a project maintained by FSF Latin America. In 2012, it\ + became part of the GNU Project.\ \ - The Linux-libre project takes a minimal-changes approach to cleaning\ - up Linux, making no effort to substitute components that need to be\ - removed with functionally equivalent Free ones. Nevertheless, we\ - encourage and support efforts towards doing so.\ + The GNU Linux-libre project takes a minimal-changes approach to\ + cleaning up Linux, making no effort to substitute components that\ + need to be removed with functionally equivalent Free ones.\ + Nevertheless, we encourage and support efforts towards doing so.\ http://libreplanet.org/wiki/LinuxLibre:Devices_that_require_non-free_firmware\ \ Our mascot is Freedo, a light-blue penguin that has just come out\ @@ -324,7 +328,7 @@ WHAT IS Linux-libre?\ promotion. See our web page for their images.\ http://linux-libre.fsfla.org/\ -' README 'added blurb about Linux-libre' +' README 'added blurb about GNU Linux-libre' # Add reject_firmware and maybe_reject_firmware grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || -- 2.31.1