[pkg-wine-party] [wine] 03/05: Refactor intra-source-package dependency versioning.
Jens Reyer
jreyer-guest at moszumanska.debian.org
Thu Sep 10 03:24:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
jreyer-guest pushed a commit to branch master
in repository wine.
commit bb5730e3cad5f1f97f41ca7bb3dfd83362a0c531
Author: Jens Reyer <jre.winesim at gmail.com>
Date: Wed Sep 9 17:06:26 2015 +0200
Refactor intra-source-package dependency versioning.
Make all dependencies versioned. General rules applied:
- arch:all depends on arch:all package:
(= ${source:Version})
- arch:all depends on arch:any package, or
arch:any depends on arch:any package NOT available on the same arch:
(>= ${source:Version})
(<< ${source:Version}.1~)
- arch:any depends on arch:all package:
(= ${source:Version})
- arch:any depends on arch:any package available on the same arch:
(= ${binary:Version})
This adds wineNN-preloader to the set of most other packages that is
interconnected by hard versioned dependencies.
Adding versions also to weaker dependencies (Recomends and Suggests), that
can't enforce version constraints, helps package managers and users to
find the non-conflicting package set.
This setup works for binNMUs. Still wine32 and wine64 conflict if one arch
was binNMU'ed because the libwine[-dbg|-dev] packages (Multi-Arch: same)
are not co-installable after a binNMU for one arch (automatically added
breaks self != binary:Version). This can be workarounded by another binNMU
for the arch lagging back. See https://bugs.debian.org/758616.
---
debian/control.in | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/debian/control.in b/debian/control.in
index 3cf3d52..9938c1a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -85,15 +85,14 @@ Depends:
x11-utils,
libncurses5,
libfreetype6,
- libwineVERSION (>= ${source:Version}),
- libwineVERSION (<< ${source:Version}.1~),
+ libwineVERSION (= ${binary:Version}),
Recommends:
- wineVERSION,
+ wineVERSION (= ${source:Version}),
libgl1-mesa-dri,
libwine-gecko-2.40 [!armhf !arm64],
libasound2-plugins,
Suggests:
- wine32VERSION-preloader,
+ wine32VERSION-preloader (= ${binary:Version}),
Description: Windows API implementation - 32-bit binary loader
Wine is a free MS-Windows API implementation.
This is still a work in progress and many applications may still not work.
@@ -107,15 +106,15 @@ Depends:
${misc:Depends},
${shlibs:Depends},
x11-utils,
- libwineVERSION (>= ${source:Version}),
- libwineVERSION (<< ${source:Version}.1~),
+ libwineVERSION (= ${binary:Version}),
Recommends:
- wineVERSION,
+ wineVERSION (= ${source:Version}),
wine32VERSION (>= ${source:Version}),
+ wine32VERSION (<< ${source:Version}.1~),
libwine-gecko-2.40 [!armhf !arm64],
libasound2-plugins,
Suggests:
- wine64VERSION-preloader,
+ wine64VERSION-preloader (= ${binary:Version}),
Description: Windows API implementation - 64-bit binary loader
Wine is a free MS-Windows API implementation.
This is still a work in progress and many applications may still not work.
@@ -127,7 +126,7 @@ Architecture: i386 powerpc armhf
Multi-Arch: foreign
Depends:
${misc:Depends},
- wine32VERSION,
+ wine32VERSION (= ${binary:Version}),
Description: Windows API implementation - prelinked 32-bit binary loader
Wine is a free MS-Windows API implementation.
This is still a work in progress and many applications may still not work.
@@ -139,7 +138,7 @@ Architecture: amd64
Multi-Arch: foreign
Depends:
${misc:Depends},
- wine64VERSION,
+ wine64VERSION (= ${binary:Version}),
Description: Windows API implementation - prelinked 64-bit binary loader
Wine is a free MS-Windows API implementation.
This is still a work in progress and many applications may still not work.
@@ -204,7 +203,7 @@ Depends:
Recommends:
libxcursor1,
fonts-liberation,
- fonts-wineVERSION,
+ fonts-wineVERSION (= ${source:Version}),
Suggests:
cups-bsd,
ttf-mscorefonts-installer,
@@ -225,7 +224,7 @@ Depends:
libwineVERSION (= ${binary:Version}),
libc6-dev,
Recommends:
- wine32VERSION-tools | wine64VERSION-tools,
+ wine32VERSION-tools (= ${binary:Version}) | wine64VERSION-tools (= ${binary:Version}),
Description: Windows API implementation - development files
Wine is a free MS-Windows API implementation.
This is still a work in progress and many applications may still not work.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git
More information about the pkg-wine-party
mailing list