finished the Create-CopyPatch changes to emit a different copyright for

.diff and .patch* files (as discussed with Clifford)


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1933 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -3,6 +3,8 @@
 
  - Juergen Sawinski and Rene Rebe: udated linux24* (2.4.23)
  - updated macosd (0.0.6)
+ - finished the Create-CopyPatch changes to emit a different copyright for
+   .diff and .patch* files (as discussed with Clifford)
 
 *) 2003-12-07 (2.0.0-rc3 - 2.0.0-rc4)
 

package/x11/xfree86/apm.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/apm.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/devfs-vc.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/devfs-vc.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/fontconfig-update.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/fontconfig-update.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/ftconfig-h-hotfix.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/ftconfig-h-hotfix.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/imake_rules.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/imake_rules.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/imake_tmpl.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/imake_tmpl.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/imakemdep_ppc.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/imakemdep_ppc.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/imst.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/imst.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/macintosh-xkb-us-de-ibook.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/macintosh-xkb-us-de-ibook.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/no-fc-cache-run.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/no-fc-cache-run.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/ppc-imps2-wheel.patch

@@ -1,3 +1,22 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/x11/xfree86/ppc-imps2-wheel.patch
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
 
 Hey cool - patching this paricular line seems to become a full-time job ...
 or a good candidate for a cron job ;-)

package/x11/xfree86/startwm.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/startwm.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/twm-defaults.patch

@@ -9,15 +9,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/twm-defaults.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/xconsole-pty.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/xconsole-pty.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/xfree86/xterm-ls.patch

@@ -8,15 +8,12 @@
 # ROCK Linux: rock-src/package/x11/xfree86/xterm-ls.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
-# 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
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

scripts/Create-CopyPatch

@@ -102,7 +102,16 @@ do
 	if [ "$tag" ] ; then
 	    {
 		grep -B 100000 -- '--- ROCK-COPYRIGHT-NOTE-BEGIN ---' $oldfile
-		cat $copynote | sed -e "s,@@FILENAME@@,$filename,; s,^,$tag,"
+		if [ "$filename" != "${filename%/*.diff}" -o \
+		     "$filename" != "${filename%/*.patch}" -o \
+		     "$filename" != "${filename%/*.patch.*}" ] ; then
+			cat $copynotepatch | \
+			sed -e "s,@@FILENAME@@,$filename,; s,^,$tag,"
+		else
+			cat $copynote | \
+			sed -e "s,@@FILENAME@@,$filename,; s,^,$tag,"
+		fi
+		
 		grep -A 100000 -- '--- ROCK-COPYRIGHT-NOTE-END ---' $oldfile
 	    } > $newfile
 	    if ! cmp -s $oldfile $newfile ; then