[SCM] mplayer/master: Remove duplicate Depends field and run wrap-and-sort.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Tue May 24 15:04:15 UTC 2016


The following commit has been merged in the master branch:
commit aafc7eff2c86d0db5caa6bef69d1b56b4f1e2c89
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Tue May 24 06:02:12 2016 -0400

    Remove duplicate Depends field and run wrap-and-sort.
    
    Gbp-Dch: Ignore

diff --git a/debian/control b/debian/control
index 93a0fee..3d869bb 100644
--- a/debian/control
+++ b/debian/control
@@ -197,11 +197,12 @@ Description: documentation for MPlayer
  are included in the regular MPlayer package.
 
 Package: mplayer2
-Depends: mplayer, ${misc:Depends}
+Depends:
+ mplayer (>= 2:1.2),
+ ${misc:Depends}
 Architecture: all
 Section: oldlibs
 Multi-Arch: foreign
-Depends: mplayer (>= 2:1.2)
 Description: transitional dummy package for mplayer
  This is a transitional dummy package to get upgrading systems to install
  the mplayer package. It can safely be removed once no other package
diff --git a/debian/copyright b/debian/copyright
index 69eb00d..4369165 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -364,4 +364,3 @@ License: Expat
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
-

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list