Patch for dpkg-1.4.0.34, apply it to the latest source ?
Hi,
I send you the patch here because you may want to apply it to your
files in the CVS tree ... in dpkg/main.c the big string for --help had
some problems because of some "\" that were lacking. While I worked to
correct the core-dump problem I noticed that and corrected it (updating by
the way the two translations available).
When I'll upload the package for stable, it will be corrected so it would
be good that you update it in your CVS tree as well.
Thanks.
--
Hertzog Raphaël >> 0C4CABF1 >> http://prope.insa-lyon.fr/~rhertzog/
diff -u -r dpkg-1.4.0.34/ChangeLog dpkg-1.4.0.35/ChangeLog
--- dpkg-1.4.0.34/ChangeLog Tue Mar 2 09:50:16 1999
+++ dpkg-1.4.0.35/ChangeLog Wed Apr 21 16:41:07 1999
@@ -1,3 +1,11 @@
+dpkg (1.4.0.35) stable; urgency=low
+
+ * Non-maintainer upload.
+ * Reverted workaround. Compiling without the options
+ --with-included-gettext solves the core-dump problem.
+
+ -- Raphael Hertzog <rhertzog@hrnet.fr> Wed, 21 Apr 1999 16:33:44 +0200
+
dpkg (1.4.0.34) frozen; urgency=high
* Non-maintainer upload
diff -u -r dpkg-1.4.0.34/configure.in dpkg-1.4.0.35/configure.in
--- dpkg-1.4.0.34/configure.in Mon Sep 14 18:45:49 1998
+++ dpkg-1.4.0.35/configure.in Wed Apr 21 15:40:29 1999
@@ -91,7 +91,7 @@
ALL_LINGUAS="en fr"
AM_GNU_GETTEXT
-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+dnl AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
dnl Other stuff
diff -u -r dpkg-1.4.0.34/debian/changelog dpkg-1.4.0.35/debian/changelog
--- dpkg-1.4.0.34/debian/changelog Tue Mar 2 09:50:16 1999
+++ dpkg-1.4.0.35/debian/changelog Wed Apr 21 16:41:07 1999
@@ -1,3 +1,11 @@
+dpkg (1.4.0.35) stable; urgency=low
+
+ * Non-maintainer upload.
+ * Reverted workaround. Compiling without the options
+ --with-included-gettext solves the core-dump problem.
+
+ -- Raphael Hertzog <rhertzog@hrnet.fr> Wed, 21 Apr 1999 16:33:44 +0200
+
dpkg (1.4.0.34) frozen; urgency=high
* Non-maintainer upload
diff -u -r dpkg-1.4.0.34/debian/rules dpkg-1.4.0.35/debian/rules
--- dpkg-1.4.0.34/debian/rules Mon Sep 14 19:23:12 1998
+++ dpkg-1.4.0.35/debian/rules Wed Apr 21 15:20:15 1999
@@ -28,7 +28,7 @@
$(RM) -r debian/build
install -d debian/build
cd $(BUILD) && ../../configure \
- --enable-shared --with-included-gettext \
+ --enable-shared \
--prefix=/usr \
--datadir=/usr/share \
--sysconfdir=/etc \
diff -u -r dpkg-1.4.0.34/doc/manuals-version dpkg-1.4.0.35/doc/manuals-version
--- dpkg-1.4.0.34/doc/manuals-version Wed Jan 20 00:12:53 1999
+++ dpkg-1.4.0.35/doc/manuals-version Wed Apr 21 16:48:35 1999
@@ -1,2 +1,2 @@
-<!entity manuals-version "1.4.0.33">
-<!entity dpkg-version "1.4.0.33">
+<!entity manuals-version "1.4.0.35">
+<!entity dpkg-version "1.4.0.35">
diff -u -r dpkg-1.4.0.34/dpkg/main.c dpkg-1.4.0.35/dpkg/main.c
--- dpkg-1.4.0.34/dpkg/main.c Tue Jan 19 23:53:26 1999
+++ dpkg-1.4.0.35/dpkg/main.c Wed Apr 21 16:31:10 1999
@@ -73,7 +73,7 @@
dpkg -l|--list [<pattern> ...] list packages concisely\n\
dpkg -S|--search <pattern> ... find package(s) owning file(s)\n\
dpkg -C|--audit check for broken package(s)\n\
- dpkg --abort-after <n> abort after encountering <n> errors\n
+ dpkg --abort-after <n> abort after encountering <n> errors\n\
dpkg --print-architecture print target architecture (uses GCC)\n\
dpkg --print-gnu-build-architecture print GNU version of target arch\n\
dpkg --print-installation-architecture print host architecture (for inst'n)\n\
@@ -88,7 +88,7 @@
For internal use: dpkg --assert-support-predepends | --predep-package |\n\
--assert-working-epoch\n\
\n\
-Options:
+Options:\n\
--admindir=<directory> Use <directory> instead of %s\n\
--root=<directory> Install on alternative system rooted elsewhere\n\
--instdir=<directory> Change inst'n root without changing admin dir\n\
diff -u -r dpkg-1.4.0.34/dpkg-deb/main.c dpkg-1.4.0.35/dpkg-deb/main.c
--- dpkg-1.4.0.34/dpkg-deb/main.c Tue Mar 2 09:48:57 1999
+++ dpkg-1.4.0.35/dpkg-deb/main.c Wed Apr 21 16:30:30 1999
@@ -136,7 +136,6 @@
int main(int argc, const char *const *argv) {
jmp_buf ejbuf;
- putenv("LANG=C"); /* work around segfaults for hamm release */
setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "POSIX");
bindtextdomain(PACKAGE, LOCALEDIR);
diff -u -r dpkg-1.4.0.34/po/en.po dpkg-1.4.0.35/po/en.po
--- dpkg-1.4.0.34/po/en.po Wed Jan 20 00:13:18 1999
+++ dpkg-1.4.0.35/po/en.po Wed Apr 21 20:01:48 1999
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-01-20 00:11+0100\n"
+"POT-Creation-Date: 1999-04-21 16:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1906,7 +1906,7 @@
"conditions. There is NO warranty. See dpkg --licence for details.\n"
#: dpkg/main.c:57
-#, fuzzy
+#, c-format
msgid ""
"Usage: \n"
" dpkg -i|--install <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -1929,6 +1929,47 @@
" dpkg -C|--audit check for broken package(s)\n"
" dpkg --abort-after <n> abort after encountering <n> "
"errors\n"
+" dpkg --print-architecture print target architecture (uses "
+"GCC)\n"
+" dpkg --print-gnu-build-architecture print GNU version of target arch\n"
+" dpkg --print-installation-architecture print host architecture (for "
+"inst'n)\n"
+" dpkg --compare-versions <a> <rel> <b> compare version numbers - see "
+"below\n"
+" dpkg --help | --version show this help / version number\n"
+" dpkg --force-help | -Dh|--debug=help help on forcing resp. debugging\n"
+" dpkg --licence print copyright licencing terms\n"
+"\n"
+"Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
+" -x|--extract|-X|--vextract|--fsys-tarfile on archives (type %s --help.)\n"
+"\n"
+"For internal use: dpkg --assert-support-predepends | --predep-package |\n"
+" --assert-working-epoch\n"
+"\n"
+"Options:\n"
+" --admindir=<directory> Use <directory> instead of %s\n"
+" --root=<directory> Install on alternative system rooted elsewhere\n"
+" --instdir=<directory> Change inst'n root without changing admin dir\n"
+" -O|--selected-only Skip packages not selected for install/upgrade\n"
+" -E|--skip-same-version Skip packages whose same version is installed\n"
+" -G=--refuse-downgrade Skip packages with earlier version than "
+"installed\n"
+" -B|--auto-deconfigure Install even if it would break some other "
+"package\n"
+" --largemem | --smallmem Optimise for large (>4Mb) or small (<4Mb) RAM "
+"use\n"
+" --no-act Just say what we would do - don't do it\n"
+" -D|--debug=<octal> Enable debugging - see -Dhelp or --debug=help\n"
+" --ignore-depends=<package>,... Ignore dependencies involving <package>\n"
+" --force-... Override problems - see --force-help\n"
+" --no-force-...|--refuse-... Stop when problems encountered\n"
+"\n"
+"Comparison operators for --compare-versions are:\n"
+" lt le eq ne ge gt (treat no version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" < << <= = >= >> > (only for compatibility with control file syntax).\n"
+"\n"
+"Use `dselect' for user-friendly package management.\n"
msgstr ""
"Usage: \n"
" dpkg -i|--install <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -3521,3 +3562,4 @@
#, c-format
msgid "%s: no files checked\n"
msgstr "%s: no files checked\n"
+
diff -u -r dpkg-1.4.0.34/po/fr.po dpkg-1.4.0.35/po/fr.po
--- dpkg-1.4.0.34/po/fr.po Wed Jan 20 00:13:19 1999
+++ dpkg-1.4.0.35/po/fr.po Wed Apr 21 19:56:53 1999
@@ -17,7 +17,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian dpkg 1.4.0.14\n"
-"POT-Creation-Date: 1999-01-20 00:11+0100\n"
+"POT-Creation-Date: 1999-04-21 16:46+0200\n"
"PO-Revision-Date: 1997-05-13 22:07 EDT\n"
"Last-Translator: Christophe Le Bars <clebars@debian.org>\n"
"Language-Team: French\n"
@@ -2048,7 +2048,7 @@
"les détails.\n"
#: dpkg/main.c:57
-#, fuzzy
+#, c-format
msgid ""
"Usage: \n"
" dpkg -i|--install <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2071,6 +2071,47 @@
" dpkg -C|--audit check for broken package(s)\n"
" dpkg --abort-after <n> abort after encountering <n> "
"errors\n"
+" dpkg --print-architecture print target architecture (uses "
+"GCC)\n"
+" dpkg --print-gnu-build-architecture print GNU version of target arch\n"
+" dpkg --print-installation-architecture print host architecture (for "
+"inst'n)\n"
+" dpkg --compare-versions <a> <rel> <b> compare version numbers - see "
+"below\n"
+" dpkg --help | --version show this help / version number\n"
+" dpkg --force-help | -Dh|--debug=help help on forcing resp. debugging\n"
+" dpkg --licence print copyright licencing terms\n"
+"\n"
+"Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
+" -x|--extract|-X|--vextract|--fsys-tarfile on archives (type %s --help.)\n"
+"\n"
+"For internal use: dpkg --assert-support-predepends | --predep-package |\n"
+" --assert-working-epoch\n"
+"\n"
+"Options:\n"
+" --admindir=<directory> Use <directory> instead of %s\n"
+" --root=<directory> Install on alternative system rooted elsewhere\n"
+" --instdir=<directory> Change inst'n root without changing admin dir\n"
+" -O|--selected-only Skip packages not selected for install/upgrade\n"
+" -E|--skip-same-version Skip packages whose same version is installed\n"
+" -G=--refuse-downgrade Skip packages with earlier version than "
+"installed\n"
+" -B|--auto-deconfigure Install even if it would break some other "
+"package\n"
+" --largemem | --smallmem Optimise for large (>4Mb) or small (<4Mb) RAM "
+"use\n"
+" --no-act Just say what we would do - don't do it\n"
+" -D|--debug=<octal> Enable debugging - see -Dhelp or --debug=help\n"
+" --ignore-depends=<package>,... Ignore dependencies involving <package>\n"
+" --force-... Override problems - see --force-help\n"
+" --no-force-...|--refuse-... Stop when problems encountered\n"
+"\n"
+"Comparison operators for --compare-versions are:\n"
+" lt le eq ne ge gt (treat no version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" < << <= = >= >> > (only for compatibility with control file syntax).\n"
+"\n"
+"Use `dselect' for user-friendly package management.\n"
msgstr ""
"Syntaxe: \n"
" dpkg -i|--install <nom fichier .deb> ... | -R|--recursive <rép> ...\n"
@@ -2120,33 +2161,38 @@
" -x|--extract|-X|--vextract|--fsys-tarfile sur les archives (taper %s "
"--help.)\n"
"\n"
-"For internal use: dpkg --assert-support-predepends | --predep-package |\n"
+"Pour usage interne: dpkg --assert-support-predepends | --predep-package |\n"
" --assert-working-epoch\n"
"\n"
"Options:\n"
-" --admindir=<directory> Use <directory> instead of %s\n"
-" --root=<directory> Install on alternative system rooted elsewhere\n"
-" --instdir=<directory> Change inst'n root without changing admin dir\n"
-" -O|--selected-only Skip packages not selected for install/upgrade\n"
-" -E|--skip-same-version Skip packages whose same version is installed\n"
-" -G=--refuse-downgrade Skip packages with earlier version tha\n"
-"installed\n"
-" -B|--auto-deconfigure Install even if it would break some othe\n"
-"package\n"
-" --largemem | --smallmem Optimise for large (>4Mb) or small (<4Mb) RA\n"
-"use\n"
-" --no-act Just say what we would do - don't do it\n"
-" -D|--debug=<octal> Enable debugging - see -Dhelp or --debug=help\n"
-" --ignore-depends=<package>,... Ignore dependencies involving <package>\n"
-" --force-... Override problems - see --force-help\n"
-" --no-force-...|--refuse-... Stop when problems encountered\n"
-"\n"
-"Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
-" < << <= = >= >> > (only for compatibility with control file syntax).\n"
+" --admindir=<répertoire> Utilise <répertoire> au lieu de %s\n"
+" --root=<répertoire> Installe ailleurs en utilisant une autre racine\n"
+" --instdir=<répertoire> Change la racine de l'installation mais\n"
+" utilise la même répertoire d'administration\n"
+" -O|--selected-only Saute les paquets non-sélectionnés pour\n"
+" une installation ou une mise à jour\n"
+" -E|--skip-same-version Saute les paquets installés de même version\n"
+" -G=--refuse-downgrade Saute les paquets plus vieux que ceux déjà\n"
+" installés\n"
+" -B|--auto-deconfigure Installe même en cas de conflit avec un autre\n"
+" paquet\n"
+" --largemem | --smallmem Optimise pour beaucoup (>4M) ou peu (<4M) \n"
+" d'utilisation de mémoire vive (RAM)\n"
+" --no-act Affiche seulement les actions qui auraient été\n"
+" faites - ne fait rien\n"
+" -D|--debug=<octal> Active le mode débogage - voir -Dhelp ou \n"
+" --debug=help\n"
+" --ignore-depends=<paquet>,... Ignore les dépendances concernant <paquet>\n"
+" --force-... Problème de forçage - voir --force-help\n"
+" --no-force-...|--refuse-... S'arrête quand un problème est trouvé\n"
+"\n"
+"Les opérateurs de comparaison pour --compare-versions sont:\n"
+" lt le eq ne ge gt (traite pas de version comme plus vieux que tout);\n"
+" lt-nl le-nl ge-nl gt-nl (traite pas de version comme plus récent que tout);\n"
+" < << <= = >= >> > (uniquement pour compatibilité avec la syntaxe des \n"
+" fichiers 'control').\n"
"\n"
-"Use `dselect' for user-friendly package management.\n"
+"Utilisez `dselect' pour une gestion plus simple des paquets.\n"
#: dpkg/main.c:117
msgid ""
@@ -3772,3 +3818,4 @@
#, c-format
msgid "%s: no files checked\n"
msgstr "%s: aucun fichiers vérifiés\n"
+
Reply to: