[SCM] smplayer/master: Drop all references to mplayer2

[mati75-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e6efefe2e55cd29fea2e6556d3dbd107ccacce44
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Mon Oct 24 21:23:55 2016 +0200

    Drop all references to mplayer2

diff --git a/debian/changelog b/debian/changelog
index 77b9426..fb67039 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+smplayer (16.9.0~ds0-2) UNRELEASED; urgency=medium
+
+  * Drop all references to mplayer2.
+
+ -- Mateusz Łukasik <mati75 at linuxmint.pl>  Mon, 24 Oct 2016 21:23:17 +0200
+
 smplayer (16.9.0~ds0-1) unstable; urgency=medium
 
   [ Mateusz Łukasik ]
diff --git a/debian/control b/debian/control
index f0744da..74f2510 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Depends:
 Recommends:
  smplayer-themes,
  smplayer-l10n
-Description: Complete front-end for MPlayer, MPlayer2 and mpv
+Description: Complete front-end for MPlayer and mpv
  Qt5 front-end for mplayer and forks, with basic features like playing
  videos, DVDs, and VCDs to more advanced features like support
  for MPlayer filters and more. One of the most interesting features
@@ -46,7 +46,7 @@ Replaces:
  smplayer (<< 0.5.62), smplayer-translations (<< 14.3.0)
 Breaks: 
  smplayer-translations (<< 14.3.0)
-Description: Complete front-end for MPlayer, MPlayer2 and mpv - translation files
+Description: Complete front-end for MPlayer and mpv - translation files
  Qt5 front-end for mplayer and forks, with basic features like playing
  videos, DVDs, and VCDs to more advanced features like support
  for MPlayer filters and more. One of the most interesting features
diff --git a/debian/patches/01-add-mplayer2-detection.patch b/debian/patches/01-add-mplayer2-detection.patch
deleted file mode 100644
index 3d73f59..0000000
--- a/debian/patches/01-add-mplayer2-detection.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Reinhard Tartler <siretart at tauware.de>
-Description: Detect that the binary is actually mplayer2
-Bug-Debian: http://bugs.debian.org/699864
-
-smplayer can handle mplayer2 if it detects its presence. Upstream's
-solution to rename mplayer to mplayer2 is not acceptable for
-Debian. Since executing the mplayer program to parse its version
-identification output is too heavy-weight, this change introduces a
-dpkg-specific, but light-weight check.
-
---- a/src/core.cpp
-+++ b/src/core.cpp
-@@ -29,6 +29,7 @@
- #endif
- 
- #include <cmath>
-+#include <unistd.h>
- 
- #include "mplayerwindow.h"
- #include "desktopinfo.h"
-@@ -1585,9 +1586,10 @@ void Core::startMplayer( QString file, d
- 	}
- 
- #ifdef MPLAYER2_SUPPORT
--	if (fi.baseName().toLower() == "mplayer2") {
-+	// debian/ubuntu specific check if we are using mplayer2
-+	if ((fi.baseName().toLower() == "mplayer2") || !access("/usr/share/doc/mplayer2/copyright", F_OK)) {
-+		qDebug("Core::startMplayer: this seems mplayer2");
- 		if (!pref->mplayer_is_mplayer2) {
--			qDebug("Core::startMplayer: this seems mplayer2");
- 			pref->mplayer_is_mplayer2 = true;
- 		}
- 	}
diff --git a/debian/patches/series b/debian/patches/series
index 21254f2..4878026 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-add-mplayer2-detection.patch
 02-disable_updates.patch
 04_update_desktop_launcher.patch
 05-add-debian-hardening-flags.patch

-- 
smplayer packaging