From: Ben Collins Date: Mon, 18 Oct 1999 13:22:52 +0000 (+0000) Subject: * Add mipseb to the archtable too, since mips and mipseb are X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46e75512768d432fb6fa9f2edb47435903298566;p=dpkg * Add mipseb to the archtable too, since mips and mipseb are both viable names for the mips big endian arch * Update dpkg-architecure's archtable * Removed the maintainer-configure portion in debian/rules, since we should be shipping the source with all the auto* stuff already generated anyway * Removed the ltconfig patch, and resort to a debian/rules fix to libtool itself after running configure, much cleaner, and reversible since libtool is a generated file * Use DESTDIR when installing instead of specifying all our dest dirs seperately in the make line. Also fix some of the make files to use DESTDIR when installing files * Regenerated .po files and dpkg.pot. Also added update.sh to the po/ subdir for easier regenerating for cvs only * Make release.sh generate .gmo files * Removed shlibs.default.i386. This is an obsolete file. We also no longer use /etc/dpkg/ directory. --- diff --git a/.cvsignore b/.cvsignore index e8523c71..b9e00b44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -13,3 +13,4 @@ mkinstalldirs stamp-h.in intl config.log +build diff --git a/ChangeLog b/ChangeLog index 63e70c01..68a83b99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Mon Oct 18 09:25:30 EDT 1999 Ben Collins + + * Add mipseb to the archtable too, since mips and mipseb are + both viable names for the mips big endian arch + * Update dpkg-architecure's archtable + * Removed the maintainer-configure portion in debian/rules, since + we should be shipping the source with all the auto* stuff + already generated anyway + * Removed the ltconfig patch, and resort to a debian/rules fix + to libtool itself after running configure, much cleaner, and + reversible since libtool is a generated file + * Use DESTDIR when installing instead of specifying all our + dest dirs seperately in the make line. Also fix some of the + make files to use DESTDIR when installing files + * Regenerated .po files and dpkg.pot. Also added update.sh to the po/ + subdir for easier regenerating for cvs only + * Make release.sh generate .gmo files + * Removed shlibs.default.i386. This is an obsolete file. We also no + longer use /etc/dpkg/ directory. + Sun Oct 17 13:40:46 EDT 1999 Ben Collins * Removed references to dpkg(5) which seems to not exist anymore diff --git a/autogen.sh b/autogen.sh index 44b58318..91b39e67 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,9 +4,9 @@ copy=$1 # Start by setting up everything for main tree aclocal -I ./automake -autoheader gettextize $copy libtoolize --force $copy +autoheader automake --add-missing --foreign $copy autoconf @@ -14,7 +14,7 @@ autoconf cd utils aclocal -I ../automake autoheader -automake --foreign $copy +automake --foreign autoconf # Return to the previous directory diff --git a/debian/.cvsignore b/debian/.cvsignore index 9d711a9e..c9f7e9f5 100644 --- a/debian/.cvsignore +++ b/debian/.cvsignore @@ -1,4 +1,3 @@ -build tmp-main tmp-dev substvars diff --git a/debian/README.compile b/debian/README.compile index 198e2d0a..8854d620 100644 --- a/debian/README.compile +++ b/debian/README.compile @@ -1,13 +1,9 @@ - To compile this package you need to have some less-then-standard packages installed. Here's a list: -automake -autoconf +perl debiandoc-sgml dpkg-perl -gettext -libtool libpaperg lout psutils @@ -18,4 +14,3 @@ sgmlspm sp tetex-base tetex-bin - diff --git a/debian/changelog b/debian/changelog index a63b82f2..bb8cf797 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,9 @@ dpkg (1.4.1.17) unstable; urgency=low * Added --chuid option to start-stop-daemon to allow switching to a different uid when starting a process - * Added mipsel to the archtable for completeness + * Add mipseb and mipsel to the archtable too, since mips and mipseb are + both viable names for the mips big endian arch, and mipsel is also needed + * Update dpkg-architecure's archtable * Added --config option to update-alternatives to allow easy changing of the registered alternatives for a specific name * Updated the deb-control(5) man page with all the current fields @@ -24,6 +26,16 @@ dpkg (1.4.1.17) unstable; urgency=low * Make dpkg give the builtin arch if there was an error while exec()'ing the C compiler with --print-architecture. We still fail if the output from gcc was bad in some way, since they may be of importance. + * Removed the maintainer-configure portion in debian/rules, since + we should be shipping the source with all the auto* stuff + already generated anyway + * Removed the ltconfig patch, and resort to a debian/rules fix + to libtool itself after running configure + * Use DESTDIR when installing instead of specifying all our + dest dirs seperately in the make line. Also fix some of the + make files to use DESTDIR when installing files + * Removed shlibs.default.i386. This is an obsolete file. We also no + longer use /etc/dpkg/ directory. -- Wichert Akkerman UNRELEASED diff --git a/debian/ltconfig-1.3.2.diff b/debian/ltconfig-1.3.2.diff deleted file mode 100644 index 5f8b28e2..00000000 --- a/debian/ltconfig-1.3.2.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ltconfig.orig Tue Jul 6 15:55:36 1999 -+++ ltconfig Tue Jul 6 15:59:12 1999 -@@ -1200,8 +1200,8 @@ EOF - esac - - if test "$ld_shlibs" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ runpath_var=LD_LIBRARY_PATH -+ hardcode_libdir_flag_spec='' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw*) diff --git a/debian/rules b/debian/rules index bcbea7d9..bb88af98 100755 --- a/debian/rules +++ b/debian/rules @@ -4,34 +4,18 @@ SHELL=bash .PHONY: clean build binary binary-trees binary-arch binary-indep -BUILD := $(shell pwd)/debian/build +BUILD := $(shell pwd)/build DIR := $(shell pwd) arch=$(shell dpkg --print-architecture) mcidir=debian/tmp-main/DEBIAN -configure: Makefile.am configure.in +$(BUILD)/config.status: $(checkdir) - mkdir -p automake - aclocal -I ./automake - autoheader - gettextize --copy --force - libtoolize --copy --force - patch -p0 < debian/ltconfig-1.3.2.diff - automake --copy --add-missing --foreign - autoconf - cd utils ; \ - aclocal -I ../automake ; \ - autoheader ; \ - automake --foreign ; \ - autoconf - -$(BUILD)/config.status: configure - $(checkdir) - $(RM) -r debian/build - install -d debian/build - cd $(BUILD) && ../../configure \ + $(RM) -r $(BUILD) + install -d $(BUILD) + cd $(BUILD) && $(DIR)/configure \ --enable-shared \ --prefix=/usr \ --datadir=/usr/share \ @@ -39,7 +23,12 @@ $(BUILD)/config.status: configure --infodir=/usr/share/info \ --sysconfdir=/etc \ --sharedstatedir=/var/lib \ - --localstatedir=/var/lib + --localstatedir=/var/lib && \ + sed < libtool > libtool-2 \ + -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__NO_RPATH_PLEASE "/' \ + -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' && \ + mv -f libtool-2 libtool && \ + chmod 755 libtool clean: $(checkdir) @@ -59,7 +48,7 @@ binary: binary-arch binary-indep binary-trees: build $(checkdir) -$(RM) -r debian/tmp-{main,dev} - install -d debian/tmp-{main,dev}/{DEBIAN,etc/dpkg,usr/share/doc/dpkg} + install -d debian/tmp-{main,dev}/{DEBIAN,etc,usr/share/doc/dpkg} install -d debian/tmp-dev/usr/{lib/dpkg,share/doc/dpkg-dev,sbin,bin} install -d debian/tmp-dev/usr/share/man/{ja/man1,man1,ja/man8,man8} install -d debian/tmp-dev/usr/share/emacs/site-lisp/dpkg-dev @@ -69,11 +58,6 @@ binary-trees: build else \ sed -e '/^# i386elf: /d' debian/preinst >$(mcidir)/preinst ; \ fi - set -e; if [ -f debian/shlibs.default.$(arch) ]; then \ - echo /etc/dpkg/shlibs.default >debian/tmp-dev/DEBIAN/conffiles ; \ - cp debian/shlibs.default.$(arch) \ - debian/tmp-dev/etc/dpkg/shlibs.default ; \ - fi cp debian/{prerm,postinst} $(mcidir)/. $(MAKE) -C $(BUILD) top_distdir=. dist $(MAKE) -C $(BUILD) \ diff --git a/debian/shlibs.default.i386 b/debian/shlibs.default.i386 deleted file mode 100644 index 703abc74..00000000 --- a/debian/shlibs.default.i386 +++ /dev/null @@ -1,15 +0,0 @@ -libc 6 libc6 -libm 6 libc6 -libncurses 4 libncurses4 -libICE 6 xlib6g (>= 3.3-5) -libPEX5 6 xlib6g (>= 3.3-5) -libSM 6 xlib6g (>= 3.3-5) -libX11 6 xlib6g (>= 3.3-5) -libXIE 6 xlib6g (>= 3.3-5) -libXaw 6 xlib6g (>= 3.3-5) -libXext 6 xlib6g (>= 3.3-5) -libXi 6 xlib6g (>= 3.3-5) -libXmu 6 xlib6g (>= 3.3-5) -libXt 6 xlib6g (>= 3.3-5) -libXtst 6 xlib6g (>= 3.3-5) -libXp 6 xlib6g (>= 3.3-5) diff --git a/doc/Makefile.am b/doc/Makefile.am index 18097f9d..3ba210de 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -81,17 +81,18 @@ database-structure.monops: database-structure.ps mv -f ps $@ install-data-local: $(HTMLDOCSTAMPS) - $(mkinstalldirs) $(pkgdocdir) - $(INSTALL_DATA) $(top_srcdir)/debian/changelog $(pkgdocdir)/changelog - $(INSTALL_DATA) $(srcdir)/changelog $(pkgdocdir)/changelog.manuals + $(mkinstalldirs) $(DESTDIR)$(pkgdocdir) + $(INSTALL_DATA) $(top_srcdir)/debian/changelog $(DESTDIR)$(pkgdocdir)/changelog + $(INSTALL_DATA) $(srcdir)/changelog $(DESTDIR)$(pkgdocdir)/changelog.manuals set -e; for f in $^; do \ g=`echo $$f | sed -e 's/-stamp$$//'`; \ - cp -r $$g $(pkgdocdir)/`basename $$g`; \ + cp -r $$g $(DESTDIR)$(pkgdocdir)/`basename $$g`; \ done uninstall-local: - -$(RM) $(pkgdocdir)/changelog.manuals $(pkgdocdir)/changelog - -cd $(pkgdocdir) && rm -rf $(HTMLDIRS) + -$(RM) $(DESTDIR)$(pkgdocdir)/changelog.manuals \ + $(DESTDIR)$(pkgdocdir)/changelog + -cd $(DESTDIR)$(pkgdocdir) && rm -rf $(HTMLDIRS) dist-hook: $(HTMLDOCSTAMPS) $(HARDCOPY) internals.sgmls internals.texi internals.info cp -p $^ $(distdir) diff --git a/main/processarc.c b/main/processarc.c index a5eae590..83459208 100644 --- a/main/processarc.c +++ b/main/processarc.c @@ -604,8 +604,8 @@ void process_archive(const char *filename) { /* If we can't stat the old or new file, or it's a directory, * we leave it up to the normal code */ - debug(dbg_eachfile, "process_archive: checking %s for same files on - upgrade/downgrade", fnamevb.buf); + debug(dbg_eachfile, "process_archive: checking %s for same files on " + "upgrade/downgrade", fnamevb.buf); if (!lstat(fnamevb.buf, &oldfs) && !S_ISDIR(oldfs.st_mode)) { for (cfile = newfileslist; cfile; cfile = cfile->next) { if (lstat(cfile->namenode->name, &newfs) || S_ISDIR(newfs.st_mode)) diff --git a/po/dpkg.pot b/po/dpkg.pot index cb00ec1b..98bb24a9 100644 --- a/po/dpkg.pot +++ b/po/dpkg.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-09-15 03:36+0200\n" +"POT-Creation-Date: 1999-10-18 00:25-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -421,7 +421,7 @@ msgstr "" msgid "subprocess %s failed with wait status code %d" msgstr "" -#: lib/mlib.c:122 main/help.c:360 +#: lib/mlib.c:122 main/help.c:362 #, c-format msgid "wait for %s failed" msgstr "" @@ -947,86 +947,120 @@ msgstr "" msgid "unable to stat current installed conffile `%.250s'" msgstr "" -#: main/configure.c:212 +#: main/configure.c:189 +#, c-format +msgid "" +"\n" +"Configuration file `%s', does not exist on system.\n" +"Installing new config file as you request.\n" +msgstr "" + +#: main/configure.c:228 #, c-format msgid "" "\n" "Configuration file `%s'" msgstr "" -#: main/configure.c:214 +#: main/configure.c:230 #, c-format msgid " (actually `%s')" msgstr "" -#: main/configure.c:219 +#: main/configure.c:235 msgid "" "\n" " ==> File on system created by you or by a script.\n" " ==> File also in package provided by package maintainer.\n" msgstr "" -#: main/configure.c:226 +#: main/configure.c:242 msgid "" "\n" " ==> Modified (by you or by a script) since installation.\n" msgstr "" -#: main/configure.c:227 +#: main/configure.c:243 msgid "" "\n" " Not modified since installation.\n" msgstr "" -#: main/configure.c:230 +#: main/configure.c:246 msgid " ==> Package distributor has shipped an updated version.\n" msgstr "" -#: main/configure.c:231 +#: main/configure.c:247 msgid " Version in package is the same as at last installation.\n" msgstr "" -#: main/configure.c:236 +#: main/configure.c:253 +msgid " ==> Using new file as you requested.\n" +msgstr "" + +#: main/configure.c:257 +msgid " ==> Using current old file as you requested.\n" +msgstr "" + +#: main/configure.c:264 +msgid " ==> Keeping old config file as default.\n" +msgstr "" + +#: main/configure.c:268 +msgid " ==> Using new config file as default.\n" +msgstr "" + +#: main/configure.c:274 msgid "" " What would you like to do about it ? Your options are:\n" " Y or I : install the package maintainer's version\n" " N or O : keep your currently-installed version\n" +" D : show the differences between the versions\n" " Z : background this process to examine the situation\n" msgstr "" -#: main/configure.c:242 +#: main/configure.c:281 msgid " The default action is to keep your current version.\n" msgstr "" -#: main/configure.c:244 +#: main/configure.c:283 msgid " The default action is to install the new version.\n" msgstr "" -#: main/configure.c:250 +#: main/configure.c:289 msgid "[default=N]" msgstr "" -#: main/configure.c:251 +#: main/configure.c:290 msgid "[default=Y]" msgstr "" -#: main/configure.c:251 +#: main/configure.c:290 msgid "[no default]" msgstr "" -#: main/configure.c:254 +#: main/configure.c:293 msgid "error writing to stderr, discovered before conffile prompt" msgstr "" -#: main/configure.c:261 +#: main/configure.c:300 msgid "read error on stdin at conffile prompt" msgstr "" -#: main/configure.c:262 +#: main/configure.c:301 msgid "EOF on stdin at conffile prompt" msgstr "" -#: main/configure.c:277 +#: main/configure.c:321 +#, c-format +msgid "failed to run diff (%.250s)" +msgstr "" + +#: main/configure.c:324 main/configure.c:351 +msgid "wait for shell failed" +msgstr "" + +#: main/configure.c:332 #, c-format msgid "" "Your currently installed version of the file is in:\n" @@ -1038,124 +1072,120 @@ msgid "" " I do not mess up your careful work.\n" msgstr "" -#: main/configure.c:288 +#: main/configure.c:343 msgid "Type `exit' when you're done.\n" msgstr "" -#: main/configure.c:293 +#: main/configure.c:348 #, c-format msgid "failed to exec shell (%.250s)" msgstr "" -#: main/configure.c:296 -msgid "wait for shell failed" -msgstr "" - -#: main/configure.c:298 +#: main/configure.c:353 msgid "Don't forget to foreground (`fg') this process when you're done !\n" msgstr "" -#: main/configure.c:319 +#: main/configure.c:374 #, c-format msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n" msgstr "" -#: main/configure.c:327 +#: main/configure.c:382 #, c-format msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n" msgstr "" -#: main/configure.c:335 +#: main/configure.c:390 #, c-format msgid "dpkg: %s: warning - failed to remove `%.250s': %s\n" msgstr "" -#: main/configure.c:343 +#: main/configure.c:398 #, c-format msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n" msgstr "" -#: main/configure.c:348 +#: main/configure.c:403 #, c-format msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n" msgstr "" -#: main/configure.c:352 +#: main/configure.c:407 #, c-format msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n" msgstr "" -#: main/configure.c:356 +#: main/configure.c:411 #, c-format msgid "Installing new version of config file %s ...\n" msgstr "" -#: main/configure.c:360 +#: main/configure.c:415 #, c-format msgid "unable to install `%.250s' as `%.250s'" msgstr "" -#: main/configure.c:416 +#: main/configure.c:471 #, c-format msgid "" "dpkg: %s: warning - unable to stat config file `%s'\n" " (= `%s'): %s\n" msgstr "" -#: main/configure.c:427 +#: main/configure.c:482 #, c-format msgid "" "dpkg: %s: warning - config file `%s' is a circular link\n" " (= `%s')\n" msgstr "" -#: main/configure.c:440 +#: main/configure.c:495 #, c-format msgid "" "dpkg: %s: warning - unable to readlink conffile `%s'\n" " (= `%s'): %s\n" msgstr "" -#: main/configure.c:459 +#: main/configure.c:514 #, c-format msgid "" "dpkg: %s: warning - conffile `%.250s' resolves to degenerate filename\n" " (`%s' is a symlink to `%s')\n" msgstr "" -#: main/configure.c:472 +#: main/configure.c:527 #, c-format msgid "" "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= " "`%s')\n" msgstr "" -#: main/configure.c:494 +#: main/configure.c:549 msgid "failed to exec md5sum" msgstr "" -#: main/configure.c:499 +#: main/configure.c:554 #, c-format msgid "unable to fdopen for md5sum of `%.250s'" msgstr "" -#: main/configure.c:507 +#: main/configure.c:562 msgid "error reading pipe from md5sum" msgstr "" -#: main/configure.c:508 +#: main/configure.c:563 msgid "error closing pipe from md5sum" msgstr "" #. file= fdopen(p1[0]) #. m_pipe() #. fd= open(cdr.buf) -#: main/configure.c:512 +#: main/configure.c:567 #, c-format msgid "md5sum gave malformatted output `%.250s'" msgstr "" -#: main/configure.c:516 +#: main/configure.c:571 #, c-format msgid "dpkg: %s: warning - unable to open conffile %s for hash: %s\n" msgstr "" @@ -1165,94 +1195,94 @@ msgstr "" msgid "unable to check for existence of `%.250s'" msgstr "" -#: main/depcon.c:136 main/packages.c:386 +#: main/depcon.c:132 main/packages.c:386 msgid " depends on " msgstr "" -#: main/depcon.c:137 +#: main/depcon.c:133 msgid " pre-depends on " msgstr "" -#: main/depcon.c:138 +#: main/depcon.c:134 msgid " recommends " msgstr "" -#: main/depcon.c:139 +#: main/depcon.c:135 msgid " conflicts with " msgstr "" -#: main/depcon.c:213 +#: main/depcon.c:209 #, c-format msgid " %.250s is to be removed.\n" msgstr "" -#: main/depcon.c:216 +#: main/depcon.c:212 #, c-format msgid " %.250s is to be deconfigured.\n" msgstr "" -#: main/depcon.c:220 +#: main/depcon.c:216 #, c-format msgid " %.250s is to be installed, but is version %.250s.\n" msgstr "" -#: main/depcon.c:228 +#: main/depcon.c:224 #, c-format msgid " %.250s is installed, but is version %.250s.\n" msgstr "" -#: main/depcon.c:243 +#: main/depcon.c:239 #, c-format msgid " %.250s is unpacked, but has never been configured.\n" msgstr "" -#: main/depcon.c:247 +#: main/depcon.c:243 #, c-format msgid " %.250s is unpacked, but is version %.250s.\n" msgstr "" -#: main/depcon.c:253 +#: main/depcon.c:249 #, c-format msgid " %.250s latest configured version is %.250s.\n" msgstr "" -#: main/depcon.c:262 +#: main/depcon.c:258 #, c-format msgid " %.250s is %s.\n" msgstr "" -#: main/depcon.c:298 +#: main/depcon.c:294 #, c-format msgid " %.250s provides %.250s but is to be removed.\n" msgstr "" -#: main/depcon.c:302 +#: main/depcon.c:298 #, c-format msgid " %.250s provides %.250s but is to be deconfigured.\n" msgstr "" -#: main/depcon.c:307 +#: main/depcon.c:303 #, c-format msgid " %.250s provides %.250s but is %s.\n" msgstr "" -#: main/depcon.c:352 +#: main/depcon.c:348 #, c-format msgid " %.250s (version %.250s) is to be installed.\n" msgstr "" -#: main/depcon.c:366 +#: main/depcon.c:362 #, c-format msgid " %.250s (version %.250s) is %s.\n" msgstr "" #. conflicts and provides the same -#: main/depcon.c:391 +#: main/depcon.c:387 #, c-format msgid " %.250s provides %.250s and is to be installed.\n" msgstr "" -#: main/depcon.c:422 +#: main/depcon.c:418 #, c-format msgid " %.250s provides %.250s and is %s.\n" msgstr "" @@ -1345,129 +1375,124 @@ msgstr "" msgid "--%s needs at least one package name argument" msgstr "" -#: main/enquiry.c:406 +#: main/enquiry.c:409 #, c-format msgid "Package `%s' is not installed and no info is available.\n" msgstr "" -#: main/enquiry.c:415 +#: main/enquiry.c:418 #, c-format msgid "Package `%s' is not available.\n" msgstr "" -#: main/enquiry.c:425 +#: main/enquiry.c:428 #, c-format msgid "Package `%s' is not installed.\n" msgstr "" -#: main/enquiry.c:434 +#: main/enquiry.c:437 #, c-format msgid "Package `%s' does not contain any files (!)\n" msgstr "" -#: main/enquiry.c:440 +#: main/enquiry.c:443 msgid "locally diverted" msgstr "" -#: main/enquiry.c:441 +#: main/enquiry.c:444 msgid "package diverts others" msgstr "" -#: main/enquiry.c:442 +#: main/enquiry.c:445 #, c-format msgid "diverted by %s" msgstr "" -#: main/enquiry.c:461 +#: main/enquiry.c:464 msgid "" "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" "and dpkg --contents (= dpkg-deb --contents) to list their contents." msgstr "" -#: main/enquiry.c:524 +#: main/enquiry.c:527 msgid "--predep-package does not take any argument" msgstr "" -#: main/enquiry.c:576 +#: main/enquiry.c:579 #, c-format msgid "" "dpkg: cannot see how to satisfy pre-dependency:\n" " %s\n" msgstr "" -#: main/enquiry.c:577 +#: main/enquiry.c:580 #, c-format msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)" msgstr "" -#: main/enquiry.c:597 +#: main/enquiry.c:600 #, c-format msgid "" "dpkg: unexpected output from `%s --print-libgcc-file-name':\n" " `%s'\n" msgstr "" -#: main/enquiry.c:600 +#: main/enquiry.c:603 #, c-format msgid "compiler libgcc filename not understood: %.250s" msgstr "" -#: main/enquiry.c:604 +#: main/enquiry.c:607 msgid "--print-installation-architecture does not take any argument" msgstr "" -#: main/enquiry.c:624 +#: main/enquiry.c:627 msgid "--print-architecture does not take any argument" msgstr "" -#: main/enquiry.c:630 +#: main/enquiry.c:633 msgid "failed to fdopen CC pipe" msgstr "" -#: main/enquiry.c:634 -#, c-format -msgid "failed to exec C compiler `%.250s'" -msgstr "" - -#: main/enquiry.c:638 +#: main/enquiry.c:651 msgid "error reading from CC pipe" msgstr "" -#: main/enquiry.c:640 +#: main/enquiry.c:653 msgid "empty output" msgstr "" -#: main/enquiry.c:642 +#: main/enquiry.c:655 msgid "no newline" msgstr "" -#: main/enquiry.c:645 +#: main/enquiry.c:658 msgid "no gcc-lib component" msgstr "" -#: main/enquiry.c:647 +#: main/enquiry.c:660 msgid "no hyphen after gcc-lib" msgstr "" -#: main/enquiry.c:659 +#: main/enquiry.c:672 #, c-format msgid "dpkg: warning, architecture `%s' not in remapping table\n" msgstr "" -#: main/enquiry.c:701 +#: main/enquiry.c:714 msgid "--cmpversions takes three arguments: " msgstr "" -#: main/enquiry.c:706 +#: main/enquiry.c:719 msgid "--cmpversions bad relation" msgstr "" -#: main/enquiry.c:711 +#: main/enquiry.c:724 #, c-format msgid "version a has bad syntax: %s\n" msgstr "" -#: main/enquiry.c:721 +#: main/enquiry.c:734 #, c-format msgid "version b has bad syntax: %s\n" msgstr "" @@ -1666,106 +1691,106 @@ msgstr "" msgid "not installed but configs remain" msgstr "" -#: main/help.c:81 +#: main/help.c:82 msgid "dpkg - warning: PATH is not set.\n" msgstr "" -#: main/help.c:96 +#: main/help.c:97 #, c-format msgid "dpkg: `%s' not found on PATH.\n" msgstr "" -#: main/help.c:102 +#: main/help.c:104 #, c-format msgid "" "%d expected program(s) not found on PATH.\n" "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin." msgstr "" -#: main/help.c:219 +#: main/help.c:221 #, c-format msgid "error un-catching signal %s: %s\n" msgstr "" -#: main/help.c:237 +#: main/help.c:239 #, c-format msgid "unable to ignore signal %s before running script" msgstr "" -#: main/help.c:246 +#: main/help.c:248 #, c-format msgid "unable to set execute permissions on `%.250s'" msgstr "" -#: main/help.c:270 +#: main/help.c:272 #, c-format msgid "unable to stat installed %s script `%.250s'" msgstr "" -#: main/help.c:277 main/help.c:356 main/help.c:396 +#: main/help.c:279 main/help.c:358 main/help.c:398 #, c-format msgid "unable to execute %s" msgstr "" -#: main/help.c:307 +#: main/help.c:309 #, c-format msgid "unable to stat new %s script `%.250s'" msgstr "" -#: main/help.c:314 +#: main/help.c:316 #, c-format msgid "unable to execute new %s" msgstr "" -#: main/help.c:348 +#: main/help.c:350 #, c-format msgid "dpkg: warning - unable to stat %s `%.250s': %s\n" msgstr "" -#: main/help.c:364 +#: main/help.c:366 #, c-format msgid "dpkg: warning - %s returned error exit status %d\n" msgstr "" -#: main/help.c:367 +#: main/help.c:369 #, c-format msgid "dpkg: warning - %s killed by signal (%s)%s\n" msgstr "" -#: main/help.c:370 +#: main/help.c:372 #, c-format msgid "%s failed with unknown wait status code %d" msgstr "" -#: main/help.c:374 +#: main/help.c:376 msgid "dpkg - trying script from the new package instead ...\n" msgstr "" -#: main/help.c:381 +#: main/help.c:383 #, c-format msgid "new %s script" msgstr "" -#: main/help.c:385 +#: main/help.c:387 msgid "there is no script in the new version of the package - giving up" msgstr "" -#: main/help.c:387 +#: main/help.c:389 #, c-format msgid "unable to stat %s `%.250s'" msgstr "" -#: main/help.c:401 +#: main/help.c:403 msgid "dpkg: ... it looks like that went OK.\n" msgstr "" #. Huh ? -#: main/help.c:496 +#: main/help.c:498 #, c-format msgid "failed to rmdir/unlink `%.255s'" msgstr "" -#: dpkg-deb/info.c:52 main/help.c:500 +#: dpkg-deb/info.c:52 main/help.c:502 msgid "failed to exec rm for cleanup" msgstr "" @@ -1861,22 +1886,22 @@ msgid "" "`more' !" msgstr "" -#: dpkg-deb/main.c:130 main/main.c:173 split/main.c:142 +#: dpkg-deb/main.c:130 main/main.c:178 split/main.c:142 #, c-format msgid "conflicting actions --%s and --%s" msgstr "" -#: main/main.c:225 +#: main/main.c:230 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" -#: main/main.c:231 +#: main/main.c:236 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" -#: main/main.c:257 +#: main/main.c:262 msgid "" "dpkg forcing options - control behaviour when problems found:\n" " warn but continue: --force-,,...\n" @@ -1894,6 +1919,14 @@ msgid "" "version\n" " depends-version [!] Turn dependency version problems into warnings\n" " depends [!] Turn all dependency problems into warnings\n" +" confnew [!] Always use the new config files, don't prompt\n" +" confold [!] Always use the old config files, don't prompt\n" +" confdef [!] Use the default option for new config files if one\n" +" is available, don't prompt. If no default can be " +"found,\n" +" you will be prompted unless one of the confold or\n" +" confnew options is also given\n" +" confmiss [!] Always install missing config files\n" " conflicts [!] Allow installation of conflicting packages\n" " architecture [!] Process even packages with wrong architecture\n" " overwrite-dir [!] Overwrite one package's directory with another's " @@ -1905,16 +1938,16 @@ msgid "" "Forcing options marked [*] are enabled by default.\n" msgstr "" -#: main/main.c:289 +#: main/main.c:301 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "" -#: main/main.c:366 +#: main/main.c:378 msgid "failed to exec dpkg-deb" msgstr "" -#: dpkg-deb/main.c:150 main/main.c:402 split/main.c:163 +#: dpkg-deb/main.c:150 main/main.c:414 split/main.c:163 msgid "need an action option" msgstr "" @@ -1981,177 +2014,193 @@ msgstr "" msgid "; however:\n" msgstr "" -#: main/processarc.c:105 +#: main/processarc.c:104 msgid "cannot access archive" msgstr "" -#: main/processarc.c:115 +#: main/processarc.c:114 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "" -#: main/processarc.c:120 +#: main/processarc.c:119 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" -#: main/processarc.c:123 +#: main/processarc.c:122 msgid "wait for dpkg-split failed" msgstr "" -#: main/processarc.c:144 +#: main/processarc.c:143 msgid "unable to get unique filename for control info" msgstr "" -#: main/processarc.c:166 +#: main/processarc.c:165 msgid "failed to exec dpkg-deb to extract control information" msgstr "" -#: main/processarc.c:180 +#: main/processarc.c:179 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "" -#: main/processarc.c:189 +#: main/processarc.c:188 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "" -#: main/processarc.c:234 +#: main/processarc.c:235 main/processarc.c:255 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" "%s" msgstr "" -#: main/processarc.c:237 +#: main/processarc.c:238 main/processarc.c:258 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "" -#: main/processarc.c:238 +#: main/processarc.c:239 main/processarc.c:259 msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "" -#: main/processarc.c:252 +#: main/processarc.c:247 +#, c-format +msgid "" +"dpkg: regarding %s containing %s, dependency problem:\n" +"%s" +msgstr "" + +#: main/processarc.c:250 +#, c-format +msgid "dependency problem - not installing %.250s" +msgstr "" + +#: main/processarc.c:251 +msgid "dpkg: warning - ignoring dependency problem !\n" +msgstr "" + +#: main/processarc.c:268 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "" -#: main/processarc.c:257 +#: main/processarc.c:273 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "" -#: main/processarc.c:277 +#: main/processarc.c:293 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" -#: main/processarc.c:331 +#: main/processarc.c:347 #, c-format msgid "read error in %.250s" msgstr "" #. conff= fopen() -#: main/processarc.c:333 +#: main/processarc.c:349 #, c-format msgid "error closing %.250s" msgstr "" -#: main/processarc.c:335 +#: main/processarc.c:351 #, c-format msgid "error trying to open %.250s" msgstr "" -#: main/processarc.c:367 +#: main/processarc.c:383 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "" -#: main/processarc.c:424 +#: main/processarc.c:440 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "" -#: main/processarc.c:500 +#: main/processarc.c:519 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" -#: main/processarc.c:508 +#: main/processarc.c:527 msgid "unable to fdopen dpkg-deb extract pipe" msgstr "" -#: main/processarc.c:514 +#: main/processarc.c:533 msgid "error reading dpkg-deb tar output" msgstr "" -#: main/processarc.c:517 +#: main/processarc.c:536 msgid "unexpected EOF in filesystem tarfile - corrupted package archive" msgstr "" -#: main/processarc.c:519 +#: main/processarc.c:538 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "" -#: main/processarc.c:576 +#: main/processarc.c:627 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "" -#: main/processarc.c:598 main/processarc.c:833 main/remove.c:287 +#: main/processarc.c:649 main/processarc.c:884 main/remove.c:396 msgid "cannot read info directory" msgstr "" -#: main/processarc.c:611 +#: main/processarc.c:662 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" -#: main/processarc.c:623 +#: main/processarc.c:674 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "" -#: main/processarc.c:626 +#: main/processarc.c:677 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" -#: main/processarc.c:633 +#: main/processarc.c:684 msgid "unable to open temp control directory" msgstr "" -#: main/processarc.c:642 +#: main/processarc.c:693 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" -#: main/processarc.c:647 +#: main/processarc.c:698 #, c-format msgid "package control info contained directory `%.250s'" msgstr "" -#: main/processarc.c:649 +#: main/processarc.c:700 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" -#: main/processarc.c:655 +#: main/processarc.c:706 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" -#: main/processarc.c:662 +#: main/processarc.c:713 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" -#: main/processarc.c:813 +#: main/processarc.c:864 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" -#: main/processarc.c:849 +#: main/processarc.c:900 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" @@ -2207,65 +2256,65 @@ msgstr "" msgid "Removing %s ...\n" msgstr "" -#: main/remove.c:246 +#: main/remove.c:203 #, c-format -msgid "" -"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not " -"removed.\n" +msgid "Purging configuration files for %s ...\n" msgstr "" -#: main/remove.c:252 +#: main/remove.c:247 #, c-format -msgid "" -"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': " -"%s - directory may be a mount point ?\n" +msgid "cannot remove old config file `%.250s' (= `%.250s')" msgstr "" -#: main/remove.c:259 +#: main/remove.c:262 #, c-format -msgid "cannot remove `%.250s'" +msgid "cannot read config file dir `%.250s' (from `%.250s')" msgstr "" -#: main/remove.c:277 +#: main/remove.c:297 #, c-format -msgid "cannot remove file `%.250s'" +msgid "cannot remove old backup config file `%.250s' (of `%.250s')" msgstr "" -#: main/remove.c:308 +#: main/remove.c:355 #, c-format -msgid "unable to delete control info file `%.250s'" +msgid "" +"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not " +"removed.\n" msgstr "" -#: main/remove.c:323 +#: main/remove.c:361 #, c-format -msgid "unable to check existence of `%.250s'" +msgid "" +"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': " +"%s - directory may be a mount point ?\n" msgstr "" -#: main/remove.c:338 +#: main/remove.c:368 #, c-format -msgid "Purging configuration files for %s ...\n" +msgid "cannot remove `%.250s'" msgstr "" -#: main/remove.c:382 +#: main/remove.c:386 #, c-format -msgid "cannot remove old config file `%.250s' (= `%.250s')" +msgid "cannot remove file `%.250s'" msgstr "" -#: main/remove.c:397 +#: main/remove.c:417 #, c-format -msgid "cannot read config file dir `%.250s' (from `%.250s')" +msgid "unable to delete control info file `%.250s'" msgstr "" #: main/remove.c:432 #, c-format -msgid "cannot remove old backup config file `%.250s' (of `%.250s')" +msgid "unable to check existence of `%.250s'" msgstr "" -#: main/remove.c:461 +#: main/remove.c:460 msgid "cannot remove old files list" msgstr "" -#: main/remove.c:467 +#: main/remove.c:466 msgid "can't remove old postrm script" msgstr "" @@ -2472,7 +2521,7 @@ msgstr "" msgid "unable to unbuffer `%.255s'" msgstr "" -#: dpkg-deb/build.c:207 dpkg-deb/build.c:254 +#: dpkg-deb/build.c:207 dpkg-deb/build.c:267 #, c-format msgid "failed to chdir to `%.255s'" msgstr "" @@ -2485,43 +2534,43 @@ msgstr "" msgid "failed to exec tar -cf" msgstr "" -#: dpkg-deb/build.c:212 +#: dpkg-deb/build.c:219 msgid "failed to make tmpfile (control)" msgstr "" -#: dpkg-deb/build.c:215 +#: dpkg-deb/build.c:224 msgid "failed to exec gzip -9c" msgstr "" -#: dpkg-deb/build.c:220 +#: dpkg-deb/build.c:229 msgid "failed to fstat tmpfile (control)" msgstr "" -#: dpkg-deb/build.c:240 +#: dpkg-deb/build.c:249 msgid "failed to rewind tmpfile (control)" msgstr "" -#: dpkg-deb/build.c:243 +#: dpkg-deb/build.c:252 msgid "failed to exec cat (control)" msgstr "" -#: dpkg-deb/build.c:249 +#: dpkg-deb/build.c:261 msgid "failed to make tmpfile (data)" msgstr "" -#: dpkg-deb/build.c:256 +#: dpkg-deb/build.c:269 msgid "failed to exec tar --exclude" msgstr "" -#: dpkg-deb/build.c:263 +#: dpkg-deb/build.c:276 msgid "failed to exec gzip -9c from tar --exclude" msgstr "" -#: dpkg-deb/build.c:278 +#: dpkg-deb/build.c:291 msgid "failed to rewind tmpfile (data)" msgstr "" -#: dpkg-deb/build.c:281 +#: dpkg-deb/build.c:294 msgid "failed to exec cat (data)" msgstr "" @@ -2558,7 +2607,7 @@ msgstr "" msgid "failed to fstat archive" msgstr "" -#: dpkg-deb/extract.c:122 split/info.c:93 +#: dpkg-deb/extract.c:122 split/info.c:94 #, c-format msgid "file `%.250s' is corrupt - bad magic at end of first header" msgstr "" @@ -2568,138 +2617,138 @@ msgstr "" msgid "file `%.250s' is corrupt - negative member length %ld" msgstr "" -#: dpkg-deb/extract.c:129 +#: dpkg-deb/extract.c:130 #, c-format msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)" msgstr "" -#: dpkg-deb/extract.c:135 +#: dpkg-deb/extract.c:136 msgid "archive has no newlines in header" msgstr "" -#: dpkg-deb/extract.c:138 +#: dpkg-deb/extract.c:139 msgid "archive has no dot in version number" msgstr "" -#: dpkg-deb/extract.c:141 +#: dpkg-deb/extract.c:142 #, c-format msgid "archive version %.250s not understood, get newer dpkg-deb" msgstr "" -#: dpkg-deb/extract.c:157 +#: dpkg-deb/extract.c:160 #, c-format msgid "file `%.250s' contains ununderstood data member %.*s, giving up" msgstr "" -#: dpkg-deb/extract.c:162 +#: dpkg-deb/extract.c:165 #, c-format msgid "file `%.250s' contains two control members, giving up" msgstr "" -#: dpkg-deb/extract.c:174 +#: dpkg-deb/extract.c:177 #, c-format msgid "" " new debian package, version %s.\n" " size %ld bytes: control archive= %ld bytes.\n" msgstr "" -#: dpkg-deb/extract.c:188 +#: dpkg-deb/extract.c:191 #, c-format msgid "archive has malformatted ctrl len `%s'" msgstr "" -#: dpkg-deb/extract.c:191 +#: dpkg-deb/extract.c:194 #, c-format msgid "" " old debian package, version %s.\n" " size %ld bytes: control archive= %ld, main archive= %ld.\n" msgstr "" -#: dpkg-deb/extract.c:206 +#: dpkg-deb/extract.c:209 msgid "" "dpkg-deb: file looks like it might be an archive which has been\n" "dpkg-deb: corrupted by being downloaded in ASCII mode\n" msgstr "" -#: dpkg-deb/extract.c:211 +#: dpkg-deb/extract.c:214 #, c-format msgid "`%.255s' is not a debian format archive" msgstr "" -#: dpkg-deb/extract.c:216 +#: dpkg-deb/extract.c:219 msgid "fgetpos failed" msgstr "" -#: dpkg-deb/extract.c:220 +#: dpkg-deb/extract.c:223 msgid "fsetpos failed" msgstr "" -#: dpkg-deb/extract.c:227 +#: dpkg-deb/extract.c:230 msgid "failed to fdopen p1 in paste" msgstr "" -#: dpkg-deb/extract.c:229 +#: dpkg-deb/extract.c:232 msgid "failed to write to gzip -dc" msgstr "" -#: dpkg-deb/extract.c:230 +#: dpkg-deb/extract.c:233 msgid "failed to close gzip -dc" msgstr "" -#: dpkg-deb/extract.c:237 +#: dpkg-deb/extract.c:240 msgid "failed to syscall lseek to files archive portion" msgstr "" -#: dpkg-deb/extract.c:245 +#: dpkg-deb/extract.c:248 msgid "failed to fdopen p1 in copy" msgstr "" -#: dpkg-deb/extract.c:248 +#: dpkg-deb/extract.c:251 msgid "failed to write to pipe in copy" msgstr "" -#: dpkg-deb/extract.c:251 +#: dpkg-deb/extract.c:254 msgid "failed to close pipe in copy" msgstr "" -#: dpkg-deb/extract.c:264 +#: dpkg-deb/extract.c:267 msgid "failed to exec gzip -dc" msgstr "" -#: dpkg-deb/extract.c:272 +#: dpkg-deb/extract.c:275 msgid "failed to create directory" msgstr "" -#: dpkg-deb/extract.c:273 +#: dpkg-deb/extract.c:276 msgid "failed to chdir to directory after creating it" msgstr "" -#: dpkg-deb/extract.c:275 +#: dpkg-deb/extract.c:278 msgid "failed to chdir to directory" msgstr "" -#: dpkg-deb/extract.c:288 +#: dpkg-deb/extract.c:291 msgid "failed to exec tar" msgstr "" -#: dpkg-deb/extract.c:311 dpkg-deb/extract.c:326 dpkg-deb/info.c:66 +#: dpkg-deb/extract.c:314 dpkg-deb/extract.c:329 dpkg-deb/info.c:66 #, c-format msgid "--%s needs a .deb filename argument" msgstr "" -#: dpkg-deb/extract.c:314 +#: dpkg-deb/extract.c:317 #, c-format msgid "" "--%s needs a target directory.\n" "Perhaps you should be using dpkg --install ?" msgstr "" -#: dpkg-deb/extract.c:317 +#: dpkg-deb/extract.c:320 #, c-format msgid "--%s takes at most two arguments (.deb and directory" msgstr "" -#: dpkg-deb/extract.c:328 +#: dpkg-deb/extract.c:331 #, c-format msgid "--%s takes only one argument (.deb filename)" msgstr "" @@ -2721,80 +2770,80 @@ msgstr "" msgid "rm cleanup failed, code %d\n" msgstr "" -#: dpkg-deb/info.c:67 +#: dpkg-deb/info.c:68 msgid "failed to make temporary filename" msgstr "" -#: dpkg-deb/info.c:71 +#: dpkg-deb/info.c:72 msgid "failed to exec rm -rf" msgstr "" -#: dpkg-deb/info.c:94 +#: dpkg-deb/info.c:96 msgid "failed to exec cat component" msgstr "" -#: dpkg-deb/info.c:98 +#: dpkg-deb/info.c:100 #, c-format msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n" msgstr "" -#: dpkg-deb/info.c:102 +#: dpkg-deb/info.c:104 #, c-format msgid "open component `%.255s' (in %.255s) failed in an unexpected way" msgstr "" -#: dpkg-deb/info.c:106 +#: dpkg-deb/info.c:108 msgid "at least one requested control component missing" msgstr "" -#: dpkg-deb/info.c:119 +#: dpkg-deb/info.c:121 #, c-format msgid "cannot scan directory `%.255s'" msgstr "" -#: dpkg-deb/info.c:124 +#: dpkg-deb/info.c:126 #, c-format msgid "cannot stat `%.255s' (in `%.255s')" msgstr "" -#: dpkg-deb/info.c:127 +#: dpkg-deb/info.c:129 #, c-format msgid "cannot open `%.255s' (in `%.255s')" msgstr "" -#: dpkg-deb/info.c:141 +#: dpkg-deb/info.c:143 #, c-format msgid "failed to read `%.255s' (in `%.255s')" msgstr "" -#: dpkg-deb/info.c:144 +#: dpkg-deb/info.c:146 #, c-format msgid " %7ld bytes, %5d lines %c %-20.127s %.127s\n" msgstr "" -#: dpkg-deb/info.c:150 +#: dpkg-deb/info.c:152 #, c-format msgid " not a plain file %.255s\n" msgstr "" -#: dpkg-deb/info.c:155 +#: dpkg-deb/info.c:157 #, c-format msgid "failed to read `control' (in `%.255s')" msgstr "" -#: dpkg-deb/info.c:156 +#: dpkg-deb/info.c:158 msgid "(no `control' file in control archive!)\n" msgstr "" -#: dpkg-deb/info.c:176 +#: dpkg-deb/info.c:178 msgid "could not open the `control' component" msgstr "" -#: dpkg-deb/info.c:206 +#: dpkg-deb/info.c:208 msgid "failed during read of `control' component" msgstr "" -#: dpkg-deb/info.c:238 +#: dpkg-deb/info.c:240 msgid "--contents takes exactly one argument" msgstr "" @@ -2826,7 +2875,7 @@ msgid "" " is the name of an administrative file component.\n" " is the name of a field in the main `control' file.\n" "Options: -D for debugging output; --old or --new controls archive format;\n" -" --no-check to suppress control file check (build bad package).\n" +" --nocheck to suppress control file check (build bad package).\n" "\n" "Use `dpkg' to install and remove packages from your system, or\n" "`dselect' for user-friendly package management. Packages unpacked\n" @@ -2849,81 +2898,81 @@ msgstr "" msgid "file `%.250s' is corrupt - missing newline after %.250s" msgstr "" -#: split/info.c:89 +#: split/info.c:90 msgid "unable to seek back" msgstr "" -#: split/info.c:103 +#: split/info.c:104 #, c-format msgid "file `%.250s' is corrupt - bad padding character (code %d)" msgstr "" -#: split/info.c:107 +#: split/info.c:108 #, c-format msgid "file `%.250s' is corrupt - nulls in info section" msgstr "" -#: split/info.c:114 +#: split/info.c:115 #, c-format msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split" msgstr "" -#: split/info.c:122 +#: split/info.c:123 #, c-format msgid "file `%.250s' is corrupt - bad MD5 checksum `%.250s'" msgstr "" -#: split/info.c:129 +#: split/info.c:130 #, c-format msgid "file `%.250s' is corrupt - no slash between part numbers" msgstr "" -#: split/info.c:138 +#: split/info.c:139 #, c-format msgid "file `%.250s' is corrupt - bad part number" msgstr "" -#: split/info.c:143 +#: split/info.c:144 #, c-format msgid "file `%.250s' is corrupt - bad magic at end of second header" msgstr "" -#: split/info.c:145 +#: split/info.c:146 #, c-format msgid "file `%.250s' is corrupt - second member is not data member" msgstr "" -#: split/info.c:151 +#: split/info.c:152 #, c-format msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes" msgstr "" -#: split/info.c:155 +#: split/info.c:156 #, c-format msgid "file `%.250s' is corrupt - size is wrong for quoted part number" msgstr "" -#: split/info.c:161 +#: split/info.c:162 #, c-format msgid "unable to fstat part file `%.250s'" msgstr "" -#: split/info.c:167 +#: split/info.c:168 #, c-format msgid "file `%.250s' is corrupt - too short" msgstr "" -#: split/info.c:179 split/info.c:220 +#: split/info.c:180 split/info.c:221 #, c-format msgid "cannot open archive part file `%.250s'" msgstr "" -#: split/info.c:181 +#: split/info.c:182 #, c-format msgid "file `%.250s' is not an archive part" msgstr "" -#: split/info.c:186 +#: split/info.c:187 #, c-format msgid "" "%s:\n" @@ -2940,11 +2989,11 @@ msgid "" "\n" msgstr "" -#: split/info.c:216 +#: split/info.c:217 msgid "--info requires one or more part file arguments" msgstr "" -#: split/info.c:226 +#: split/info.c:227 #, c-format msgid "file `%s' is not an archive part\n" msgstr "" diff --git a/po/en.po b/po/en.po index af77b8c8..76d2d18d 100644 --- a/po/en.po +++ b/po/en.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-10-17 22:55-0400\n" +"POT-Creation-Date: 1999-10-18 00:25-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/es.po b/po/es.po index d384892e..3793e278 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg\n" -"POT-Creation-Date: 1999-10-17 22:55-0400\n" +"POT-Creation-Date: 1999-10-18 00:25-0400\n" "PO-Revision-Date: 1999-05-31 00:40-0300\n" "Last-Translator: Nicolás Lictmaier \n" "Language-Team: es\n" diff --git a/po/fr.po b/po/fr.po index fac4a3ea..4a78d765 100644 --- a/po/fr.po +++ b/po/fr.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Debian dpkg 1.4.0.14\n" -"POT-Creation-Date: 1999-10-17 22:55-0400\n" +"POT-Creation-Date: 1999-10-18 00:25-0400\n" "PO-Revision-Date: 1997-05-13 22:07 EDT\n" "Last-Translator: Christophe Le Bars \n" "Language-Team: French\n" diff --git a/po/ja_JP.ujis.po b/po/ja_JP.ujis.po index f48b66ce..093c66df 100644 --- a/po/ja_JP.ujis.po +++ b/po/ja_JP.ujis.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.4.0.22\n" -"POT-Creation-Date: 1999-10-17 22:55-0400\n" +"POT-Creation-Date: 1999-10-18 00:25-0400\n" "PO-Revision-Date: 1999-03-06 16:25+09:00\n" "Last-Translator: Masato Taruishi \n" "Language-Team: Japanease \n" diff --git a/po/update.sh b/po/update.sh new file mode 100755 index 00000000..975fe41e --- /dev/null +++ b/po/update.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +xgettext --default-domain=dpkg --directory=.. \ + --add-comments --keyword=_ --keyword=N_ \ + --files-from=POTFILES.in && test ! -f dpkg.po \ + || ( rm -f dpkg.pot && mv dpkg.po dpkg.pot ) + +catalogs='en.gmo fr.gmo es.gmo ja_JP.ujis.gmo' +for cat in $catalogs; do + lang=`echo $cat | sed 's/\.gmo$//'` + mv $lang.po $lang.old.po + echo "$lang:" + if msgmerge $lang.old.po dpkg.pot -o $lang.po; then + rm -f $lang.old.po + else + echo "msgmerge for $cat failed!" + rm -f $lang.po + mv $lang.old.po $lang.po + fi +done diff --git a/release.sh b/release.sh index c02d3521..53029d78 100755 --- a/release.sh +++ b/release.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e # Wichert: thought this might be useful :) -- Ben @@ -12,5 +12,15 @@ rm -f `find . -name .cvsignore -type f` # Remove any cruft files... rm -f `find . -name '*.orig' -o -name '*.rej' -o -name '*~'` +# Generate all the gettext stuff +cd po +./update.sh +catalogs='en.gmo fr.gmo es.gmo ja_JP.ujis.gmo' +for cat in $catalogs; do + lang=`echo $cat | sed 's/\.gmo$//'` + msgfmt -o $cat $lang.po +done +cd .. + # Now remove the CVS scripts -rm -f autogen.sh release.sh +rm -f autogen.sh release.sh po/update.sh diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 890ab63f..8cd049ad 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -77,16 +77,16 @@ dpkg-scansources.8: dpkg-scansources.pl mv $@.new $@ install-data-local: cl-debian - $(mkinstalldirs) $(altslocalstatedir) $(altssysconfdir) - set -e; for f in $(LSMANL); do ln -sf $(mandir)/man1/dpkg-source.1 $(mandir)/man1/$$f.1; done - $(mkinstalldirs) $(parsechangelogdir) - $(INSTALL_PROGRAM) cl-debian $(parsechangelogdir)/debian + $(mkinstalldirs) $(DESTDIR)$(altslocalstatedir) $(DESTDIR)$(altssysconfdir) + set -e; for f in $(LSMANL); do ln -sf $(mandir)/man1/dpkg-source.1 $(DESTDIR)$(mandir)/man1/$$f.1; done + $(mkinstalldirs) $(DESTDIR)$(parsechangelogdir) + $(INSTALL_PROGRAM) cl-debian $(DESTDIR)$(parsechangelogdir)/debian uninstall-local: - $(RM) $(parsechangelogdir)/debian - -[ -e $(parsechangelogdir) ] && rmdir $(parsechangelogdir) - set -e; for f in $(LSMANL); do $(RM) $(mandir)/man1/$$f.1; done - -[ -e $(altssysconfdir) ] && rmdir $(altssysconfdir) - -[ -e $(altslocalstatedir) ] && rmdir $(altslocalstatedir) + $(RM) $(DESTDIR)$(parsechangelogdir)/debian + -[ -e $(DESTDIR)$(parsechangelogdir) ] && rmdir $(DESTDIR)$(parsechangelogdir) + set -e; for f in $(LSMANL); do $(RM) $(DESTDIR)$(mandir)/man1/$$f.1; done + -[ -e $(DESTDIR)$(altssysconfdir) ] && rmdir $(DESTDIR)$(altssysconfdir) + -[ -e $(DESTDIR)$(altslocalstatedir) ] && rmdir $(DESTDIR)$(altslocalstatedir) ## End of file. diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl index a0348266..3c51c4b2 100755 --- a/scripts/dpkg-architecture.pl +++ b/scripts/dpkg-architecture.pl @@ -47,10 +47,14 @@ require 'controllib.pl'; %archtable=('i386', 'i386-linux', 'sparc', 'sparc-linux', + 'sparc64', 'sparc64-linux', 'alpha', 'alpha-linux', 'm68k', 'm68k-linux', 'arm', 'arm-linux', 'powerpc', 'powerpc-linux', + 'mips', 'mips-linux', + 'mipsel', 'mipsel-linux', + 'mipseb', 'mipseb-linux', 'hurd-i386', 'i386-gnu'); sub usageversion {