summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Quinson <mquinson@debian.org>2003-01-21 09:59:35 +0000
committerMartin Quinson <mquinson@debian.org>2003-01-21 09:59:35 +0000
commitfc6281de97e0b6f4b727936d2779695caee2d78f (patch)
tree1d297ab0cf61674f0e9f57d4c5e65023410bee4d
parent1bc09eea65bdac501048a2a1eff970ac751fdd81 (diff)
downloadquilt-fc6281de97e0b6f4b727936d2779695caee2d78f.tar.gz
- Catch up to akmp version 0.10 (only files in need-checking were modified)
- Use bash ; use a proper first line (ie "#! /bin/bash", the space is needed on some rare platforms) - Add a header stating that the code is GPL in all scripts
-rwxr-xr-ximportpatch.in8
-rwxr-xr-xinpatch.in8
-rwxr-xr-xlib/apatch.in8
-rwxr-xr-xlib/rpatch.in8
-rwxr-xr-xlib/touched-by-patch8
-rwxr-xr-xneeds-checking/combine-applied8
-rwxr-xr-xneeds-checking/combine-series8
-rwxr-xr-xneeds-checking/cvs-take-patch8
-rwxr-xr-xneeds-checking/export_patch8
-rwxr-xr-xneeds-checking/extract_description8
-rwxr-xr-xneeds-checking/join-patch17
-rwxr-xr-xneeds-checking/linus-patch9
-rwxr-xr-xneeds-checking/new-kernel10
-rwxr-xr-xneeds-checking/p_diff8
-rwxr-xr-xneeds-checking/patchdesc8
-rwxr-xr-xneeds-checking/pstatus8
-rwxr-xr-xneeds-checking/ptkdiff8
-rwxr-xr-xneeds-checking/removed-by-patch10
-rwxr-xr-xneeds-checking/rename-patch22
-rwxr-xr-xneeds-checking/rolled-up-patch8
-rwxr-xr-xneeds-checking/tag-series8
-rwxr-xr-xnewpatch.in8
-rwxr-xr-xpatchadd.in8
-rwxr-xr-xpoppatch.in8
-rwxr-xr-xpushpatch.in8
-rwxr-xr-xrefpatch.in8
-rwxr-xr-xtoppatch.in8
27 files changed, 214 insertions, 30 deletions
diff --git a/importpatch.in b/importpatch.in
index 6d0cb0b..2e0c8cf 100755
--- a/importpatch.in
+++ b/importpatch.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# Read in library functions
if ! [ -r @LIB@/patchfns ]
diff --git a/inpatch.in b/inpatch.in
index 9bd3058..f3c3526 100755
--- a/inpatch.in
+++ b/inpatch.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# Read in library functions
if ! [ -r @LIB@/patchfns ]
diff --git a/lib/apatch.in b/lib/apatch.in
index a14d219..0e0c366 100755
--- a/lib/apatch.in
+++ b/lib/apatch.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
if ! [ -r @LIB@/patchfns ]
then
diff --git a/lib/rpatch.in b/lib/rpatch.in
index d25695b..3c05c0a 100755
--- a/lib/rpatch.in
+++ b/lib/rpatch.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
if ! [ -r @LIB@/patchfns ]
then
diff --git a/lib/touched-by-patch b/lib/touched-by-patch
index f26469e..bdfc296 100755
--- a/lib/touched-by-patch
+++ b/lib/touched-by-patch
@@ -1,6 +1,12 @@
-#!/bin/sh
+#! /bin/bash
# Extract names of new files from a patch, print them out
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
+
usage()
{
echo "Usage: touched-by-patch [-p num] patchname"
diff --git a/needs-checking/combine-applied b/needs-checking/combine-applied
index 487b553..dc00fc2 100755
--- a/needs-checking/combine-applied
+++ b/needs-checking/combine-applied
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
#
# Make superpatch from currently applied patches using combinediff.
diff --git a/needs-checking/combine-series b/needs-checking/combine-series
index 914acec..f94a706 100755
--- a/needs-checking/combine-series
+++ b/needs-checking/combine-series
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
#
# Make superpatch from current series using combinediff.
diff --git a/needs-checking/cvs-take-patch b/needs-checking/cvs-take-patch
index c6a6a2a..4703e84 100755
--- a/needs-checking/cvs-take-patch
+++ b/needs-checking/cvs-take-patch
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
doit()
{
diff --git a/needs-checking/export_patch b/needs-checking/export_patch
index 8e7116a..77c6185 100755
--- a/needs-checking/export_patch
+++ b/needs-checking/export_patch
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
. patchfns 2>/dev/null ||
. /usr/lib/patch-scripts/patchfns 2>/dev/null ||
diff --git a/needs-checking/extract_description b/needs-checking/extract_description
index 6fa0e68..873bb8d 100755
--- a/needs-checking/extract_description
+++ b/needs-checking/extract_description
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
insert_line()
{
diff --git a/needs-checking/join-patch b/needs-checking/join-patch
index 493d434..5f89a99 100755
--- a/needs-checking/join-patch
+++ b/needs-checking/join-patch
@@ -1,4 +1,19 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
+
+. patchfns 2>/dev/null ||
+. /usr/lib/patch-scripts/patchfns 2>/dev/null ||
+. $PATCHSCRIPTS_LIBDIR/patchfns 2>/dev/null ||
+{
+ echo "Impossible to find my library 'patchfns'."
+ echo "Check your install, or go to the right directory"
+ exit 1
+}
usage()
{
diff --git a/needs-checking/linus-patch b/needs-checking/linus-patch
index 24312b7..023aa9f 100755
--- a/needs-checking/linus-patch
+++ b/needs-checking/linus-patch
@@ -1,4 +1,11 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
+
#
# Grab a patch frmo kernel.org, install it.
#
diff --git a/needs-checking/new-kernel b/needs-checking/new-kernel
index 2b065a6..a81be96 100755
--- a/needs-checking/new-kernel
+++ b/needs-checking/new-kernel
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
usage()
{
@@ -78,5 +84,5 @@ cvs commit -m "'doing $NEXT_KERNEL'"
cvs update -ko -d -P
TAG=$(echo $NEXT_KERNEL | sed -e 's@\.@_@g')
-cvs tag $TAG
+cvs tag -b $TAG
rm -f $TEMP_PATCH
diff --git a/needs-checking/p_diff b/needs-checking/p_diff
index 1497b05..843e4cc 100755
--- a/needs-checking/p_diff
+++ b/needs-checking/p_diff
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
#
# Bring up a patched file in diff. We show the diffs
diff --git a/needs-checking/patchdesc b/needs-checking/patchdesc
index 18d3e94..2f0fdaf 100755
--- a/needs-checking/patchdesc
+++ b/needs-checking/patchdesc
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
. patchfns 2>/dev/null ||
. /usr/lib/patch-scripts/patchfns 2>/dev/null ||
diff --git a/needs-checking/pstatus b/needs-checking/pstatus
index 0c32102..4ceff7d 100755
--- a/needs-checking/pstatus
+++ b/needs-checking/pstatus
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# print out patch status. Usage: pstatus [ patchfile ... ]
#
diff --git a/needs-checking/ptkdiff b/needs-checking/ptkdiff
index a965bdd..eb4dddc 100755
--- a/needs-checking/ptkdiff
+++ b/needs-checking/ptkdiff
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
#
# Bring up a patched file in tkdiff. We show the diffs
diff --git a/needs-checking/removed-by-patch b/needs-checking/removed-by-patch
index ff12970..e70158d 100755
--- a/needs-checking/removed-by-patch
+++ b/needs-checking/removed-by-patch
@@ -1,4 +1,12 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
+
+
# Extract names of new files from a patch, print them out
PATCHFILE=$1
diff --git a/needs-checking/rename-patch b/needs-checking/rename-patch
index e6e1af0..c186170 100755
--- a/needs-checking/rename-patch
+++ b/needs-checking/rename-patch
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
. patchfns 2>/dev/null ||
. /usr/lib/patch-scripts/patchfns 2>/dev/null ||
@@ -9,8 +15,18 @@
exit 1
}
-OLD=$(stripit $1)
-NEW=$(stripit $2)
+if [ $# -eq 1 ]
+then
+ OLD=$(stripit $1)
+ NEW=_$OLD
+elif [ $# -eq 2 ]
+then
+ OLD=$(stripit $1)
+ NEW=$(stripit $2)
+else
+ echo "Usage: rename-patch old [new]"
+ exit 1
+fi
mv $(pc_file_name $OLD) $(pc_file_name $NEW)
mv $(patch_file_name $OLD) $(patch_file_name $NEW)
diff --git a/needs-checking/rolled-up-patch b/needs-checking/rolled-up-patch
index 4136609..dfad66b 100755
--- a/needs-checking/rolled-up-patch
+++ b/needs-checking/rolled-up-patch
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
. patchfns 2>/dev/null ||
. /usr/lib/patch-scripts/patchfns 2>/dev/null ||
diff --git a/needs-checking/tag-series b/needs-checking/tag-series
index 93a3cf9..d61dfe0 100755
--- a/needs-checking/tag-series
+++ b/needs-checking/tag-series
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# tag-series tagname series-file-name
#
diff --git a/newpatch.in b/newpatch.in
index 5d14d95..34242f9 100755
--- a/newpatch.in
+++ b/newpatch.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# Read in library functions
if ! [ -r @LIB@/patchfns ]
diff --git a/patchadd.in b/patchadd.in
index 95f32c6..de2d6b2 100755
--- a/patchadd.in
+++ b/patchadd.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# Read in library functions
if ! [ -r @LIB@/patchfns ]
diff --git a/poppatch.in b/poppatch.in
index 19b27f9..ff0b563 100755
--- a/poppatch.in
+++ b/poppatch.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# Read in library functions
if ! [ -r @LIB@/patchfns ]
diff --git a/pushpatch.in b/pushpatch.in
index 10b5ba8..d8fcab9 100755
--- a/pushpatch.in
+++ b/pushpatch.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# Read in library functions
if ! [ -r @LIB@/patchfns ]
diff --git a/refpatch.in b/refpatch.in
index b421f68..f1a95b3 100755
--- a/refpatch.in
+++ b/refpatch.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# Read in library functions
if ! [ -r @LIB@/patchfns ]
diff --git a/toppatch.in b/toppatch.in
index 0d2201d..e65dc9d 100755
--- a/toppatch.in
+++ b/toppatch.in
@@ -1,4 +1,10 @@
-#!/bin/sh
+#! /bin/bash
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# See the COPYING and AUTHORS files for more details.
# Read in library functions
if ! [ -r @LIB@/patchfns ]