Просмотр исходного кода

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>
Guillem Jover лет назад: 14
Родитель
Сommit
16b6174995
2 измененных файлов с 1 добавлено и 3 удалено
  1. 0 2
      debian/changelog
  2. 1 1
      dpkg-deb/build.c

+ 0 - 2
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.

+ 1 - 1
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);