tags 423126 patch
tags 490256 patch
thanks
Here are NMU patches I've prepared and will upload on the weekend
unless there are some objections.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -u emacs21-non-dfsg-21.4a+1/debian/changelog
emacs21-non-dfsg-21.4a+1/debian/changelog
--- emacs21-non-dfsg-21.4a+1/debian/changelog
+++ emacs21-non-dfsg-21.4a+1/debian/changelog
@@ -1,3 +1,15 @@
+emacs21-non-dfsg (21.4a+1-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Refer to /usr/share/common-licenses/GFDL for the full text
+ of the GFDL. Refering to an info page in the package might
+ meet the spirit of policy, but not the letter.
+ (Closes: #423126)
+ * Replace tail +2 with tail -n +2 since the former doesn't work
+ anymore
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Thu, 17 Jul 2008 23:53:10 +0200
+
emacs21-non-dfsg (21.4a+1-1) unstable; urgency=low
* New package: in accordance with the recent General Resolution
diff -u emacs21-non-dfsg-21.4a+1/debian/rules
emacs21-non-dfsg-21.4a+1/debian/rules
--- emacs21-non-dfsg-21.4a+1/debian/rules
+++ emacs21-non-dfsg-21.4a+1/debian/rules
@@ -328,7 +328,7 @@
cp debian/emacs-common-non-dfsg.README.00
debian/emacs-common-non-dfsg.README.tmp
for p in $$(quilt series); do quilt header $$p; done \
>> debian/emacs-common-non-dfsg.README.tmp
- tail +2 \
+ tail -n +2 \
< debian/emacs-common-non-dfsg.README.01 >>
debian/emacs-common-non-dfsg.README.tmp
mv debian/emacs-common-non-dfsg.README.tmp $@
diff -u emacs21-non-dfsg-21.4a+1/debian/copyright
emacs21-non-dfsg-21.4a+1/debian/copyright
--- emacs21-non-dfsg-21.4a+1/debian/copyright
+++ emacs21-non-dfsg-21.4a+1/debian/copyright
@@ -34,9 +34,25 @@
Most of Emacs is covered under the terms of the GPL. See the file
/usr/share/common-licenses/GPL for more information.
- In general, the info pages are covered under the GNU Free
- Documentation License (GFDL). See the "GNU Free Documentation
- License" node in "info emacs-21/emacs".
+ In general, the info (i.e. man/*.texi) pages are covered under the
+ GNU Free Documentation License (GFDL):
+ Copyright (C)
1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+ Free Software Foundation, Inc.
+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.1 or
+ any later version published by the Free Software Foundation; with the
+ Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
+ ``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
+ Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
+ license is included in the section entitled ``GNU Free Documentation
+ License.''
+
+ (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
+ this GNU Manual, like GNU software. Copies published by the Free
+ Software Foundation raise funds for GNU development.''
+
+ See the file /usr/share/common-licenses/GFDL for more information.
etc/INTERVIEW contains the following statement:
Copyright (C) 1986 Richard Stallman. Permission is granted to
diff -u emacs21-non-dfsg-21.4a+1/debian/copyright.in
emacs21-non-dfsg-21.4a+1/debian/copyright.in
--- emacs21-non-dfsg-21.4a+1/debian/copyright.in
+++ emacs21-non-dfsg-21.4a+1/debian/copyright.in
@@ -34,9 +34,25 @@
Most of Emacs is covered under the terms of the GPL. See the file
/usr/share/common-licenses/GPL for more information.
- In general, the info pages are covered under the GNU Free
- Documentation License (GFDL). See the "GNU Free Documentation
- License" node in "info [EMAIL PROTECTED]@/emacs".
+ In general, the info (i.e. man/*.texi) pages are covered under the
+ GNU Free Documentation License (GFDL):
+ Copyright (C)
1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+ Free Software Foundation, Inc.
+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.1 or
+ any later version published by the Free Software Foundation; with the
+ Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
+ ``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
+ Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
+ license is included in the section entitled ``GNU Free Documentation
+ License.''
+
+ (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
+ this GNU Manual, like GNU software. Copies published by the Free
+ Software Foundation raise funds for GNU development.''
+
+ See the file /usr/share/common-licenses/GFDL for more information.
etc/INTERVIEW contains the following statement:
Copyright (C) 1986 Richard Stallman. Permission is granted to
diff -u emacs22-non-dfsg-22.2+2/debian/copyright.in
emacs22-non-dfsg-22.2+2/debian/copyright.in
--- emacs22-non-dfsg-22.2+2/debian/copyright.in
+++ emacs22-non-dfsg-22.2+2/debian/copyright.in
@@ -33,9 +33,26 @@
Most of Emacs is covered under the terms of the GPL. See the file
/usr/share/common-licenses/GPL for more information.
- In general, the info pages are covered under the GNU Free
- Documentation License (GFDL). See the "GNU Free Documentation
- License" node in "info [EMAIL PROTECTED]@/emacs".
+ In general, the info (i.e. man/*.texi) pages are covered under the
+ GNU Free Documentation License (GFDL):
+ Copyright © 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ Free Software Foundation, Inc.
+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2 or
+ any later version published by the Free Software Foundation; with the
+ Invariant Sections being ``The GNU Manifesto,'' ``Distribution'' and
+ ``GNU GENERAL PUBLIC LICENSE,'' with the Front-Cover texts being ``A GNU
+ Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
+ license is included in the section entitled ``GNU Free Documentation
+ License.''
+
+ (a) The FSF's Back-Cover Text is: ``You are free to copy and modify
+ this GNU Manual. Buying copies from GNU Press supports the FSF in
+ developing GNU and promoting software freedom.''
+
+ See the file /usr/share/common-licenses/GFDL for more information.
etc/INTERVIEW contains the following statement:
Copyright (C) 1986 Richard Stallman. Permission is granted to
diff -u emacs22-non-dfsg-22.2+2/debian/changelog
emacs22-non-dfsg-22.2+2/debian/changelog
--- emacs22-non-dfsg-22.2+2/debian/changelog
+++ emacs22-non-dfsg-22.2+2/debian/changelog
@@ -1,3 +1,13 @@
+emacs22-non-dfsg (22.2+2-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Refer to /usr/share/common-licenses/GFDL for the full text
+ of the GFDL. Refering to an info page in the package might
+ meet the spirit of policy, but not the letter.
+ (Closes: #490256)
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Fri, 18 Jul 2008 00:15:19 +0200
+
emacs22-non-dfsg (22.2+2-1) unstable; urgency=low
* Move mh-e.texi to emacs22-common because the license does appear to be
diff -u emacs22-non-dfsg-22.2+2/debian/copyright
emacs22-non-dfsg-22.2+2/debian/copyright
--- emacs22-non-dfsg-22.2+2/debian/copyright
+++ emacs22-non-dfsg-22.2+2/debian/copyright
@@ -33,9 +33,26 @@
Most of Emacs is covered under the terms of the GPL. See the file
/usr/share/common-licenses/GPL for more information.
- In general, the info pages are covered under the GNU Free
- Documentation License (GFDL). See the "GNU Free Documentation
- License" node in "info emacs-22/emacs".
+ In general, the info (i.e. man/*.texi) pages are covered under the
+ GNU Free Documentation License (GFDL):
+ Copyright © 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ Free Software Foundation, Inc.
+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2 or
+ any later version published by the Free Software Foundation; with the
+ Invariant Sections being ``The GNU Manifesto,'' ``Distribution'' and
+ ``GNU GENERAL PUBLIC LICENSE,'' with the Front-Cover texts being ``A GNU
+ Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
+ license is included in the section entitled ``GNU Free Documentation
+ License.''
+
+ (a) The FSF's Back-Cover Text is: ``You are free to copy and modify
+ this GNU Manual. Buying copies from GNU Press supports the FSF in
+ developing GNU and promoting software freedom.''
+
+ See the file /usr/share/common-licenses/GFDL for more information.
etc/INTERVIEW contains the following statement:
Copyright (C) 1986 Richard Stallman. Permission is granted to
