diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-05-08 22:05:15 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-05-08 22:05:15 +0400 |
| commit | 881b7540fa4c3031dab15ca8c009af4ae27c7bf5 (patch) | |
| tree | 34c6576c17b30bb6496e0bd8896c2533aa7ad39a /dpkg-deb | |
| parent | 3377f43907699d3a528d919e165232982f4aee86 (diff) | |
| parent | b75d9bce9d03acbfd80ffd3eefafabcfbc07c454 (diff) | |
| download | dpkg-881b7540fa4c3031dab15ca8c009af4ae27c7bf5.tar.gz | |
Merge git://anonscm.debian.org/dpkg/dpkg
Conflicts:
debian/changelog
utils/start-stop-daemon.c
Diffstat (limited to 'dpkg-deb')
| -rw-r--r-- | dpkg-deb/build.c | 3 | ||||
| -rw-r--r-- | dpkg-deb/main.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c index 3b89f9135..a7a7c1124 100644 --- a/dpkg-deb/build.c +++ b/dpkg-deb/build.c @@ -604,7 +604,8 @@ do_build(const char *const *argv) m_dup2(p2[1],1); close(p2[0]); close(p2[1]); if (chdir(dir)) ohshite(_("failed to chdir to `%.255s'"), dir); - execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "-T", "-", "--no-recursion", NULL); + execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "--no-unquote", + "-T", "-", "--no-recursion", NULL); ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR); } close(p1[0]); diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c index 7c941ceb1..0815f91d3 100644 --- a/dpkg-deb/main.c +++ b/dpkg-deb/main.c @@ -166,7 +166,7 @@ set_deb_format(const struct cmdinfo *cip, const char *value) static void set_deb_old(const struct cmdinfo *cip, const char *value) { - deb_format = DEB_VERSION(0, 939000); + deb_format = DEB_VERSION_OBJECT(0, 939000); warning(_("obsolete option '--%s'; please use '--%s' instead"), cip->olong, "deb-format=0.939000"); @@ -175,7 +175,7 @@ set_deb_old(const struct cmdinfo *cip, const char *value) static void set_deb_new(const struct cmdinfo *cip, const char *value) { - deb_format = DEB_VERSION(2, 0); + deb_format = DEB_VERSION_OBJECT(2, 0); warning(_("obsolete option '--%s'; please use '--%s' instead"), cip->olong, "deb-format=2.0"); @@ -215,6 +215,8 @@ set_compress_type(const struct cmdinfo *cip, const char *value) ohshit(_("unknown compression type `%s'!"), value); if (compress_params.type == compressor_type_lzma) warning(_("deprecated compression type '%s'; use xz instead"), value); + if (compress_params.type == compressor_type_bzip2) + warning(_("deprecated compression type '%s'; use xz or gzip instead"), value); } static const struct cmdinfo cmdinfos[]= { |