From c382b128926ee525a0d3b2c4c1bc4323a2097e09 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 17 Aug 2013 11:35:06 +0000 Subject: [PATCH] Use only one template syntax Use the same template syntax and implementation for maintainer scripts, translations, etc. as we do for the control files. Define the image-stem and initramfs variables to replace the old K and I variables. After this, debian/linux-* and debian/po/*.po are generated files (at source preparation time) and should be ignored in svn. Use debhelper to install the generated files at build time. This also results in a redundant dependency on debconf (which we already have in Pre-Depends), but this seems harmless. svn path=/dists/trunk/linux/; revision=20508 --- debian/bin/gencontrol.py | 42 +++++++++++++++- debian/changelog | 2 + debian/rules | 4 +- debian/rules.real | 48 +------------------ debian/templates/headers.plain.postinst.in | 2 +- .../templates/image-dbg.lintian-override.in | 2 +- debian/templates/image.plain.postinst.in | 6 +-- debian/templates/image.plain.postrm.in | 7 ++- debian/templates/image.plain.preinst.in | 4 +- debian/templates/image.plain.prerm.in | 4 +- debian/templates/image.plain.templates.in | 10 ++-- debian/templates/po/ca.po | 4 +- debian/templates/po/cs.po | 4 +- debian/templates/po/da.po | 4 +- debian/templates/po/de.po | 4 +- debian/templates/po/es.po | 4 +- debian/templates/po/et.po | 4 +- debian/templates/po/fr.po | 4 +- debian/templates/po/it.po | 4 +- debian/templates/po/ja.po | 4 +- debian/templates/po/nl.po | 4 +- debian/templates/po/pl.po | 4 +- debian/templates/po/pt.po | 4 +- debian/templates/po/pt_BR.po | 4 +- debian/templates/po/ru.po | 4 +- debian/templates/po/sk.po | 4 +- debian/templates/po/sv.po | 4 +- debian/templates/po/tr.po | 4 +- debian/templates/po/vi.po | 4 +- 29 files changed, 100 insertions(+), 103 deletions(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 70be65d1f..c994e98ac 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -3,6 +3,9 @@ import sys sys.path.append("debian/lib/python") +import codecs +import errno +import glob import os import os.path import subprocess @@ -59,6 +62,14 @@ class Gencontrol(Base): 'SOURCEVERSION': self.version.complete, }) + # Prepare to generate template-substituted translations + for path in glob.glob('debian/templates/po/*.po'): + target = 'debian/po/' + os.path.basename(path) + with open(target, 'w') as f: + f.write('# THIS IS A GENERATED FILE; DO NOT EDIT IT!\n' + '# Translators should edit %s instead.\n' + '#\n' % path) + def do_main_makefile(self, makefile, makeflags, extra): fs_enabled = [featureset for featureset in self.config['base', ]['featuresets'] @@ -98,6 +109,12 @@ class Gencontrol(Base): def do_arch_setup(self, vars, makeflags, arch, extra): config_base = self.config.merge('base', arch) + + if config_base['kernel-arch'] in ['mips', 'parisc', 'powerpc']: + vars['image-stem'] = 'vmlinux' + else: + vars['image-stem'] = 'vmlinuz' + self._setup_makeflags(self.arch_makeflags, makeflags, config_base) def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra): @@ -199,7 +216,6 @@ class Gencontrol(Base): flavour_makeflags_image = ( ('type', 'TYPE', False), - ('initramfs', 'INITRAMFS', True), ) flavour_makeflags_other = ( @@ -219,6 +235,7 @@ class Gencontrol(Base): override_localversion = config_image.get('override-localversion', None) if override_localversion is not None: vars['localversion-image'] = vars['localversion_headers'] + '-' + override_localversion + vars['initramfs'] = 'YES' if config_image.get('initramfs', True) else '' self._setup_makeflags(self.flavour_makeflags_base, makeflags, config_base) self._setup_makeflags(self.flavour_makeflags_image, makeflags, config_image) @@ -379,6 +396,29 @@ class Gencontrol(Base): makefile.add('build-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_build) makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_setup) + # Substitute kernel version etc. into maintainer scripts, + # translations and lintian overrides + def substitute_file(template, target, append=False): + with codecs.open(target, 'a' if append else 'w', + 'utf-8') as f: + f.write(self.substitute(self.templates[template], vars)) + if config_entry_image['type'] == 'plain': + substitute_file('headers.plain.postinst', + 'debian/linux-headers-%s%s.postinst' % + (self.abiname, vars['localversion'])) + for name in ['postinst', 'postrm', 'preinst', 'prerm', 'templates']: + substitute_file('image.plain.%s' % name, + 'debian/linux-image-%s%s.%s' % + (self.abiname, vars['localversion'], name)) + for path in glob.glob('debian/templates/po/*.po'): + substitute_file('po/' + os.path.basename(path), + 'debian/po/' + os.path.basename(path), + append=True) + if build_debug: + substitute_file('image-dbg.lintian-override', + 'debian/linux-image-%s%s-dbg.lintian-overrides' % + (self.abiname, vars['localversion'])) + def merge_packages(self, packages, new, arch): for new_package in new: name = new_package['Package'] diff --git a/debian/changelog b/debian/changelog index 59c0d63f1..75a843aa3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ linux (3.11~rc5-1~exp1) UNRELEASED; urgency=low - Move all templates under debian/templates - linux-image: Remove undocumented $KERNEL_ARCH variable from hook environment + - Use only one template syntax (@keyword@) and do all substitutions + in gencontrol.py -- Ben Hutchings Sun, 11 Aug 2013 19:34:47 +0200 diff --git a/debian/rules b/debian/rules index e8ede0b0d..b8a4cee64 100755 --- a/debian/rules +++ b/debian/rules @@ -63,12 +63,12 @@ else endif maintainerclean: - rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/rules.gen + rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/linux-* debian/rules.gen debian/po/*.po rm -rf $(filter-out debian .svk .svn .git, $(wildcard * .[^.]*)) clean: debian/control dh_testdir - rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc debian/linux-headers-* debian/linux-image-* debian/linux-support-* debian/linux-source-* debian/linux-doc-* debian/linux-manual-* debian/xen-linux-system-* debian/*-modules-*-di* debian/kernel-image-*-di* + rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc $$(find debian -maxdepth 1 -type d -name 'linux-*') debian/*-modules-*-di* debian/kernel-image-*-di* dh_clean CONTROL_FILES = debian/changelog $(wildcard debian/templates/*.in) diff --git a/debian/rules.real b/debian/rules.real index c4c8eaa0e..77dbefeb9 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -287,12 +287,6 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$( ln -s /usr/src/$(PACKAGE_NAME) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/build ln -s /usr/src/$(PACKAGE_NAME_COMMON) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/source - install -d $(PACKAGE_DIR)/DEBIAN - sed -e 's/=V/$(REAL_VERSION)/g' \ - debian/templates/headers.plain.postinst.in \ - > $(PACKAGE_DIR)/DEBIAN/postinst - chmod 755 $(PACKAGE_DIR)/DEBIAN/postinst - +$(MAKE_SELF) install-base install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev @@ -362,9 +356,7 @@ endif rm -f $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/source rm $(PACKAGE_DIR)/lib/firmware -rf endif - +$(MAKE_SELF) \ - install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates \ - PACKAGE_NAME='$(PACKAGE_NAME)' PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)' + dh_installdebconf +$(MAKE_SELF) \ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug \ PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)' @@ -417,40 +409,6 @@ install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_image \ install-image_s390x_$(FEATURESET)_$(FLAVOUR)_plain_image: install -m644 '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION) -ifneq ($(INITRAMFS),False) -install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_INITRD = YES -endif - -ARG_KIMAGE = vmlinuz -install-image_hppa_$(FEATURESET)_$(FLAVOUR)_plain_templates \ -install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_templates \ -install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_templates \ -install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates \ -install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_templates \ -install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux - -install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: - for i in $(wildcard debian/templates/image.plain.*.in); do \ - target=$$(basename $$i .in); \ - target=$${target#image.plain.}; \ - sed \ - -e 's@=B@$(KERNEL_ARCH)@g' \ - -e 's/=I/$(ARG_INITRD)/g' \ - -e 's/=K/$(ARG_KIMAGE)/g' \ - -e 's/=V/$(REAL_VERSION)/g' \ - $$i > debian/$(PACKAGE_NAME).$$target || exit; \ - done - mkdir -p debian/$(PACKAGE_NAME).po - for i in $(wildcard debian/templates/po/*.po); do \ - sed \ - -e 's/=V/$(REAL_VERSION)/g' \ - $$i > debian/$(PACKAGE_NAME).po/$$(basename $$i) || exit; \ - done - mkdir -p debian/$(PACKAGE_NAME)/DEBIAN - po2debconf --podir debian/$(PACKAGE_NAME).po \ - -o debian/$(PACKAGE_NAME)/DEBIAN/templates \ - debian/$(PACKAGE_NAME).templates - install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug: dh_installdirs usr/share/bug/$(PACKAGE_NAME) dh_install debian/templates/image.plain.bug/* usr/share/bug/$(PACKAGE_NAME) @@ -468,9 +426,7 @@ install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_ dh_testroot dh_prep dh_installdirs usr/lib/debug usr/lib/debug/boot usr/share/lintian/overrides/ - sed -e 's/=V/$(REAL_VERSION)/g' \ - debian/templates/image-dbg.lintian-override.in \ - > $(PACKAGE_DIR)/usr/share/lintian/overrides/$(PACKAGE_NAME) + dh_lintian install -m644 $(DIR)/vmlinux $(DEBUG_DIR)/boot/vmlinux-$(REAL_VERSION) ifeq ($(MODULES),True) +$(MAKE_CLEAN) -C $(DIR) modules_install DEPMOD='$(CURDIR)/debian/bin/no-depmod' INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR) diff --git a/debian/templates/headers.plain.postinst.in b/debian/templates/headers.plain.postinst.in index 8c214bcd1..da14d3929 100644 --- a/debian/templates/headers.plain.postinst.in +++ b/debian/templates/headers.plain.postinst.in @@ -5,7 +5,7 @@ # Debian linux-image postinst script. $|=1; -my $version = "=V"; +my $version = "@abiname@@localversion@"; if (-d "/etc/kernel/header_postinst.d") { print STDERR "Examining /etc/kernel/header_postinst.d.\n"; diff --git a/debian/templates/image-dbg.lintian-override.in b/debian/templates/image-dbg.lintian-override.in index b0773e2fc..3e1849d74 100644 --- a/debian/templates/image-dbg.lintian-override.in +++ b/debian/templates/image-dbg.lintian-override.in @@ -1,2 +1,2 @@ # Kernel dbg packages contain a full image with debug data -linux-image-=V-dbg: dbg-package-missing-depends +linux-image-@abiname@@localversion@-dbg: dbg-package-missing-depends diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.plain.postinst.in index 858636a24..1650078e8 100755 --- a/debian/templates/image.plain.postinst.in +++ b/debian/templates/image.plain.postinst.in @@ -11,12 +11,12 @@ my $capb = capb('backup', 'escape'); $|=1; # Predefined values: -my $version = "=V"; +my $version = "@abiname@@localversion@"; my $link_in_boot = ""; my $no_symlink = ""; my $do_symlink = "Yes"; # target machine defined -my $kimage = "=K"; -my $initrd = "=I"; # initrd kernel +my $kimage = "@image-stem@"; +my $initrd = "@initramfs@"; my $mkimage = ""; # command to generate the initrd image my $use_hard_links = ''; # hardlinks do not work across fs boundaries my $postinst_hook = ''; #Normally we do not diff --git a/debian/templates/image.plain.postrm.in b/debian/templates/image.plain.postrm.in index 0a4f7c2bd..7a41e73aa 100755 --- a/debian/templates/image.plain.postrm.in +++ b/debian/templates/image.plain.postrm.in @@ -19,12 +19,11 @@ if ( ! $@ ) $|=1; # Predefined values: -my $version = "=V"; +my $version = "@abiname@@localversion@"; my $link_in_boot = ""; -my $kimage = "=K"; -my $initrd = "=I"; # initrd kernel +my $kimage = "@image-stem@"; +my $initrd = "@initramfs@"; my $postrm_hook = ''; #Normally we do not -my $ramdisk = "=MK"; # List of tools to create initial ram fs. my $package_name = "linux-image-$version"; #known variables diff --git a/debian/templates/image.plain.preinst.in b/debian/templates/image.plain.preinst.in index c5b5e027f..d98266ecb 100755 --- a/debian/templates/image.plain.preinst.in +++ b/debian/templates/image.plain.preinst.in @@ -10,8 +10,8 @@ my $capb=capb("backup"); $|=1; # Predefined values: -my $version = "=V"; -my $kimage = "=K"; +my $version = "@abiname@@localversion@"; +my $kimage = "@image-stem@"; my $preinst_hook = ''; #Normally we do not my $package_name = "linux-image-$version"; diff --git a/debian/templates/image.plain.prerm.in b/debian/templates/image.plain.prerm.in index 395b1e21f..b831f068e 100755 --- a/debian/templates/image.plain.prerm.in +++ b/debian/templates/image.plain.prerm.in @@ -8,8 +8,8 @@ my $capb=capb("backup"); $|=1; # Predefined values: -my $version = "=V"; -my $kimage = "=K"; +my $version = "@abiname@@localversion@"; +my $kimage = "@image-stem@"; my $prerm_hook = ''; #Normally we do not my $package_name = "linux-image-$version"; diff --git a/debian/templates/image.plain.templates.in b/debian/templates/image.plain.templates.in index a9005bfae..a2d5274f2 100644 --- a/debian/templates/image.plain.templates.in +++ b/debian/templates/image.plain.templates.in @@ -7,14 +7,14 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: linux-image-=V/postinst/depmod-error-initrd-=V +Template: linux-image-@abiname@@localversion@/postinst/depmod-error-initrd-@abiname@@localversion@ Type: boolean Default: false _Description: Abort installation after depmod error? The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}${CORE}). . - Since this image uses initrd, the ${modules_base}/=V/modules.dep file + Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will not be deleted, even though it may be invalid. . You should abort the installation and fix the @@ -22,7 +22,7 @@ _Description: Abort installation after depmod error? modules.dep file. If you don't abort the installation, there is a danger that the system will fail to boot. -Template: linux-image-=V/prerm/removing-running-kernel-=V +Template: linux-image-@abiname@@localversion@/prerm/removing-running-kernel-@abiname@@localversion@ Type: boolean Default: true _Description: Abort kernel removal? @@ -37,7 +37,7 @@ _Description: Abort kernel removal? It is highly recommended to abort the kernel removal unless you are prepared to fix the system after removal. -Template: linux-image-=V/postinst/missing-firmware-=V +Template: linux-image-@abiname@@localversion@/postinst/missing-firmware-@abiname@@localversion@ Type: note #flag:translate!:3 _Description: Required firmware files may be missing @@ -54,7 +54,7 @@ _Description: Required firmware files may be missing firmware files. # This has not yet been reviewed -Template: linux-image-=V/postinst/ignoring-ramdisk +Template: linux-image-@abiname@@localversion@/postinst/ignoring-ramdisk Type: error _Description: Ramdisk configuration must be updated Kernel packages will no longer run a specific ramdisk creator. The diff --git a/debian/templates/po/ca.po b/debian/templates/po/ca.po index dd82e273b..678ec6ef3 100644 --- a/debian/templates/po/ca.po +++ b/debian/templates/po/ca.po @@ -44,9 +44,9 @@ msgstr "L'ordre «depmod» ha sortit amb el codi d'error ${exit_value} (${SIGNAL #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." -msgstr "Com aquesta imatge empra un initrd, no es suprimirà el fitxer ${modules_base}/=V/modules.dep, tot i que potser és invàlid." +msgstr "Com aquesta imatge empra un initrd, no es suprimirà el fitxer ${modules_base}/@abiname@@localversion@/modules.dep, tot i que potser és invàlid." #. Type: boolean #. Description diff --git a/debian/templates/po/cs.po b/debian/templates/po/cs.po index e83ca25ab..99c847d9b 100644 --- a/debian/templates/po/cs.po +++ b/debian/templates/po/cs.po @@ -34,11 +34,11 @@ msgstr "Příkaz 'depmod' skončil s chybou ${exit_value} (${SIGNAL}${CORE})." #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" "Vzhledem k tomu, že tento obraz používá initrd, nebude soubor " -"${modules_base}/=V/modules.dep smazán, přesto že může být neplatný." +"${modules_base}/@abiname@@localversion@/modules.dep smazán, přesto že může být neplatný." #. Type: boolean #. Description diff --git a/debian/templates/po/da.po b/debian/templates/po/da.po index c1a08309b..a699fa30a 100644 --- a/debian/templates/po/da.po +++ b/debian/templates/po/da.po @@ -36,10 +36,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Da dette aftryk bruger initrd, vil filen ${modules_base}/=V/modules.dep ikke " +"Da dette aftryk bruger initrd, vil filen ${modules_base}/@abiname@@localversion@/modules.dep ikke " "blive slettet, selvom den måske er ugyldig." #. Type: boolean diff --git a/debian/templates/po/de.po b/debian/templates/po/de.po index de89b5483..b44d77218 100644 --- a/debian/templates/po/de.po +++ b/debian/templates/po/de.po @@ -36,10 +36,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Da dieses Image eine initrd verwendet, wird die Datei ${modules_base}/=V/" +"Da dieses Image eine initrd verwendet, wird die Datei ${modules_base}/@abiname@@localversion@/" "modules.dep nicht gelöscht, obwohl sie ungültig sein könnte." #. Type: boolean diff --git a/debian/templates/po/es.po b/debian/templates/po/es.po index c16a7268b..e2985a3f1 100644 --- a/debian/templates/po/es.po +++ b/debian/templates/po/es.po @@ -65,11 +65,11 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" "Debido a que esta imagen usa una imagen de arranque «initrd», no se " -"eliminará el fichero «${modules_base}/=V/modules.dep», aún cuando no sea " +"eliminará el fichero «${modules_base}/@abiname@@localversion@/modules.dep», aún cuando no sea " "válido." #. Type: boolean diff --git a/debian/templates/po/et.po b/debian/templates/po/et.po index 4aa29f513..3d4a3535b 100644 --- a/debian/templates/po/et.po +++ b/debian/templates/po/et.po @@ -49,10 +49,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Kuna tõmmis kasutab initrd-d, siis ${modules_base}/=V/modules.dep faili ei " +"Kuna tõmmis kasutab initrd-d, siis ${modules_base}/@abiname@@localversion@/modules.dep faili ei " "kustutata, kuigi ta võib olla vigane." #. Type: boolean diff --git a/debian/templates/po/fr.po b/debian/templates/po/fr.po index f85d72667..a9957b229 100644 --- a/debian/templates/po/fr.po +++ b/debian/templates/po/fr.po @@ -38,10 +38,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Puisque cette image du noyau utilise initrd, le fichier ${modules_base}/=V/" +"Puisque cette image du noyau utilise initrd, le fichier ${modules_base}/@abiname@@localversion@/" "modules.dep ne sera pas effacé, mais il peut ne pas être valable." #. Type: boolean diff --git a/debian/templates/po/it.po b/debian/templates/po/it.po index 0d0668c36..fa3cded9d 100644 --- a/debian/templates/po/it.po +++ b/debian/templates/po/it.po @@ -49,10 +49,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Poiché questa immagine usa un initrd, il file ${modules_base}/=V/modules.dep " +"Poiché questa immagine usa un initrd, il file ${modules_base}/@abiname@@localversion@/modules.dep " "non viene eliminato, anche se potrebbe risultare non più valido." #. Type: boolean diff --git a/debian/templates/po/ja.po b/debian/templates/po/ja.po index 683eed3ab..44afcdae2 100644 --- a/debian/templates/po/ja.po +++ b/debian/templates/po/ja.po @@ -41,8 +41,8 @@ msgstr "'depmod' コマンドは終了コード ${exit_value} (${SIGNAL}${CORE}) #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:2001 -msgid "Since this image uses initrd, the ${modules_base}/=V/modules.dep file will not be deleted, even though it may be invalid." -msgstr "このイメージは initrd を使っているので、${modules_base}/=V/modules.dep ファイルは (たとえ無効なものであったとしても) 削除されません。" +msgid "Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will not be deleted, even though it may be invalid." +msgstr "このイメージは initrd を使っているので、${modules_base}/@abiname@@localversion@/modules.dep ファイルは (たとえ無効なものであったとしても) 削除されません。" #. Type: boolean #. Description diff --git a/debian/templates/po/nl.po b/debian/templates/po/nl.po index 439ccb294..5bcb54e94 100644 --- a/debian/templates/po/nl.po +++ b/debian/templates/po/nl.po @@ -31,8 +31,8 @@ msgstr "De 'depmod' opdracht stopte met foutcode ${exit_value} (${SIGNAL}${CORE #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:2001 -msgid "Since this image uses initrd, the ${modules_base}/=V/modules.dep file will not be deleted, even though it may be invalid." -msgstr "Omdat deze afbeelding initrd gebruikt, zal het ${modules_base}/=V/modules.dep bestand niet verwijderd worden, ook al is het niet correct." +msgid "Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will not be deleted, even though it may be invalid." +msgstr "Omdat deze afbeelding initrd gebruikt, zal het ${modules_base}/@abiname@@localversion@/modules.dep bestand niet verwijderd worden, ook al is het niet correct." #. Type: boolean #. Description diff --git a/debian/templates/po/pl.po b/debian/templates/po/pl.po index 7f909ef66..313d1cd59 100644 --- a/debian/templates/po/pl.po +++ b/debian/templates/po/pl.po @@ -39,10 +39,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Ponieważ ten obraz używa initrd, plik ${modules_base}/=V/modules.dep nie " +"Ponieważ ten obraz używa initrd, plik ${modules_base}/@abiname@@localversion@/modules.dep nie " "zostanie usunięty, nawet jeśli może być nieprawidłowy." #. Type: boolean diff --git a/debian/templates/po/pt.po b/debian/templates/po/pt.po index a0df5f345..94307f3af 100644 --- a/debian/templates/po/pt.po +++ b/debian/templates/po/pt.po @@ -38,10 +38,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Como esta imagem usa initrd, o ficheiro ${modules_base}/=V/modules.dep não " +"Como esta imagem usa initrd, o ficheiro ${modules_base}/@abiname@@localversion@/modules.dep não " "será apagado, apesar de poder ser inválido." #. Type: boolean diff --git a/debian/templates/po/pt_BR.po b/debian/templates/po/pt_BR.po index 207999b3a..efdfbe279 100644 --- a/debian/templates/po/pt_BR.po +++ b/debian/templates/po/pt_BR.po @@ -53,10 +53,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Uma vez que esta imagem usa o initrd, o arquivo ${modules_base}/=V/modules." +"Uma vez que esta imagem usa o initrd, o arquivo ${modules_base}/@abiname@@localversion@/modules." "dep não será removido, embora possa ser considerado inválido." #. Type: boolean diff --git a/debian/templates/po/ru.po b/debian/templates/po/ru.po index 892d0b171..34717909f 100644 --- a/debian/templates/po/ru.po +++ b/debian/templates/po/ru.po @@ -38,10 +38,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Так как этот образ использует initrd, файл ${modules_base}/=V/modules.dep не " +"Так как этот образ использует initrd, файл ${modules_base}/@abiname@@localversion@/modules.dep не " "будет удалён, даже если он может быть неправильным." #. Type: boolean diff --git a/debian/templates/po/sk.po b/debian/templates/po/sk.po index 70f87989a..c38fd41fe 100644 --- a/debian/templates/po/sk.po +++ b/debian/templates/po/sk.po @@ -37,10 +37,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Keďže tento obraz používa initrd, nebude súbor ${modules_base}/=V/modules." +"Keďže tento obraz používa initrd, nebude súbor ${modules_base}/@abiname@@localversion@/modules." "dep zmazaný, hoci môže byť neplatný." #. Type: boolean diff --git a/debian/templates/po/sv.po b/debian/templates/po/sv.po index 663c8e27b..00e28ecbe 100644 --- a/debian/templates/po/sv.po +++ b/debian/templates/po/sv.po @@ -37,11 +37,11 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" "Eftersom denna avbildning använder initrd kommer inte filen ${modules_base}/" -"=V/modules.dep att raderas, trots att den kan vara felaktig." +"@abiname@@localversion@/modules.dep att raderas, trots att den kan vara felaktig." #. Type: boolean #. Description diff --git a/debian/templates/po/tr.po b/debian/templates/po/tr.po index a049c68e1..a106ef9cd 100644 --- a/debian/templates/po/tr.po +++ b/debian/templates/po/tr.po @@ -31,8 +31,8 @@ msgstr "'depmod' komutu ${exit_value} (${SIGNAL}${CORE}) çıkış koduyla sonla #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:2001 -msgid "Since this image uses initrd, the ${modules_base}/=V/modules.dep file will not be deleted, even though it may be invalid." -msgstr "Bu görüntü initrd kullandığından ötürü ${modules_base}/=V/modules.dep dosyası, dosya geçersiz olsa da silinmeyecektir." +msgid "Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will not be deleted, even though it may be invalid." +msgstr "Bu görüntü initrd kullandığından ötürü ${modules_base}/@abiname@@localversion@/modules.dep dosyası, dosya geçersiz olsa da silinmeyecektir." #. Type: boolean #. Description diff --git a/debian/templates/po/vi.po b/debian/templates/po/vi.po index a1b920db8..70367bc9d 100644 --- a/debian/templates/po/vi.po +++ b/debian/templates/po/vi.po @@ -46,10 +46,10 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will " +"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file will " "not be deleted, even though it may be invalid." msgstr "" -"Vì ảnh này sử dụng initrd, tập tin ${modules_base}/=V/modules.dep sẽ không " +"Vì ảnh này sử dụng initrd, tập tin ${modules_base}/@abiname@@localversion@/modules.dep sẽ không " "bị xoá, dù là nó có thể không thích hợp." #. Type: boolean