[kernel] r15884 - in dists/sid/linux-2.6/debian: . po templates/temp.image.plain
Ben Hutchings
benh at alioth.debian.org
Fri Jun 18 03:35:09 UTC 2010
Author: benh
Date: Fri Jun 18 03:35:05 2010
New Revision: 15884
Log:
Get rid of the stem template variable (=ST)
We're not going to rename back to 'kernel' any time soon.
Modified:
dists/sid/linux-2.6/debian/po/cs.po
dists/sid/linux-2.6/debian/po/da.po
dists/sid/linux-2.6/debian/po/de.po
dists/sid/linux-2.6/debian/po/es.po
dists/sid/linux-2.6/debian/po/et.po
dists/sid/linux-2.6/debian/po/fr.po
dists/sid/linux-2.6/debian/po/ja.po
dists/sid/linux-2.6/debian/po/pt.po
dists/sid/linux-2.6/debian/po/ru.po
dists/sid/linux-2.6/debian/po/sv.po
dists/sid/linux-2.6/debian/po/templates.pot
dists/sid/linux-2.6/debian/po/vi.po
dists/sid/linux-2.6/debian/rules.real
dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst
dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm
dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst
dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm
dists/sid/linux-2.6/debian/templates/temp.image.plain/templates
Modified: dists/sid/linux-2.6/debian/po/cs.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/cs.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/cs.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -304,10 +304,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"Tento systém používá platný soubor /etc/${loader}.conf, který obsahuje "
-"${kimage}-=V. Odstranění =ST-image-=V tento soubor zneplatní."
+"${kimage}-=V. Odstranění linux-image-=V tento soubor zneplatní."
#. Type: boolean
#. Description
Modified: dists/sid/linux-2.6/debian/po/da.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/da.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/da.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -313,10 +313,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"Dette system bruger en gyldig /etc/${loader}.conf-fil som nævner ${kimage}-"
-"=V. Fjernelse af =ST-image-=V vil invalidere den fil."
+"=V. Fjernelse af linux-image-=V vil invalidere den fil."
#. Type: boolean
#. Description
Modified: dists/sid/linux-2.6/debian/po/de.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/de.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/de.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -323,10 +323,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"Dieses System nutzt eine gültige /etc/${loader}.conf-Datei, in der ${kimage}-"
-"=V enthalten ist. Durch das Entfernen von =ST-image-=V wird diese Datei "
+"=V enthalten ist. Durch das Entfernen von linux-image-=V wird diese Datei "
"ungültig."
#. Type: boolean
Modified: dists/sid/linux-2.6/debian/po/es.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/es.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/es.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -352,10 +352,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"Este sistema usa un fichero «/etc/${loader}.conf» válido que menciona "
-"«${kimage}-=V». Eliminar «=ST-image-=V» invalidará ese fichero."
+"«${kimage}-=V». Eliminar «linux-image-=V» invalidará ese fichero."
#. Type: boolean
#. Description
Modified: dists/sid/linux-2.6/debian/po/et.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/et.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/et.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -311,10 +311,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"See süsteem kasutab kehtivat /etc/${loader}.conf faili, mis mainib ${kimage}-"
-"=V. Eemaldades =ST-image-=V muudab selle faili kehtetuks."
+"=V. Eemaldades linux-image-=V muudab selle faili kehtetuks."
#. Type: boolean
#. Description
Modified: dists/sid/linux-2.6/debian/po/fr.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/fr.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/fr.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -332,10 +332,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"Le fichier /etc/${loader}.conf contenant la mention « ${kimage}-=V » est "
-"valable. Enlever « =ST-image-=V » rendra ce fichier non valable."
+"valable. Enlever « linux-image-=V » rendra ce fichier non valable."
#. Type: boolean
#. Description
Modified: dists/sid/linux-2.6/debian/po/ja.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/ja.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/ja.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -312,10 +312,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"このシステムは、${kimage}-=V について記述した有効な /etc/${loader}.conf ファ"
-"イルを使用しています。=ST-image-=V の削除はこのファイルを無効化することになり"
+"イルを使用しています。linux-image-=V の削除はこのファイルを無効化することになり"
"ます。"
#. Type: boolean
Modified: dists/sid/linux-2.6/debian/po/pt.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/pt.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/pt.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -321,10 +321,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"Este sistema usa um ficheiro /etc/${loader}.conf válido que menciona "
-"${kimage}-=V. Remover =ST-image-=V irá invalidar esse ficheiro."
+"${kimage}-=V. Remover linux-image-=V irá invalidar esse ficheiro."
#. Type: boolean
#. Description
Modified: dists/sid/linux-2.6/debian/po/ru.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/ru.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/ru.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -316,10 +316,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"В данной системе используется корректный файл /etc/${loader}.conf, в котором "
-"указано ${kimage}-=V. Удаление =ST-image-=V сделает файл некорректным."
+"указано ${kimage}-=V. Удаление linux-image-=V сделает файл некорректным."
#. Type: boolean
#. Description
Modified: dists/sid/linux-2.6/debian/po/sv.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/sv.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/sv.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -314,10 +314,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"Detta system använder en korrekt /etc/${loader}.conf-fil som pekar ut "
-"${kimage}-=V. Att ta bort =ST-image-=V kommer göra filen inaktuell."
+"${kimage}-=V. Att ta bort linux-image-=V kommer göra filen inaktuell."
#. Type: boolean
#. Description
Modified: dists/sid/linux-2.6/debian/po/templates.pot
==============================================================================
--- dists/sid/linux-2.6/debian/po/templates.pot Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/templates.pot Fri Jun 18 03:35:05 2010 (r15884)
@@ -270,7 +270,7 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
#. Type: boolean
Modified: dists/sid/linux-2.6/debian/po/vi.po
==============================================================================
--- dists/sid/linux-2.6/debian/po/vi.po Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/po/vi.po Fri Jun 18 03:35:05 2010 (r15884)
@@ -309,10 +309,10 @@
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
-"=V. Removing =ST-image-=V will invalidate that file."
+"=V. Removing linux-image-=V will invalidate that file."
msgstr ""
"Hệ thống này sử dụng một tập tin cấu hình « /etc/${loader}.conf » mà xác định "
-"« ${kimage}-=V ». Gỡ bỏ mục « =ST-image-=V » thì làm cho tập tin đó không có "
+"« ${kimage}-=V ». Gỡ bỏ mục « linux-image-=V » thì làm cho tập tin đó không có "
"hiệu lực."
#. Type: boolean
Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/rules.real Fri Jun 18 03:35:05 2010 (r15884)
@@ -396,7 +396,6 @@
for i in $(wildcard debian/templates/temp.image.plain/*); do \
sed \
-e 's,=D,/boot,g' \
- -e 's/=ST/linux/g' \
-e 's@=A@$(DEB_HOST_ARCH)@g' \
-e 's@=B@$(KERNEL_ARCH)@g' \
-e 's/=IB//g' \
@@ -412,7 +411,6 @@
mkdir -p debian/$(PACKAGE_NAME).po
for i in $(wildcard debian/po/*.po); do \
sed \
- -e 's/=ST/linux/g' \
-e 's/=V/$(REAL_VERSION)/g' \
$$i > debian/$(PACKAGE_NAME).po/$$(basename $$i); \
done
Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst Fri Jun 18 03:35:05 2010 (r15884)
@@ -31,7 +31,7 @@
my $arch = "=A"; # should be same as dpkg --print-architecture
my $kernel_arch = "=B";
my $ramdisk = "=MK"; # List of tools to create initial ram fs.
-my $package_name = "=ST-image-$version";
+my $package_name = "linux-image-$version";
my $explicit_do_loader = '';
my $Loader = "NoLOADER"; #
@@ -196,11 +196,11 @@
if ($num != 1) {
warn "error unlinking $modules_base/$version/build";
} else {
- if ($force_build_link || -d "/usr/src/=ST-headers-$version") {
- my $result = symlink ("/usr/src/=ST-headers-$version",
+ if ($force_build_link || -d "/usr/src/linux-headers-$version") {
+ my $result = symlink ("/usr/src/linux-headers-$version",
"$modules_base/$version/build");
if (! $result) {
- warn "Could not link /usr/src/=ST-headers-$version to $modules_base/$version/build:$!"
+ warn "Could not link /usr/src/linux-headers-$version to $modules_base/$version/build:$!"
}
}
}
@@ -828,7 +828,7 @@
}
# set the env var stem
-$ENV{'STEM'} = "=ST";
+$ENV{'STEM'} = "linux";
sub run_hook {
my $type = shift;
my $script = shift;
Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm Fri Jun 18 03:35:05 2010 (r15884)
@@ -37,7 +37,7 @@
my $arch = "=A"; # should be same as dpkg --print-architecture
my $kernel_arch = "=B";
my $ramdisk = "=MK"; # List of tools to create initial ram fs.
-my $package_name = "=ST-image-$version";
+my $package_name = "linux-image-$version";
my $Loader = "NoLOADER"; #
$Loader = "LILO" if $loader =~ /^lilo/io;
@@ -209,7 +209,7 @@
}
# set the env var stem
-$ENV{'STEM'} = "=ST";
+$ENV{'STEM'} = "linux";
sub exec_script {
my $type = shift;
Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst Fri Jun 18 03:35:05 2010 (r15884)
@@ -25,7 +25,7 @@
my $arch = "=A"; # should be same as dpkg --print-architecture
my $kernel_arch = "=B";
my $ramdisk = "=MK"; # List of tools to create initial ram fs.
-my $package_name = "=ST-image-$version";
+my $package_name = "linux-image-$version";
#known variables
my $image_dest = "/";
@@ -135,7 +135,7 @@
}
# set the env var stem
-$ENV{'STEM'} = "=ST";
+$ENV{'STEM'} = "linux";
sub exec_script {
my $type = shift;
Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm Fri Jun 18 03:35:05 2010 (r15884)
@@ -24,7 +24,7 @@
my $force_build_link = ''; # There is no harm in checking the link
my $arch = "=A"; # should be same as dpkg --print-architecture
my $kernel_arch = "=B";
-my $package_name = "=ST-image-$version";
+my $package_name = "linux-image-$version";
my $Loader = "NoLOADER"; #
$Loader = "LILO" if $loader =~ /^lilo/io;
@@ -59,8 +59,8 @@
my $WouldInvalidate = 0;
if ($ARGV[0] && ($ARGV[0] =~ /remove/ || $ARGV[0] =~ /upgrade/)) {
- if (-l "/usr/doc/=ST-image-$version") {
- unlink "/usr/doc/=ST-image-$version";
+ if (-l "/usr/doc/linux-image-$version") {
+ unlink "/usr/doc/linux-image-$version";
}
}
@@ -204,7 +204,7 @@
die "Error retreiving answer for $question: $answer" if $ret;
if ($answer =~ /^(y|t)/i) {
- print STDERR "\nNot removing =ST-image-$version.\n";
+ print STDERR "\nNot removing linux-image-$version.\n";
exit 1; #Operation not permitted
}
else {
@@ -215,7 +215,7 @@
# set the env var stem
-$ENV{'STEM'} = "=ST";
+$ENV{'STEM'} = "linux";
sub exec_script {
my $type = shift;
Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/templates
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/templates Fri Jun 18 03:21:47 2010 (r15883)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/templates Fri Jun 18 03:35:05 2010 (r15884)
@@ -7,7 +7,7 @@
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
-Template: =ST-image-=V/postinst/depmod-error-initrd-=V
+Template: linux-image-=V/postinst/depmod-error-initrd-=V
Type: boolean
Default: false
_Description: Abort installation after depmod error?
@@ -39,7 +39,7 @@
Please choose which should run: the default boot loader now, or the
GRUB update later.
-Template: =ST-image-=V/postinst/bootloader-test-error-=V
+Template: linux-image-=V/postinst/bootloader-test-error-=V
Type: note
_Description: Error running the boot loader in test mode
An error occurred while running the ${loader} boot loader in test mode.
@@ -48,7 +48,7 @@
manually and re-run ${loader} to fix that issue and keep this system
bootable.
-Template: =ST-image-=V/postinst/bootloader-error-=V
+Template: linux-image-=V/postinst/bootloader-error-=V
Type: note
_Description: Error running the boot loader
An error occurred while running the ${loader} boot loader.
@@ -57,7 +57,7 @@
manually and re-run ${loader} to fix that issue and keep this system
bootable.
-Template: =ST-image-=V/prerm/removing-running-kernel-=V
+Template: linux-image-=V/prerm/removing-running-kernel-=V
Type: boolean
Default: true
_Description: Abort kernel removal?
@@ -72,12 +72,12 @@
It is highly recommended to abort the kernel removal unless you are
prepared to fix the system after removal.
-Template: =ST-image-=V/prerm/would-invalidate-boot-loader-=V
+Template: linux-image-=V/prerm/would-invalidate-boot-loader-=V
Type: boolean
Default: true
_Description: Abort kernel removal?
This system uses a valid /etc/${loader}.conf file that mentions
- ${kimage}-=V. Removing =ST-image-=V will invalidate
+ ${kimage}-=V. Removing linux-image-=V will invalidate
that file.
.
You will need to edit /etc/${loader}.conf or re-target
@@ -87,7 +87,7 @@
It is highly recommended to abort the kernel removal unless you are
prepared to fix the system after removal.
-Template: =ST-image-=V/postinst/missing-firmware-=V
+Template: linux-image-=V/postinst/missing-firmware-=V
Type: note
#flag:translate!:3
_Description: Required firmware files may be missing
More information about the Kernel-svn-changes
mailing list