Package: mplayer Version: 2:1.3.0-1 Followup-For: Bug #823589 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following: * Add mplayer2 transitional package to fix upgrades (LP: #1580268) So, I noticed after fixing this in Ubuntu that you fixed it in Debian git 48 hours ago. Your fix is, however, incomplete (notice the extra parts of my diff that aren't included in your commit, where I version the Replaces, and change the Conflict to a versioned Breaks). It would be lovely if you swapped in my fix for yours (at least the missing bits). ... Adam -- System Information: Debian Release: stretch/sid APT prefers yakkety APT policy: (500, 'yakkety') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-21-lowlatency (SMP w/4 CPU cores; PREEMPT) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru mplayer-1.3.0/debian/control mplayer-1.3.0/debian/control --- mplayer-1.3.0/debian/control 2016-04-17 13:14:24.000000000 -0600 +++ mplayer-1.3.0/debian/control 2016-05-10 11:57:44.000000000 -0600 @@ -147,6 +147,16 @@ (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and video resizing capabilities. +# This can be dropped after yakkety/stretch release, whichever is later: +Package: mplayer2 +Section: oldlibs +Architecture: all +Multi-Arch: foreign +Depends: mplayer (>= 2:1.2) +Description: transitional package from mplayer2 to mplayer + This package exists to upgrade mplayer2 users to mplayer; it can be safely + removed once the upgrade has been performed. + Package: mplayer Architecture: any Multi-Arch: foreign @@ -163,9 +173,9 @@ mencoder (<< 2:1.0~rc3+svn20090426-2), mplayer-doc (<< 2:1.0~rc3+svn20090426-2), mplayer-nogui (<< 2:1.0~rc3+svn20090426-2), - mplayer2 -Conflicts: - mplayer2 + mplayer2 (<< 2:1.2) +Breaks: + mplayer2 (<< 2:1.2) Description: movie player for Unix-like systems MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
