diff options
| author | Guillem Jover <guillem@debian.org> | 2012-04-15 10:02:57 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2012-04-15 10:38:10 +0200 |
| commit | 16b6174995dadd3cb6f136603b8b2c4471b7e9c2 (patch) | |
| tree | 46c1ec9cf55ddc6c8bee2599c8bdb8fa0e136d60 | |
| parent | b2cdea1f2c9abd3123067c04b0d04dd90b45c5f2 (diff) | |
| download | dpkg-16b6174995dadd3cb6f136603b8b2c4471b7e9c2.tar.gz | |
Revert "dpkg-deb: Add epoch when needed to built package names"
This reverts commit a354992c67411ed10499786012701faa33ed8565.
There seems to be several tools with bogus assumptions about the format
of binary package filenames, when they should either just be using the
filenames from .changes files, the Filename field from Packages files,
or the arguments from the command-line. Unforuntately all those bogus
tools need to be fixed first before this change can be considered again,
which right now gets in the way of the upcoming dpkg release.
Also the matching change in dpkg-gencontrol was missing in that commit,
which has been...
Reported-by: Sven Joachim <svenjoac@gmx.de>
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | dpkg-deb/build.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 214e240dd..a2993128f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,8 +27,6 @@ dpkg (1.16.3) UNRELEASED; urgency=low current locale (although this was only affecting the old deb format). * Ignore the minor format version number for deb-split format, unifying the behaviour with the deb format. - * Add epoch when needed to package names generated by dpkg-deb. - Closes: #551323 [ Helge Kreutzmann ] * Fix a typo in man/dpkg-buildflags.1. diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c index 0bc2fd581..690ed8003 100644 --- a/dpkg-deb/build.c +++ b/dpkg-deb/build.c @@ -373,7 +373,7 @@ pkg_get_pathname(const char *dir, struct pkginfo *pkg) char *path; const char *versionstring, *arch_sep; - versionstring = versiondescribe(&pkg->available.version, vdew_nonambig); + versionstring = versiondescribe(&pkg->available.version, vdew_never); arch_sep = pkg->available.arch->type == arch_none ? "" : "_"; m_asprintf(&path, "%s/%s_%s%s%s%s", dir, pkg->set->name, versionstring, arch_sep, pkg->available.arch->name, DEBEXT); |