Bug#418195: netinst/bc: README contains para irrelevant

2007-04-08 Thread Richard Atterer
On Sun, Apr 08, 2007 at 02:09:53AM +0200, Frans Pop wrote:
 On Sunday 08 April 2007 01:25, Steve McIntyre wrote:
  I think we've grown too much to claim that anything after disc#1 is 
  just special-interest. Is there better wording for this?
 
 Yes, I agree.
 Maybe: It is unlikely that you will need all of the TOTALNUM disks in the 
 set. The higher the number in the set, the less likely it is that you 
 will use any of the packages that are included; higher-number images 
 contain mostly special-interest programs.

FWIW, the CD FAQ has been saying for a while that the first two CDs are 
enough:

  You will probably only need the first DVD (or the first two CDs) unless 
  you have very special requirements.
  http://www.debian.org/CD/faq/#which-cd

But maybe these days even two CDs is not enough for a full desktop 
install??

Cheers,

  Richard

-- 
  __   _
  |_) /|  Richard Atterer |  GnuPG key: 888354F7
  | \/¯|  http://atterer.net  |  08A9 7B7D 3D13 3EF2 3D25  D157 79E6 F6DC 8883 
54F7
  ¯ '` ¯



Bug#418195: netinst/bc: README contains para irrelevant

2007-04-08 Thread Frans Pop
On Sunday 08 April 2007 14:52, Richard Atterer wrote:
 But maybe these days even two CDs is not enough for a full desktop
 install??

I'm not sure. I've never looked very much at CD2. I'd expect that all the 
actual GNOME desktop stuff is on CD2. What would be nice to determine is 
if all packages belonging to language tasks are on CD2.
If not, then we should probably increase this to 3 CDs.

And maybe check if a significant portion of KDE and Xfce tasks are on CD2.


pgpk8ikD7TplM.pgp
Description: PGP signature


Bug#418195: netinst/bc: README contains para irrelevant

2007-04-07 Thread Frans Pop
Package: debian-cd
Version: 3.0.2
Severity: minor

The README on smaller images contains a para that does not really apply to 
them:
snip
The programs on the Binary discs are ordered by popularity. The Binary-1 
disc contains the most popular programs and the installation tools; it is 
possible to install and run Debian with only the Binary-1 disc. The other 
discs, up to Binary-1, contain mostly special-interest programs.
/snip

IMO this para should be suppressed for any images that don't have COMPLETE 
(including the multi-arch CDs probably).


pgp0l3SYWHj6w.pgp
Description: PGP signature


Bug#418195: netinst/bc: README contains para irrelevant

2007-04-07 Thread Frans Pop
tags 418195 + patch
thanks

On Saturday 07 April 2007 23:17, Frans Pop wrote:
 The README on smaller images contains a para that does not really apply
 to them:

Please consider the attached patch that should fix this. It improves the 
match of the image with text a bit more in general as it also 
The suggested text in case an image is not COMPLETE should be general 
enough to cover both bc and netinst.

I've tested the patch with a bc image, but not with full CD images.

It also contains a few other tweaks for the README:
- make link to /.disk/info relative
- suggest aptitude also for pkg management from the commandline

Index: tools/add-bin-doc
===
--- tools/add-bin-doc	(revision 1397)
+++ tools/add-bin-doc	(working copy)
@@ -10,6 +10,10 @@
 
 DEBMAINVER=`echo $DEBVERSION | sed -e 's/[ _r].*//'`
 
+if [ $COMPLETEx = x ] ; then
+	COMPLETE=0
+fi
+
 if [ $OMIT_RELEASE_NOTESx = x ] ; then
 	OMIT_RELEASE_NOTES=0
 fi
@@ -31,6 +35,7 @@
 	$dir/README.pgp $dir/README.non-US ; \
 
 cpp -traditional -undef -P -C -Wall -nostdinc -I$dir \
+-D COMPLETE=$COMPLETE \
 -D OMIT_MANUAL=$OMIT_MANUAL \
 -D OFFICIAL_VAL=$OFFICIAL_VAL \
 -D OMIT_RELEASE_NOTES=$OMIT_RELEASE_NOTES \
Index: debian/changelog
===
--- debian/changelog	(revision 1398)
+++ debian/changelog	(working copy)
@@ -3,13 +3,20 @@
   [ Steve McIntyre ]
   * In start_new_disc, cope with $DEBVERSION containing spaces.
   * Only put the release notes and installation guide on disc#1.
-  * In list2cds, don't add udebs in the final COMPLETE run - 
+  * In list2cds, don't add udebs in the final COMPLETE run -
 they're no use there.
   * Add some munging on the Release files if we're not building
 for testing. Used in the etch release, and I'll back it out shortly.
 
- -- Steve McIntyre [EMAIL PROTECTED]  Wed, 28 Mar 2007 22:57:41 +0100
+  [ Frans Pop ]
+  * Tweak README to better describe small images and images that are not part
+of a larger set.
+  * Make link in README to /.disk/info relative so its still valid if the disk
+is mounted in a regular system.
+  * In README, recommend aptitude also for command line usage.
 
+ -- Frans Pop [EMAIL PROTECTED]  Sun,  8 Apr 2007 00:46:05 +0200
+
 debian-cd (3.0.2) unstable; urgency=high
 
   [ Steve McIntyre ]
Index: data/etch/README.html.in
===
--- data/etch/README.html.in	(revision 1397)
+++ data/etch/README.html.in	(working copy)
@@ -293,7 +293,13 @@
 /tt
 P
 #ifndef UNOFFEXTRAS
+#if COMPLETE
 which means that this disc is number DISKNUM of a set of TOTALNUM discs.
+#else
+This image only contains those programs needed to install a system. During the
+installation you will be prompted for a network mirror from where additional
+programs will be retrieved.
+#endif
 #if TYPEbinary
 It contains programs (binaries) for `ARCH' computers.
 #if ARCHia64  !ARCHamd64
@@ -302,11 +308,15 @@
 please see the Debian amd64 architecture.
 #endif
 P
+#if COMPLETE
 The programs on the Binary discs are ordered by popularity. The Binary-1 disc
 contains the most popular programs and the installation tools; it is possible
-to install and run Debian with only the Binary-1 disc. The other discs, up to
-Binary-TOTALNUM, contain mostly special-interest programs.
-p
+to install and run Debian with only the Binary-1 disc.
+#if TOTALNUM  1
+The other discs, up to Binary-TOTALNUM, contain mostly special-interest programs.
+#endif
+P
+#endif
 #if OMIT_RELEASE_NOTES
 The Release Notes for etch are available on the A
 href=http://www.debian.org/releases/etch/releasenotes;Debian web
@@ -443,7 +453,7 @@
 HREF=http://bugs.debian.org/;bugs.debian.org/A.
 LIIf you're reporting bugs against this disc or the installation
 system, please also mention the version of this disc; this can be
-found in the file a href=/.disk/info/.disk/info/a.
+found in the file a href=./.disk/info/.disk/info/a.
 #endif
 #if OFFICIAL_VAL == 2
 LIThis is an official release of the Debian system. Please report any
@@ -451,7 +461,7 @@
 HREF=http://bugs.debian.org/;bugs.debian.org/A.
 LIIf you're reporting bugs against this disc or the installation
 system, please also mention the version of this disc; this can be
-found in the file a href=/.disk/info/.disk/info/a.
+found in the file a href=./.disk/info/.disk/info/a.
 #endif
 
 brnbsp;
@@ -483,18 +493,18 @@
  P
 
  You can install packages from the commandline using
- ttapt-get/tt. For example, if you want to install the packages
+ ttaptitude/tt. For example, if you want to install the packages
  `commprog' and `maxgame', you can give the command
  P
  ttnbsp;
-   apt-get install commprog maxgame
+   aptitude install commprog maxgame
  /tt
  P
  Note that you don't have to enter the complete path, or the
  `tt.deb/tt' extension. `Apt' will figure this out itself. 
  P
- Or use aptitude for a full screen 

Bug#418195: netinst/bc: README contains para irrelevant

2007-04-07 Thread Steve McIntyre
On Sun, Apr 08, 2007 at 12:57:23AM +0200, Frans Pop wrote:

...

Index: data/etch/README.html.in
===
--- data/etch/README.html.in   (revision 1397)
+++ data/etch/README.html.in   (working copy)
@@ -293,7 +293,13 @@
 /tt
 P
 #ifndef UNOFFEXTRAS
+#if COMPLETE
 which means that this disc is number DISKNUM of a set of TOTALNUM discs.
+#else
+This image only contains those programs needed to install a system. During the
+installation you will be prompted for a network mirror from where additional
+programs will be retrieved.

The new language is a little off, I think. Maybe:

During the installation you will be prompted for the location of a
network mirror that contains any additional packages you wish to
install.

+#endif
 #if TYPEbinary
 It contains programs (binaries) for `ARCH' computers.
 #if ARCHia64  !ARCHamd64
@@ -302,11 +308,15 @@
 please see the Debian amd64 architecture.
 #endif
 P
+#if COMPLETE
 The programs on the Binary discs are ordered by popularity. The Binary-1 disc
 contains the most popular programs and the installation tools; it is possible
-to install and run Debian with only the Binary-1 disc. The other discs, up to
-Binary-TOTALNUM, contain mostly special-interest programs.
-p
+to install and run Debian with only the Binary-1 disc.
+#if TOTALNUM  1
+The other discs, up to Binary-TOTALNUM, contain mostly special-interest 
programs.
+#endif

I think we've grown too much to claim that anything after disc#1 is
just special-interest. Is there better wording for this?

+P
+#endif
 #if OMIT_RELEASE_NOTES
 The Release Notes for etch are available on the A
 href=http://www.debian.org/releases/etch/releasenotes;Debian web
@@ -443,7 +453,7 @@
 HREF=http://bugs.debian.org/;bugs.debian.org/A.
 LIIf you're reporting bugs against this disc or the installation
 system, please also mention the version of this disc; this can be
-found in the file a href=/.disk/info/.disk/info/a.
+found in the file a href=./.disk/info/.disk/info/a.
 #endif
 #if OFFICIAL_VAL == 2
 LIThis is an official release of the Debian system. Please report any
@@ -451,7 +461,7 @@
 HREF=http://bugs.debian.org/;bugs.debian.org/A.
 LIIf you're reporting bugs against this disc or the installation
 system, please also mention the version of this disc; this can be
-found in the file a href=/.disk/info/.disk/info/a.
+found in the file a href=./.disk/info/.disk/info/a.
 #endif
 
 brnbsp;
@@ -483,18 +493,18 @@
  P
 
  You can install packages from the commandline using
- ttapt-get/tt. For example, if you want to install the packages
+ ttaptitude/tt. For example, if you want to install the packages
  `commprog' and `maxgame', you can give the command
  P
  ttnbsp;
-   apt-get install commprog maxgame
+   aptitude install commprog maxgame
  /tt
  P
  Note that you don't have to enter the complete path, or the
  `tt.deb/tt' extension. `Apt' will figure this out itself. 
  P
- Or use aptitude for a full screen interactive selection of available
- Debian packages.
+ Or enter just ttaptitude/tt to interactively select available Debian
+ packages using a full screen user interface.
  
 #endif

Cool otherwise. Oh, should we maybe mention synaptic/adept/whatever as
well here?

-- 
Steve McIntyre, Cambridge, UK.[EMAIL PROTECTED]
C++ ate my sanity -- Jon Rabone



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#418195: netinst/bc: README contains para irrelevant

2007-04-07 Thread Frans Pop
On Sunday 08 April 2007 01:25, Steve McIntyre wrote:
 On Sun, Apr 08, 2007 at 12:57:23AM +0200, Frans Pop wrote:
 +This image only contains those programs needed to install a system.
  During the installation you will be prompted for a network mirror
  from where additional programs will be retrieved.

 The new language is a little off, I think. Maybe:

 During the installation you will be prompted for the location of a
 network mirror that contains any additional packages you wish to
 install.

I see you s/programs/packages/ here. I was wondering if it would not be 
better to use packages instead of programs more often in general in this 
README... Only disadvantage is that programs also at least somewhat 
covers the installer.

I have some problems with your proposal too though, especially the second 
half. Maybe combine the two?
During the installation you will be prompted for the location of a
network mirror from where additional packages will be retrieved.

 I think we've grown too much to claim that anything after disc#1 is
 just special-interest. Is there better wording for this?

Yes, I agree.
Maybe: It is unlikely that you will need all of the TOTALNUM disks in the 
set. The higher the number in the set, the less likely it is that you 
will use any of the packages that are included; higher-number images 
contain mostly special-interest programs.

 Cool otherwise. Oh, should we maybe mention synaptic/adept/whatever as
 well here?

Yes. If you choose to install a graphical desktop environment, other 
package management programs (such as synaptic) can be used as well.


pgpHkcwaywNQZ.pgp
Description: PGP signature