Bug#311870: marked as done (base-config: reduce amount of Debian branding in templates)
Your message dated Thu, 18 Aug 2005 08:32:04 -0700
with message-id <E1E5mNA-0002s3-00@spohr.debian.org>
and subject line Bug#311870: fixed in base-config 2.70
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 3 Jun 2005 23:41:37 +0000
>From cjwatson@flatline.org.uk Fri Jun 03 16:41:37 2005
Return-path: <cjwatson@flatline.org.uk>
Received: from chiark.greenend.org.uk [193.201.200.170] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DeLnF-0007iN-00; Fri, 03 Jun 2005 16:41:37 -0700
Received: from [192.168.124.112] (helo=riva.lab.dotat.at)
by chiark.greenend.org.uk (Debian Exim 3.35 #1) with esmtp
(return-path cjwatson@flatline.org.uk)
id 1DeLnD-0005sl-00
for submit@bugs.debian.org; Sat, 04 Jun 2005 00:41:35 +0100
Received: from cjwatson by riva.lab.dotat.at with local (Exim 3.36 #1 (Debian))
for submit@bugs.debian.org
id 1DeLnD-0005H6-00; Sat, 04 Jun 2005 00:41:35 +0100
Date: Sat, 4 Jun 2005 00:41:35 +0100
From: Colin Watson <cjwatson@debian.org>
To: submit@bugs.debian.org
Subject: base-config: reduce amount of Debian branding in templates
Message-ID: <20050603234135.GA20182@riva.ucam.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="9jxsPFA5p3P2qPhR"
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
--9jxsPFA5p3P2qPhR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Package: base-config
Version: 2.64
Severity: wishlist
Tags: patch
The attached patch reduces the number of explicit mentions of Debian in
base-config's templates, in an attempt to reduce somewhat the size of
the patch that derived distributions need to carry around. It's
moderately intrusive and the wording certainly needs to be reviewed, so
I didn't want to commit it directly!
I haven't yet managed to work out what to do with mirror/suite,
apt-setup/non-free, apt-setup/contrib, or base-config/login. The first
three may be intractable, and removing the distribution name from the
last one kind of seems like a shame. Maybe there's a case for a careful
SUBST here (after checking how translations would work).
Thanks,
--
Colin Watson [cjwatson@debian.org]
--9jxsPFA5p3P2qPhR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="base-config-unbranding.patch"
Index: apt-setup
===================================================================
--- apt-setup (revision 1552)
+++ apt-setup (working copy)
@@ -37,6 +37,9 @@
APTGET="$APTGET -o Acquire::gpgv::Options::=--ignore-time-conflict"
APTCDROM="$APTCDROM -o Acquire::gpgv::Options::=--ignore-time-conflict"
+# Hostname that serves security updates
+SECURITY_HOST=security.debian.org
+
# Clear the screen if we're on a tty, but don't fail if we're not.
clear_screen () {
clear >/dev/tty </dev/tty 2>/dev/null || true
@@ -749,7 +752,7 @@
# * adding it when the user has not: don't include those
if apt-cache policy | grep "o=Debian,a=" | grep -qv 'a=unstable' && \
- ! grep -q '^[^#]*security.debian.org' ${APTETC}sources.list; then
+ ! grep -q "^[^#]*$SECURITY_HOST" ${APTETC}sources.list; then
# Figure out what line to add (we're definitely going to add something,
# even if it's just a comment).
#
@@ -769,11 +772,12 @@
SUITE="stable"
fi
- LINE="http://security.debian.org/ $SUITE/updates $DISTS"
+ LINE="http://$SECURITY_HOST/ $SUITE/updates $DISTS"
COMMENT="# "
# Now ask if they want the entry to be added.
+ db_subst apt-setup/security-updates SECURITY_HOST "$SECURITY_HOST"
db_input medium apt-setup/security-updates || true
db_go || true
db_fset apt-setup/security-updates seen false
@@ -803,6 +807,7 @@
# TODO should loop and re-ask for http proxy if the
# user just entered one, in case it was bad.
clear_screen
+ db_subst apt-setup/security-updates-failed SECURITY_HOST "$SECURITY_HOST"
db_subst apt-setup/security-updates-failed apt_error `tr '\n' ' ' < $tempfile`
db_input critical apt-setup/security-updates-failed || true
db_go || true
@@ -828,7 +833,7 @@
# Now add the entry, commented out or not. (Don't add the commented
# version if a commented version already exists.)
- if [ -z "$COMMENT" ] || ! grep -q '#.*security.debian.org' ${APTETC}sources.list; then
+ if [ -z "$COMMENT" ] || ! grep -q "#.*$SECURITY_HOST" ${APTETC}sources.list; then
echo "" >>${APTETC}sources.list
echo "${COMMENT}deb $LINE" >>${APTETC}sources.list
fi
Index: debian/templates
===================================================================
--- debian/templates (revision 1551)
+++ debian/templates (working copy)
@@ -1,6 +1,6 @@
Template: base-config/title
Type: title
-_Description: Debian base system configuration
+_Description: Base system configuration
Template: base-config/main-menu
Type: select
@@ -10,11 +10,11 @@
Template: base-config/intro
Type: note
-_Description: Welcome to your new Debian system!
+_Description: Welcome to your newly installed system!
This program will now walk you through the process of setting up your
newly installed system. It will start with the basics -- time zone
selection, setting a root password and adding a user, and then progress to
- installing additional software to tune this new Debian system to your
+ installing additional software to tune this new system to your
needs.
Template: base-config/use-ppp
Index: apt-setup.templates
===================================================================
--- apt-setup.templates (revision 1551)
+++ apt-setup.templates (working copy)
@@ -28,11 +28,11 @@
_Choices: cdrom, http, ftp, filesystem, edit sources list by hand
Default: cdrom
_Description: Archive access method for apt:
- Please choose the method apt (the Debian package management tool)
- should use to access the Debian archive.
+ Please choose the method that apt (the package management tool)
+ should use to access the package archive.
.
- For example if you have a Debian cd, select "cdrom", while if
- you plan to install via a Debian mirror, choose "ftp" or "http".
+ For example if you have an installation CD, select "cdrom", while if
+ you plan to install from a mirror on the network, choose "ftp" or "http".
.
${note}
@@ -50,20 +50,20 @@
Type: select
Choices: ${mirrors}
Default: http.us.debian.org
-_Description: Choose the Debian mirror to use:
- Select the Debian mirror apt should use. You should select a mirror that
+_Description: Choose the mirror to use:
+ Select the mirror that apt should use. You should select a mirror that
is close to you on the net.
Template: apt-setup/hostname
Type: string
_Description: Mirror hostname:
- Enter the hostname of the mirror from which Debian will be downloaded.
+ Enter the hostname of the mirror from which packages will be downloaded.
Template: apt-setup/directory
Type: string
Default: /debian
_Description: Mirror directory:
- Enter the directory in which the Debian mirror is located.
+ Enter the directory in which the mirror is located.
Template: apt-setup/baddir
Type: note
@@ -74,7 +74,7 @@
Type: note
_Description: Mirror not found
The directory you entered does not contain a subdirectory named "dists",
- so it doesn't seem to be a Debian mirror.
+ so it doesn't seem to be a package mirror.
Template: apt-setup/cd/missing
Type: note
@@ -90,19 +90,19 @@
This program was unable to auto-detect a CD-ROM drive, or there is no
usable CD in the drive.
.
- Enter the device file to use to access your CD-ROM, and place a
- Debian CD in the drive.
+ Enter the device file to use to access your CD-ROM, and place an
+ installation CD in the drive.
Template: apt-setup/cd/bad
Type: note
-_Description: Non-Debian CD-ROM detected
- The CD-ROM drive contains a non-Debian CD.
+_Description: Incorrect CD-ROM detected
+ The CD-ROM drive contains a CD which cannot be used for installation.
Template: apt-setup/cd/another
Type: boolean
Default: false
_Description: Scan another CD?
- If you have another Debian CD (for example, the second in a two CD set),
+ If you have another installation CD (for example, the second in a two CD set),
you should insert and scan it now.
Template: apt-setup/non-free
@@ -129,9 +129,9 @@
Template: apt-setup/badsource
Type: note
-_Description: Failed to access the Debian archive
- While trying to access the debian archive using the information you
- provided, the Debian package management tool, apt, returned the
+_Description: Failed to access the package archive
+ While trying to access the archive using the information you
+ provided, the package management tool, apt, returned the
following error. The questions will be asked again.
.
${apt_error}
@@ -157,20 +157,19 @@
Template: apt-setup/security-updates
Type: boolean
Default: true
-_Description: Use security updates from security.debian.org?
- Debian provides timely security updates via the website
- security.debian.org. These updates may be tracked each time
- you upgrade your system. If you have a connection to the
- Internet, this is generally a good idea.
+_Description: Use security updates from ${SECURITY_HOST}?
+ Timely security updates are available via the website ${SECURITY_HOST}.
+ These updates may be tracked each time you upgrade your system.
+ If you have a connection to the Internet, this is generally a good idea.
Template: apt-setup/security-updates-failed
Type: note
_Description: Cannot access security updates
- The security updates on security.debian.org couldn't be accessed, so those
+ The security updates on ${SECURITY_HOST} couldn't be accessed, so those
updates will not be made available to you at this time. You may want to
investigate this later.
.
- Commented out entries for security.debian.org
+ Commented out entries for ${SECURITY_HOST}
have been added to the bottom of the /etc/apt/sources.list file.
.
The error message returned by apt:
--9jxsPFA5p3P2qPhR--
---------------------------------------
Received: (at 311870-close) by bugs.debian.org; 18 Aug 2005 15:48:05 +0000
>From katie@spohr.debian.org Thu Aug 18 08:48:05 2005
Return-path: <katie@spohr.debian.org>
Received: from katie by spohr.debian.org with local (Exim 3.36 1 (Debian))
id 1E5mNA-0002s3-00; Thu, 18 Aug 2005 08:32:04 -0700
From: Joey Hess <joeyh@debian.org>
To: 311870-close@bugs.debian.org
X-Katie: $Revision: 1.56 $
Subject: Bug#311870: fixed in base-config 2.70
Message-Id: <E1E5mNA-0002s3-00@spohr.debian.org>
Sender: Archive Administrator <katie@spohr.debian.org>
Date: Thu, 18 Aug 2005 08:32:04 -0700
Delivered-To: 311870-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-CrossAssassin-Score: 2
Source: base-config
Source-Version: 2.70
We believe that the bug you reported is fixed in the latest version of
base-config, which is due to be installed in the Debian FTP archive:
base-config_2.70.dsc
to pool/main/b/base-config/base-config_2.70.dsc
base-config_2.70.tar.gz
to pool/main/b/base-config/base-config_2.70.tar.gz
base-config_2.70_all.deb
to pool/main/b/base-config/base-config_2.70_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 311870@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Joey Hess <joeyh@debian.org> (supplier of updated base-config package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Thu, 18 Aug 2005 11:15:12 -0400
Source: base-config
Binary: base-config
Architecture: source all
Version: 2.70
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Joey Hess <joeyh@debian.org>
Description:
base-config - Debian base system configurator
Closes: 264615 311870 319701 321555 323574 323581
Changes:
base-config (2.70) unstable; urgency=low
.
[ Debconf translations ]
* Lithuanian updated by KÄ?stutis BiliÅ«nas.
* German debian/po updated by Dennis Stampfer
* French updated by Christian Perrier
* Danish updated by Claus Hindsgaul
* Simplified Chinese updated by Carlos Z.F. Liu
* Vietnamese updated by Clytie Siddall. Closes: #319701
* Spanish translation by Javier Fernandez-Sanguino
* German debconf translation updated by Dennis Stampfer
* Brazilian Portuguese updated by André LuÃs Lopes
* Galician updated by Jacobo Tarrio
* Russian updated by Yuri Kozlov. Closes: #321555
* Romanian updated by Eddy Petrisor. Closes: #323574
.
[ Programs translations ]
* Romanian updated by Eddy Petrisor. Closes: #323581
.
[ Joey Hess ]
* Patch from Colin to remove unnecesary Debian "branding", including
parameterisation of the security.debian.org host. Closes: #311870
* Patch from Bubulle to clarify the error message about invalid hostnames.
Closes: #264615
* Removed tzsetup -- it's moved into d-i, in the tzsetup and clock-setup
udebs. (If there is demand, it can be brought back as a standalone deb.)
* Add alternate dep on cdebconf of a version high enough to have settitle.
* Remove some very old overrides for nonexisting files.
Files:
9ee0401723381ff2e8e204475db13b53 713 base important base-config_2.70.dsc
5fc740546b60beaa241bf1a47ea116fa 399680 base important base-config_2.70.tar.gz
e659ca4dbeffd627a833688be19ac1b4 260464 base important base-config_2.70_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFDBKZy2tp5zXiKP0wRAhM5AKCiu8M+wyYxn+NUXooGYn1LVM5N4wCgr2CR
+j1DTmMwEmNt8mObhUjhR/s=
=CPOx
-----END PGP SIGNATURE-----
Reply to: