The following commit has been merged in the master branch:
commit ebf44ab0ac66009617bc186d86f9b93ef38682f0
Merge: cfd00f6dac55d3a77ccccda7a7cee48e1d8a2958
2dc7e128e7e8087bf3677a34475fc5457ef33eb2
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Mon May 12 14:11:41 2008 +0200
Merge branch 'lenny'
Conflicts:
ChangeLog
configure.ac
debian/changelog
man/ChangeLog
po/ChangeLog
po/pt.po
diff --combined ChangeLog
index 60034cb,d2687b9..5f3fdd5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,34 -1,51 +1,82 @@@
+2008-05-11 Pierre Habouzit <[EMAIL PROTECTED]>
+
+ * lib/showpkg.c (show1package): Use %zd instead of %d in sprintf()
+ call with a size_t parameter.
+
+2008-05-11 Pierre Habouzit <[EMAIL PROTECTED]>
+
+ * scripts/update-alternatives.pl: add a --query option that works like
+ --display but outputs a machine parseable rfc822-like output.
+ * man/update-alternatives.8: document that new option, and the
+ associated format.
+
+2008-05-05 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-gensymbols.pl: Do not accept empty parameters for
+ -v, -P and -e.
+
+2008-05-05 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-shlibdeps.pl: Include the format of the desired
+ library in the "library not found" error message.
+
+2008-05-02 Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/update-alternatives.pl: Do not suggest manually changing
+ the alternative symlinks on verbose mode.
+
+2008-04-29 Guillem Jover <[EMAIL PROTECTED]>
+
+ * configure.ac: Bump version to 1.15.0~.
+
+ 2008-05-12 Guillem Jover <[EMAIL PROTECTED]>
+
+ * configure.ac: Bump version to 1.14.20~.
+
+ 2008-05-12 Guillem Jover <[EMAIL PROTECTED]>
+
+ * configure.ac: Release 1.14.19.
+
+ 2008-05-12 Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-gencontrol.pl: Get Package-Type field value also from
+ custom field.
+
+ 2008-05-11 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * src/processarc.c (process_archive): While removing files that
+ disappeared, move the call to namenodetouse before the test
+ that skips directory shared with other packages. This is required
+ because namenodetouse() handles trigger activation and we really
+ want directories containing (only) removed files to activate the
+ corresponding triggers.
+
+ 2008-05-08 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/Source/Package/V2.pm,
+ scripts/Dpkg/Source/Package/V3/quilt.pm: Ensure the
+ .dpkg-source-applied stamp file is created when an automatic patch
+ is created so that a second build doesn't try to mistakenly
+ reapply it.
+
+ 2008-05-08 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/Source/Functions.pm (is_binary): New function
+ to check if a file is binary by using diff against it.
+ * scripts/Dpkg/Source/Package/V2.pm: Check that all files from the
+ debian sub-directory are non-binary and only allow whitelisted
+ binary files.
+ * man/dpkg-source.1: Document this behaviour.
+
+ 2008-05-08 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/Changelog/Debian.pm (parse): Bugfix in creation of
+ an unexpected new changelog entry that lacks an header line.
+
+ 2008-05-04 Marco d'Itri <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/Source/Patch.pm: Add missing import of internerr.
+
2008-04-26 Raphael Hertzog <[EMAIL PROTECTED]>
* scripts/Dpkg/Source/Package.pm (upgrade_object_type): Instead
diff --combined debian/changelog
index c5ff7c6,a74a89d..de1a44e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,18 +1,38 @@@
+dpkg (1.15.0) UNRELEASED; urgency=low
+
+ [ Guillem Jover ]
+ * Do not suggest manually changing the alternative symlinks on
+ update-alternative's verbose mode. Closes: #412487
+
+ [ Raphael Hertzog ]
+ * Enhance dpkg-shlibdeps's error message when a library can't be found to
+ include the ELF format of the desired library. Closes: #474671
+ * dpkg-gensymbols now refuses empty values for the the -v -P and -e
+ parameters.
+
+ [ Pierre Habouzit ]
+ * Add a --query option to update-alternatives. Closes: #336091, #441904
+
+ [ Updated dpkg translations ]
+ * Portuguese (Miguel Figueiredo).
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Tue, 29 Apr 2008 06:01:40 +0300
+
- dpkg (1.14.19) UNRELEASED; urgency=low
+ dpkg (1.14.20) UNRELEASED; urgency=low
+
+ *
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Mon, 12 May 2008 09:04:34 +0300
+
+ dpkg (1.14.19) unstable; urgency=low
[ Guillem Jover ]
* Fix a double-free by setting scontext to NULL after calling freecon.
Based on a patch by Russell Coker. Closes: #474339
+ * Add missing import of internerr in Dpkg::Source::Patch.pm.
+ Thanks to Marco d'Itri. Closes: #479205
+ * Consider also custom Package-Type fields when printing warnings in
+ dpkg-gencontrol. Closes: #452273
[ Raphael Hertzog ]
* Add missing import of subprocerr in Dpkg::Source::Package. Thanks to Sven
@@@ -52,30 -42,49 +62,49 @@@
For example "1.0" and "1.1" would both map to Dpkg::Source::Package::V1
instead of ::V1_0 and ::V1_1 before. Similarly "3.0 (quilt)" now maps to
::V3::quilt instead of ::V3_0::quilt.
-
+ * Fix changelog parser to not fail when an unexpected changelog entry
+ appears without the preceding heading line. Closes: #478925
+ * Change the "2.0" and "3.0 (quilt)" source packages to refuse by default
+ binary files in the debian sub-directory. They have to be whitelisted
+ through debian/source/include-binaries. Closes: #473041
+ * Make sure triggers are activated when a file is removed in a directory
+ shared by multiple packages. Closes: #479850
+
[ Helge Kreutzmann ]
* Minor fixes and clarifications to man pages.
[ Updated dpkg translations ]
+ * Brazilian Portuguese (Felipe Augusto van de Wiel). Closes: #480579
+ * Czech (Miroslav Kure).
+ * French (Florent Ussel).
* Galician (Jacobo Tarrio).
* German (Sven Joachim).
- * Polish (Robert Luberda).
+ * Polish (Wiktor Wandachowicz).
* Portuguese (Miguel Figueiredo).
+ * Russian (Yuri Kozlov). Closes: #478827
+ * Slovak (Ivan Masár). Closes: #478897
* Swedish (Peter Karlsson).
[ Updated manpages translations ]
* German (Helge Kreutzmann).
+ * Polish (Wiktor Wandachowicz).
* Swedish (Peter Karlsson).
[ Updated scripts translations ]
* German (Helge Kreutzmann).
- * Polish (Robert Luberda).
+ * Polish (Wiktor Wandachowicz).
+ * Russian (Yuri Kozlov). Closes: #479142
* Swedish (Peter Karlsson).
[ Updated dselect translations ]
+ * Brazilian Portuguese (Felipe Augusto van de Wiel).
+ * Czech (Miroslav Kure).
+ * French (Christian Perrier).
* German (Sven Joachim).
+ * Russian (Yuri Kozlov). Closes: #478802
+ * Slovak (Ivan Masár). Closes: #479007
- -- Jacobo Tarrio <[EMAIL PROTECTED]> Fri, 11 Apr 2008 22:46:48 +0100
+ -- Guillem Jover <[EMAIL PROTECTED]> Mon, 12 May 2008 08:33:07 +0300
dpkg (1.14.18) unstable; urgency=low
diff --combined man/ChangeLog
index dfdf947,3232957..8784ee4
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@@ -1,12 -1,38 +1,47 @@@
+2008-05-11 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * dpkg-source.1: Properly escape hyphen in -i option.
+
+2008-05-05 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * dpkg-source.1: Improve explanation of -i when used with
+ VCS-based source packages.
+
+ 2008-05-12 Guillem Jover <[EMAIL PROTECTED]>
+
+ * po/dpkg-man.pot: Regenerated.
+ * po/*.po: Merged with dpkg-man.pot.
+
+ 2008-05-10 Sven Joachim <[EMAIL PROTECTED]>
+
+ * po/de.po: Fix typos.
+
+ 2008-05-09 Helge Kreutzmann <[EMAIL PROTECTED]>
+
+ * po/de.po: Updated to 1584t0f17u.
+
+ 2008-05-09 Peter Karlsson <[EMAIL PROTECTED]>
+
+ * po/sv.po: Updated to 1601t.
+
+ 2008-04-21 Helge Kreutzmann <[EMAIL PROTECTED]>
+
+ * po/dpkg-man.pot: Regenerated.
+ * po/*.po: Merged with dpkg-man.pot.
+ * po/de.po: Updated to 1583t0f18u. (and correct mistakes)
+
+ 2008-05-05 Wiktor Wandachowicz <[EMAIL PROTECTED]>
+
+ * pl.po: Updated to 1543t58u.
+
+ 2008-04-21 Helge Kreutzmann <[EMAIL PROTECTED]>
+
+ * po/de.po: Updated to 1583t0f18u.
+
+ 2008-04-29 Peter Karlsson <[EMAIL PROTECTED]>
+
+ * po/sv.po: Updated to 1601t.
+
2008-04-29 Guillem Jover <[EMAIL PROTECTED]>
* po/dpkg-man.pot: Regenerated.
diff --combined man/dpkg-source.1
index 252bfdc,cccfc2e..8b17478
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@@ -122,12 -122,11 +122,12 @@@ files. Supported values are
You may specify a perl regular expression to match files you want
filtered out of the list of files for the diff. (This list is
generated by a find command.) (If the source package is being built as a
-version 3 source package using a VCS, this is instead used to
-ignore uncommitted files.) \fB\-i\fP by itself enables the option,
-with a default that will filter out control files and directories of the
-most common revision control systems, backup and swap files and Libtool
-build output directories. There can only be one active regexp, of multiple
+version 3 source package using a VCS, this can be used to ignore
+uncommited changes on specific files. Using \-i.* will ignore all of them.)
+\fB\-i\fP by itself enables the option, with a default regexp that will
+filter out control files and directories of the most common revision
+control systems, backup and swap files and Libtool build output
+directories. There can only be one active regexp, of multiple
\fB\-i\fP options only the last one will take effect.
This is very helpful in cutting out extraneous files that get included
@@@ -379,7 -378,9 +379,9 @@@ and the diff (if non-empty) is stored i
on a binary file is not representable in a diff and will thus lead to a
failure unless the maintainer deliberately decided to include that
modified binary file in the debian tarball (by listing it in
- \fBdebian/source/include-binaries\fP).
+ \fBdebian/source/include-binaries\fP). The build will also fail if it
+ finds binary files in the debian sub-directory unless they have been
+ whitelisted through \fBdebian/source/include-binaries\fP.
The updated debian directory and the list of modified binaries is then
used to regenerate the debian tarball.
diff --combined po/pt.po
index ae4a406,e86f43f..28f380e
--- a/po/pt.po
+++ b/po/pt.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: dpkg 1.14\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
- "POT-Creation-Date: 2008-04-29 06:58+0300\n"
+ "POT-Creation-Date: 2008-05-12 08:17+0300\n"
"PO-Revision-Date: 2008-05-02 22:36+0100\n"
"Last-Translator: Miguel Figueiredo <[EMAIL PROTECTED]>\n"
"Language-Team: Portuguese <[EMAIL PROTECTED]>\n"
@@@ -1077,7 -1077,8 +1077,8 @@@ msgid "
"triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
"%.250s': %.250s"
msgstr ""
- "o ficheiro `%.250s' de triggers ci contém sintaxe ilegal de trigger no
trigger com o nome `%.250s': %.250s"
+ "o ficheiro `%.250s' de triggers ci contém sintaxe ilegal de trigger no "
+ "trigger com o nome `%.250s': %.250s"
#: lib/triglib.c:605
#, c-format
@@@ -2461,7 -2462,7 +2462,7 @@@ msgstr "unlink
msgid "chmod"
msgstr "chmod"
- #: src/help.c:552 src/processarc.c:738
+ #: src/help.c:552 src/processarc.c:740
msgid "delete"
msgstr "delete"
@@@ -2641,10 -2642,10 +2642,10 @@@ msgstr "
" -G|--refuse-downgrade Saltar pacotes com versão anterior à "
"instalada.\n"
" -B|--auto-deconfigure Instalar mesmo que estrague um outro pacote.\n"
-" --[no-]-triggers\t Saltar ou forçar o processamento de triggers.\n"
-" --no-debsig\t\t Não tentar verificar a assinatura dos pacotes.\n"
+" --[no-]-triggers Saltar ou forçar o processamento de triggers.\n"
+" --no-debsig Não tentar verificar a assinatura dos
pacotes.\n"
" --no-act|--dry-run|--simulate\n"
-"\t\t\t Dizer apenas o que iria fazer - não o fazer.\n"
+" Dizer apenas o que iria fazer - não o fazer.\n"
" -D|--debug=<octal> Activar a depuração (ver -Dhelp ou --"
"debug=help).\n"
" --status-fd <n> Enviar actualizações de mudança de estado para "
@@@ -2652,8 -2653,8 +2653,8 @@@
" --log=<ficheiro> Registar mudanças de estado e acções para "
"<ficheiro>.\n"
" --ignore-depends=<pacote>,...\n"
-"\t\t\t Ignorar as dependências envolvendo <pacote>.\n"
-" --force-...\t\t Ultrapassar problemas (ver --force-help).\n"
+" Ignorar as dependências envolvendo <pacote>.\n"
+" --force-... Ultrapassar problemas (ver
--force-help).\n"
" --no-force-...|--refuse-...\n"
" Parar quando forem encontrados problemas.\n"
" --abort-after <n> Abortar após encontrar <n> erros.\n"
@@@ -2752,7 -2753,7 +2753,7 @@@ msgstr "
" 200 conffdetail Muita saída para cada ficheiro de configuração\n"
" 40 depcon Dependências e conflitos\n"
" 400 depcondetail Muita saída de dependências e conflitos\n"
-" 10000 triggers\t Activação e processamento de triggers\n"
+" 10000 triggers Activação e processamento de triggers\n"
" 20000 triggersdetail Muita saída acerca de triggers\n"
" 40000 triggersstupid Quantidades parvas de saída acerca de triggers\n"
" 1000 veryverbose Muitas asneiras sobre eg o directório
dpkg/info\n"
@@@ -2970,7 -2971,8 +2971,8 @@@ msgstr " A versão de %s no sistema �
#: src/packages.c:375
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
- msgstr " O pacote %s que disponibiliza %s aguarda pelo processamento de
trigger..\n"
+ msgstr ""
+ " O pacote %s que disponibiliza %s aguarda pelo processamento de trigger..\n"
#: src/packages.c:379
#, c-format
@@@ -3180,19 -3182,19 +3182,19 @@@ msgstr "
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: zap possível rasto de zeros"
- #: src/processarc.c:648
+ #: src/processarc.c:650
#, c-format
msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it:
%s"
msgstr ""
"dpkg: aviso - não foi possível fazer stat ao ficheiro antigo `%.250s' por "
"isso não será apagado: %s"
- #: src/processarc.c:656
+ #: src/processarc.c:658
#, c-format
msgid "dpkg: warning - unable to delete old directory `%.250s': %s\n"
msgstr "dpkg: aviso - não foi possível apagar o ficheiro antigo `%.250s':
%s\n"
- #: src/processarc.c:660
+ #: src/processarc.c:662
#, c-format
msgid ""
"dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
@@@ -3201,12 -3203,12 +3203,12 @@@ msgstr "
"dpkg: aviso - ficheiro de configuração antigo `%.250s' era um directório "
"vazio (e agora foi apagado)\n"
- #: src/processarc.c:690
+ #: src/processarc.c:692
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "Não foi possível fazer stat a outro novo ficheiro `%.250s'"
- #: src/processarc.c:701
+ #: src/processarc.c:703
#, c-format
msgid ""
"dpkg: warning - old file `%.250s' is the same as several new files! (both `"
@@@ -3215,70 -3217,70 +3217,70 @@@ msgstr "
"dpkg: aviso - o ficheiro antigo `%.250s' é o mesmo que vários novos "
"ficheiros! (ambos `%.250s' e `%.250s')\n"
- #: src/processarc.c:742
+ #: src/processarc.c:744
#, c-format
msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
msgstr "dpkg: aviso - não foi possível %s o ficheiro antigo `%%.250s': %%s\n"
- #: src/processarc.c:778 src/processarc.c:1026 src/remove.c:297
+ #: src/processarc.c:780 src/processarc.c:1028 src/remove.c:297
msgid "cannot read info directory"
msgstr "não pode ler directório info"
- #: src/processarc.c:791
+ #: src/processarc.c:793
#, c-format
msgid "old version of package has overly-long info file name starting
`%.250s'"
msgstr ""
"a antiga versão do pacote tem um nome de ficheiro demasiado comprido "
"começando por `%.250s'"
- #: src/processarc.c:803
+ #: src/processarc.c:805
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "não foi possível remover o ficheiro de info obsoleto `%.250s'"
- #: src/processarc.c:806
+ #: src/processarc.c:808
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "não foi possível instalar (o suposto) novo ficheiro info `%.250s'"
- #: src/processarc.c:813
+ #: src/processarc.c:815
msgid "unable to open temp control directory"
msgstr "não foi possível abrir o directório temporário de controle"
- #: src/processarc.c:822
+ #: src/processarc.c:824
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"o pacote contém um ficheiro de info de control com o nome de ficheiro "
"demasiado comprido (começando por `%.50s')"
- #: src/processarc.c:827
+ #: src/processarc.c:829
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "a informação de controle do pacote contém o directório `%.250s'"
- #: src/processarc.c:829
+ #: src/processarc.c:831
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"rmdir de info de controle do pacote `%.250s' não disse que não era um dir"
- #: src/processarc.c:835
+ #: src/processarc.c:837
#, c-format
msgid "dpkg: warning - package %s contained list as info file"
msgstr "dpkg: aviso - o pacote %s continha lista como ficheiro info"
- #: src/processarc.c:842
+ #: src/processarc.c:844
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "não foi possível instalar o novo ficheiro info `%.250s' como `%.250s'"
- #: src/processarc.c:1005
+ #: src/processarc.c:1007
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(A notar o desaparecimento de %s, que foi totalmente substituído.)\n"
- #: src/processarc.c:1042
+ #: src/processarc.c:1044
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "não é possível apagar ficheiro de controle info desaparecido `%.250s'"
@@@ -5628,7 -5630,8 +5630,8 @@@ msgstr "
" --list <nome> mostrar todos os alvos do grupo <nome>.\n"
" --config <nome> mostrar alternativas para o grupo <nome> e
pedir\n"
" ao utilizador para escolher um para utilizar.\n"
- " --set <nome> <caminho> definir o <caminho> como alternativa para
<nome>.\n"
+ " --set <nome> <caminho> definir o <caminho> como alternativa para "
+ "<nome>.\n"
" --all chamar --config para todas as alternativas.\n"
"\n"
"<link> é o link simbólico que aponta para %s/<nome>.\n"
@@@ -5643,7 -5646,7 +5646,7 @@@
"Opções:\n"
" --altdir <directório> alterar o directório de alternativas.\n"
" --admindir <directório> alterar o directório de administrativo.\n"
-" --verbose\t\t operação detalhada, mais texto na saída.\n"
+" --verbose operação detalhada, mais texto na saída.\n"
" --quiet operação silenciosa, texto reduzido na saída.\n"
" --help mostrar esta mensagem de ajuda.\n"
" --version mostrar a versão.\n"
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
