On Fri, Jun 10, 2005 at 09:43:55PM +0200, Frank Lichtenheld wrote: > On Fri, Jun 10, 2005 at 06:36:10PM +0200, Frederik Schueler wrote: > > Hello, > > > > On Fri, Jun 10, 2005 at 02:47:48AM +0100, Rob Bradford wrote: > > > Would it be possible for you to send a unified diff? It would make > > > things a lot easier to read. > > > > Of course, find it attached with some last-minute changes =) > > Uhh, the whole entity stuff seems really hacked (lot of double > defines, etc). I think with a little work we can make this patch a lot > smaller. I will take a look today or tomorrow if noone is faster but > I would strongly suggest not to apply it in his current form...
On second thought the whole stuff in release-notes.ent seemed just plainly broken. Perhaps someone tried to apply the patch twice and diff got the line numbers confused? Attached a corrected and somewhat smaller patch. I only tested the build so far, have to check the content still. Gruesse, -- Frank Lichtenheld <[EMAIL PROTECTED]> www: http://www.djpig.de/
Index: release-notes.ent =================================================================== RCS file: /cvs/debian-doc/ddp/manuals.sgml/release-notes/release-notes.ent,v retrieving revision 1.15 diff -u -r1.15 release-notes.ent --- release-notes.ent 31 May 2005 23:10:49 -0000 1.15 +++ release-notes.ent 11 Jun 2005 08:30:00 -0000 @@ -11,12 +11,41 @@ --> +<!-- architecture list; conditional definitions are used to emit + the proper version of the documentation. You should be able to run + your SGML processor with '-i <arch>' in order to change the + architecture. Note the comments are magic; they help the + Makefile so it knows the available architectures, so don't mess + with em. --> +<!entity % alpha "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % amd64 "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % arm "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % hppa "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % i386 "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % ia64 "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % m68k "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % mips "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % mipsel "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % powerpc "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % s390 "IGNORE"><!-- ARCHMAGIC do not remove --> +<!entity % sparc "IGNORE"><!-- ARCHMAGIC do not remove --> + <!-- whether or not to show the FIXME stuff --> <!entity % FIXME "INCLUDE"> <!-- proper (long) name to use for Debian --> <!entity debian "Debian GNU/Linux"> +<![ %amd64 [ +<!entity url-release-notes "http://amd64.debian.net/docs/release-notes/";> +<!entity url-installer "http://amd64.debian.net/docs/debian-installer/";> +<!entity url-install-manual "http://amd64.debian.net/docs/installmanual";> +<!entity url-debian-mirrors "http://amd64.debian.net/README.mirrors.html";> +<!entity url-debian-mirror-eg "http://ftp.de.debian.org/debian-amd64/debian";> +<!entity debian-localmirror-path-eg "/var/ftp/debian-amd64"> +]]> + + <!-- URLs --> <!entity url-release-notes "http://www.debian.org/releases/stable/releasenotes";> <!entity url-installer "http://www.debian.org/releases/stable/debian-installer/";> @@ -29,6 +58,7 @@ <!entity url-debian-mirrors "http://www.debian.org/distrib/ftplist";> <!-- an example mirror w/o trailing slash --> <!entity url-debian-mirror-eg "http://mirrors.kernel.org/debian";> +<!entity debian-localmirror-path-eg "/var/ftp/debian"> <!-- Next two entries are no longer used --> <!entity url-opn "http://www.openprojects.net/";> <!entity opn-irc-server "irc.openprojects.net"> @@ -51,26 +81,9 @@ <!entity releasename "sarge"> <!entity oldreleasename "woody"> -<!-- architecture list; conditional definitions are used to emit - the proper version of the documentation. You should be able to run - your SGML processor with '-i <arch>' in order to change the - architecture. Note the comments are magic; they help the - Makefile so it knows the available architectures, so don't mess - with em. --> -<!entity % alpha "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % arm "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % hppa "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % i386 "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % ia64 "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % m68k "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % mips "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % mipsel "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % powerpc "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % s390 "IGNORE"><!-- ARCHMAGIC do not remove --> -<!entity % sparc "IGNORE"><!-- ARCHMAGIC do not remove --> - <!-- proper nouns for architectures --> <![ %alpha [ <!entity arch-title "Alpha" > ]]> +<![ %amd64 [ <!entity arch-title "AMD64" > ]]> <![ %arm [ <!entity arch-title "ARM" > ]]> <![ %hppa [ <!entity arch-title "PA-RISC" > ]]> <![ %i386 [ <!entity arch-title "Intel x86" > ]]> @@ -83,8 +96,14 @@ <![ %s390 [ <!entity arch-title "S/390" > ]]> <!entity arch-title "lame arch with no title"> +<!-- common stuff between i386 and amd64 --> +<![ %amd64 [ <!entity % amd64-i386-common "INCLUDE"> ]]> +<![ %i386 [ <!entity % amd64-i386-common "INCLUDE"> ]]> + <!entity % amd64-i386-common "IGNORE"> + <!-- 2.6 kernel available --> <![ %alpha [ <!entity % available-2.6 "INCLUDE"> ]]> +<![ %amd64 [ <!entity % available-2.6 "INCLUDE"> ]]> <![ %i386 [ <!entity % available-2.6 "INCLUDE"> ]]> <![ %ia64 [ <!entity % available-2.6 "INCLUDE"> ]]> <![ %powerpc [ <!entity % available-2.6 "INCLUDE"> ]]> @@ -93,12 +112,15 @@ <!entity % available-2.6 "IGNORE"> <!-- 2.6 kernel available for Debian Installer --> +<![ %amd64 [ <!entity % d-i-avail-2.6 "INCLUDE"> ]]> <![ %i386 [ <!entity % d-i-avail-2.6 "INCLUDE"> ]]> <![ %ia64 [ <!entity % d-i-avail-2.6 "INCLUDE"> ]]> <![ %sparc [ <!entity % d-i-avail-2.6 "INCLUDE"> ]]> <!entity % d-i-avail-2.6 "IGNORE"> + <!-- 2.6 kernel default for Debian Installer --> +<![ %amd64 [ <!entity % d-i-default-2.6 "INCLUDE"> ]]> <![ %hppa [ <!entity % d-i-default-2.6 "INCLUDE"> ]]> <![ %powerpc [ <!entity % d-i-default-2.6 "INCLUDE"> ]]> <!entity % d-i-default-2.6 "IGNORE"> @@ -106,6 +128,8 @@ <!-- negatives about architectures --> <![ %alpha [ <!entity % not-alpha "IGNORE"> ]]> <!entity % not-alpha "INCLUDE"> +<![ %amd64 [ <!entity % not-amd64 "IGNORE"> ]]> + <!entity % not-amd64 "INCLUDE"> <![ %arm [ <!entity % not-arm "IGNORE"> ]]> <!entity % not-arm "INCLUDE"> <![ %hppa [ <!entity % not-hppa "IGNORE"> ]]> @@ -155,6 +179,7 @@ <!-- default kernel version, taken from d-i... --> <![ %alpha [ <!entity kernelversion "2.4.27"> ]]> +<![ %amd64 [ <!entity kernelversion "2.6.8"> ]]> <![ %arm [ <!entity kernelversion "2.4.27"> ]]> <![ %hppa [ <!entity kernelversion "2.6.8"> ]]> <![ %i386 [ <!entity kernelversion "2.4.27"> ]]> @@ -169,6 +194,7 @@ <!-- 2.6 kernel versions --> <![ %alpha [ <!entity kernelversion-2.6 "2.6.8"> ]]> +<![ %amd64 [ <!entity kernelversion-2.6 "2.6.8"> ]]> <![ %i386 [ <!entity kernelversion-2.6 "2.6.8"> ]]> <![ %ia64 [ <!entity kernelversion-2.6 "2.6.8"> ]]> <![ %powerpc [ <!entity kernelversion-2.6 "2.6.8"> ]]> Index: en/release-notes.en.sgml =================================================================== RCS file: /cvs/debian-doc/ddp/manuals.sgml/release-notes/en/release-notes.en.sgml,v retrieving revision 1.55 diff -u -r1.55 release-notes.en.sgml --- en/release-notes.en.sgml 2 Jun 2005 21:54:16 -0000 1.55 +++ en/release-notes.en.sgml 11 Jun 2005 08:30:02 -0000 @@ -56,6 +56,12 @@ </list> </p> + <p>The AMD64 architecture is not officially supported, although a + complete port based on unpatched sources is available. Despite being + unofficial, this port has complete security support by the &debian; + security team, and is supported by the volatile and backports + services.</p> + <p>You can read more about port status, and port-specific information for your architecture at the <url id="&url-ports;" name="Debian port web pages">.</p> @@ -74,6 +80,7 @@ ]]> <![ %not-m68k [ +<![ %not-amd64 [ <p>&debian; &release; for the &arch-title; architecture ships with kernel version &kernelversion;.</p> @@ -83,6 +90,15 @@ kernel packages include the 2.6.8.1 kernel release and selected other patches.</p> ]]> +]]> <!-- %not-amd64 --> + +<![ %amd64 [ + <p>On the &arch-title; only a 2.6 kernel is available; + this has kernel version &kernelversion-2.6;. Note that Debian's 2.6.8 + kernel packages include the 2.6.8.1 kernel release and selected other + patches.</p> +]]> + ]]> <!-- %m68k --> <![ %m68k [ <p>&debian; &release; for the &arch-title; architecture ships with @@ -219,12 +235,14 @@ debian-installer.</p> <![ %not-m68k [ +<![ %not-amd64 [ <![ %d-i-avail-2.6 [ <p>The installation system uses a 2.4 series kernel by default. Installation using a 2.6 based kernel is also possible for &arch-title;. For more details on how to use this please consult the Installation Guide.</p> ]]> +]]> <!-- %not-amd64 --> <![ %d-i-default-2.6 [ <p>The installation system uses a 2.6 series kernel by default for &arch-title;.</p> @@ -252,6 +270,13 @@ </p> ]]> +<![ %amd64 [ + <p>The AMD64 architecture supports only 2.6 kernels, because the + support in 2.4 kernels is limited and rudimentary. Additionally, the + glibc needs a tls and nptl aware kernel, features not supported by 2.4 + kernels at all.</p> +]]> + <![ %sparc [ <sect id="sparc_kbd"><heading>Issues with keyboards on &arch-title;</heading> @@ -283,6 +308,13 @@ </sect> ]]> +<![ %amd64 [ + <p>The &releasename; release for the AMD64 architecture is not + available in the official &debian; archive. For this reason, the + mirror list is different than for the official released architectures + and can be found at <url id="&url-debian-mirrors;"></p> +]]> + <sect id="popcon"><heading>Popularity contest</heading> <p>For technical reasons the <package/popularity-contest/ package is no longer installed by @@ -302,10 +334,8 @@ </sect> </chapt> - - +<![ %not-amd64 [ <chapt id="upgrading"><heading>Upgrades from previous releases</heading> - <!-- For doc-writers' convenience: Debian Supported release: architectures: @@ -608,6 +638,7 @@ Note: D-I sets the default configuration to a mirror based on the selected country and not the 'main' servers. --> +<![ %not-amd64 [ <p>Debian HTTP or FTP mirror addresses can be found at <url id="&url-debian-mirrors;"> (look at the "Full list of mirrors" section). HTTP mirrors are generally speedier than FTP @@ -629,6 +660,7 @@ <example> deb &url-debian-mirror-eg; &releasename; main contrib </example></p> +]]> <p>Note that the `<tt>dists</tt>' is added implicitly, and the arguments after the release name are used to expand the path into @@ -655,22 +687,22 @@ local disk (possibly mounted over NFS).</p> <p>For example, your packages mirror may be under - <file>/var/ftp/debian/</file>, and have main directories like + <file>&debian-localmirror-path-eg;/</file>, and have main directories like this: <example> -/var/ftp/debian/dists/&releasename;/main/binary-&architecture;/... -/var/ftp/debian/dists/&releasename;/contrib/binary-&architecture;/... +&debian-localmirror-path-eg;/dists/&releasename;/main/binary-&architecture;/... +&debian-localmirror-path-eg;/dists/&releasename;/contrib/binary-&architecture;/... </example></p> - <p>To use this with <prgn/apt/, add this line to your + <p>To use this with <prgn/apt/, add this line to your <file/sources.list/ file: <example> -deb file:/var/ftp/debian &releasename; main contrib +deb file:&debian-localmirror-path-eg; &releasename; main contrib </example></p> - <p>Note that the `<tt>dists</tt>' is added implicitly, and the + <p>Note that the `<tt>dists</tt>' is added implicitly, and the arguments after the release name are used to expand the path into multiple directories.</p> @@ -1129,6 +1161,7 @@ </sect1> </sect> </chapt> +]]> <!-- %no-amd64 --> <!-- FJP: Add more info here on dealing with obsolete packages? Also how to purge packages that were deleted but still have conffiles @@ -1166,6 +1199,16 @@ </sect> --> +<![ %amd64 [ +<!-- <sect id="amd64-note"><heading>Note for AMD64 users</heading> --> + <p>Since there is no &oldreleasename; of &debian; for the AMD64 + architecture, the following sections are intended for users + running a 2.4 based i386 installation and are going to reinstall + their systems to fully exploit the capabilities of the AMD64 + architecture.</p> +<!-- </sect> --> +]]> + <sect id="pythonchanges"><heading>Changes to Python packages</heading> <p>None of the python2.X packages that are included with &releasename; include @@ -1210,7 +1253,7 @@ module names may have changed. If this happens you will have to update this file with the new module names.</p> -<![ %i386 [ +<![ %amd64-i386-common [ <p>For some SATA disk controllers, the device assigned to a drive and its partitions may change from <file>/dev/hdX</file> to <file>/dev/sdX</file>. If this happens, you will have to modify your @@ -1227,6 +1270,7 @@ prevents you booting the old kernel.</p> <![ %not-s390 [ +<![ %not-amd64 [ <sect1 id="2.6-keyboard"> <heading>Keyboard configuration</heading> @@ -1252,13 +1296,14 @@ <p>This issue is unlikely to affect the &arch-title; architecture as all PS/2 and most USB keyboards will already be configured as a "normal" PC keyboard.</p> -]]> +]]> <!-- %i386 --> <![ %not-i386 [ <p>Note that if you are using a USB keyboard, this may be configured as either a "normal" PC keyboard or as a USB-MAC keyboard. In the first case you will not be affected by this issue.</p> ]]> </sect1> +]]> <!-- %not-amd64 --> <sect1 id="2.6-mouse"> <heading>Mouse configuration</heading> @@ -1317,7 +1362,7 @@ </sect> ]]> <!-- %available-2.6 --> -<![ %i386 [ +<![ %amd64-i386-common [ <sect id="x-mouse"> <heading>X Window System fails to load</heading> @@ -1330,7 +1375,9 @@ in <file>/etc/modules</file>.</p> </sect> +]]> +<![ %i386 [ <sect id="x-transmeta"> <heading>X Window System on Transmeta Crusoe systems</heading> @@ -1661,7 +1708,7 @@ </appendix> ]]> - +<![ %not-amd64 [ <appendix id="old-stuff"> <heading>Managing your &oldreleasename; system</heading> @@ -1737,7 +1784,7 @@ </sect> </appendix> - +]]> </book> </debiandoc>
