On 2012-04-14 09:17 +0200, Guillem Jover wrote:
> The following commit has been merged in the master branch:
> commit a354992c67411ed10499786012701faa33ed8565
> Author: Guillem Jover <guil...@debian.org>
> Date: Sat Apr 14 04:26:52 2012 +0200
>
> dpkg-deb: Add epoch when needed to built package names
>
> The upstream part of the version can already contain colons, so there's
> no reason not to add it for the epoch, and this allows to store on the
> same directory packages with same version but different epoch.
>
> Closes: #551323
This seems to break dpkg-genchanges, e.g. when building acpid:
,----
| dpkg-deb: building package `acpid' in `../acpid_1:2.0.16-1_i386.deb'.
| dpkg-deb: building package `kacpimon' in `../kacpimon_1:2.0.16-1_i386.deb'.
| dpkg-genchanges >../acpid_2.0.16-1_i386.changes
| dpkg-genchanges: including full source code in upload
| dpkg-genchanges: error: cannot fstat file ../acpid_2.0.16-1_i386.deb: No such
file or directory
| dpkg-buildpackage: error: dpkg-genchanges gave error exit status 2
`----
> diff --git a/debian/changelog b/debian/changelog
> index a299312..214e240 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -27,6 +27,8 @@ 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 7efb244..d44b3a6 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_never);
> + versionstring = versiondescribe(&pkg->available.version, vdew_nonambig);
> 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);
Cheers,
Sven
--
To UNSUBSCRIBE, email to debian-dpkg-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87aa2e64to....@turtle.gmx.de
