[SCM] mpeg2dec/master: wrap-and-sort -a

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Feb 14 19:15:49 UTC 2012


The following commit has been merged in the master branch:
commit 42a375debc0e557f1051db5e9f83137fae06d05b
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Feb 14 20:15:36 2012 +0100

    wrap-and-sort -a
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index 20fed2a..5d9a3d1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,15 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Loic Minier <lool at dooz.org>,
            David I. Lehn <dlehn at debian.org>,
            Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 5),
+Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
-               libsdl1.2-dev (>= 1.2.3),
-               autotools-dev,
+               debhelper (>= 5),
                dpkg-dev (>= 1.13.19),
                gnome-pkg-tools (>= 0.7),
+               libsdl1.2-dev (>= 1.2.3),
                libx11-dev,
-               libxv-dev,
-               libxext-dev
+               libxext-dev,
+               libxv-dev
 Standards-Version: 3.8.0
 Homepage: http://libmpeg2.sourceforge.net/
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/mpeg2dec.git
@@ -22,9 +22,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/mpeg2dec.git
 Package: libmpeg2-4-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends},
-         libmpeg2-4 (= ${binary:Version}),
-         pkg-config
+Depends: libmpeg2-4 (= ${binary:Version}),
+         pkg-config,
+         ${misc:Depends}
 Description: libmpeg2 development libraries and headers
  libmpeg2 is a library which can decode MPEG1 and MPEG2 video streams.
  .
diff --git a/debian/copyright b/debian/copyright
index 0c1d88f..0b63604 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -59,4 +59,3 @@ mpeg2dec is Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
 
 On Debian systems, the complete text of the GNU General Public License can
 be found in `/usr/share/common-licenses/GPL'.
-
diff --git a/debian/libmpeg2-4-dev.install b/debian/libmpeg2-4-dev.install
index 23077b8..b1f733e 100644
--- a/debian/libmpeg2-4-dev.install
+++ b/debian/libmpeg2-4-dev.install
@@ -1,8 +1,8 @@
 usr/include/mpeg2dec/mpeg2.h
 usr/include/mpeg2dec/mpeg2convert.h
-usr/lib/pkgconfig/libmpeg2.pc
-usr/lib/pkgconfig/libmpeg2convert.pc
 usr/lib/libmpeg2.a
 usr/lib/libmpeg2.so
 usr/lib/libmpeg2convert.a
 usr/lib/libmpeg2convert.so
+usr/lib/pkgconfig/libmpeg2.pc
+usr/lib/pkgconfig/libmpeg2convert.pc
diff --git a/debian/mpeg2dec.install b/debian/mpeg2dec.install
index ec0f68a..43b26bb 100644
--- a/debian/mpeg2dec.install
+++ b/debian/mpeg2dec.install
@@ -1,3 +1,3 @@
-usr/bin/mpeg2dec
 usr/bin/extract_mpeg2
+usr/bin/mpeg2dec
 usr/share/man

-- 
mpeg2dec packaging



More information about the pkg-multimedia-commits mailing list