[SCM] mpv/master: Drop mplayer2 transitional package
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Mon Jun 19 09:30:31 UTC 2017
The following commit has been merged in the master branch:
commit b601ea6b43cd61179f3321b42cbe1ab52728aa03
Author: James Cowgill <jcowgill at debian.org>
Date: Mon Jun 19 10:30:16 2017 +0100
Drop mplayer2 transitional package
diff --git a/debian/control b/debian/control
index 5545d73..ddf752e 100644
--- a/debian/control
+++ b/debian/control
@@ -97,15 +97,3 @@ Description: video player based on MPlayer/mplayer2 (client library dev files)
variety of video file formats, audio and video codecs, and subtitle types.
.
This package provides development files for libmpv.
-
-Package: mplayer2
-Section: oldlibs
-Architecture: all
-Depends: mpv, ${misc:Depends}
-Multi-Arch: foreign
-Replaces: mplayer
-Conflicts: mplayer
-Description: transitional dummy package for mpv
- This is a transitional dummy package to get upgrading systems to install
- the mpv package. It can safely be removed once no other package depends
- on it.
diff --git a/debian/mplayer2.NEWS b/debian/mplayer2.NEWS
deleted file mode 100644
index 56b19a9..0000000
--- a/debian/mplayer2.NEWS
+++ /dev/null
@@ -1,10 +0,0 @@
-mpv (0.21.0-2) unstable; urgency=medium
-
- As mplayer2 is no longer developed and has been removed from Debian Stretch,
- the mplayer2 package now contains a symbolic link redirecting mplayer to
- mpv - a fork of mplayer2.
-
- While mpv is similar to mplayer2, a number of options have changed and the
- configuration is now stored in ~/.config/mpv instead of ~/.mplayer.
-
- -- James Cowgill <jcowgill at debian.org> Sun, 23 Oct 2016 12:42:47 +0100
diff --git a/debian/mplayer2.links b/debian/mplayer2.links
deleted file mode 100644
index 8dafcdd..0000000
--- a/debian/mplayer2.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/mpv usr/bin/mplayer
-usr/share/man/man1/mpv.1.gz usr/share/man/man1/mplayer.1.gz
diff --git a/debian/rules b/debian/rules
index 249a6ba..9f9fae3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
export DEB_BUILD_MAINT_OPTIONS := hardening=+all # #741439, #799738
-PACKAGE_VERSION = $(shell dpkg-parsechangelog -SVersion)
-
%:
dh $@
@@ -29,10 +27,6 @@ override_dh_auto_install:
override_dh_installchangelogs:
dh_installchangelogs RELEASE_NOTES
-override_dh_gencontrol:
- dh_gencontrol -pmplayer2 -- -v3:$(PACKAGE_VERSION)
- dh_gencontrol --remaining-packages
-
override_dh_auto_clean:
test -s ./waf && python ./waf -v distclean || true
find . -name "*.pyc" -delete
--
mpv packaging
More information about the pkg-multimedia-commits
mailing list