[SCM] libdvbpsi/master: wrap-and-sort -a -s

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f8fc1b1da0b3db11d2e2874d3ada8419a4f8b5ab
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Dec 30 20:13:45 2012 +0000

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

diff --git a/debian/control b/debian/control
index 6172050..ce95a08 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: libdvbpsi
 Section: libs
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
-           Christophe Mutricy <xtophe at videolan.org>
-Build-Depends: debhelper (>= 5.0)
+Uploaders:
+ Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
+ Christophe Mutricy <xtophe at videolan.org>
+Build-Depends:
+ debhelper (>= 5.0)
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/libdvbpsi.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libdvbpsi.git
@@ -12,7 +14,9 @@ Homepage: http://www.videolan.org/developers/libdvbpsi.html
 
 Package: libdvbpsi8
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: library for MPEG TS and DVB PSI tables decoding and generating
  libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
  decoding and generating.
@@ -22,8 +26,16 @@ Description: library for MPEG TS and DVB PSI tables decoding and generating
 Package: libdvbpsi-dev
 Section: libdevel
 Architecture: any
-Depends: libdvbpsi8 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libdvbpsi0-dev, libdvbpsi1-dev, libdvbpsi2-dev, libdvbpsi3-dev, libdvbpsi4-dev, libdvbpsi5-dev
+Depends:
+ libdvbpsi8 (= ${binary:Version}),
+ ${misc:Depends}
+Conflicts:
+ libdvbpsi0-dev,
+ libdvbpsi1-dev,
+ libdvbpsi2-dev,
+ libdvbpsi3-dev,
+ libdvbpsi4-dev,
+ libdvbpsi5-dev
 Description: development files for libdvbpsi8
  libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
  decoding and generating.
diff --git a/debian/libdvbpsi-dev.install b/debian/libdvbpsi-dev.install
index a17410d..c8c6b3a 100644
--- a/debian/libdvbpsi-dev.install
+++ b/debian/libdvbpsi-dev.install
@@ -1,4 +1,4 @@
-/usr/lib/*.so
-/usr/lib/*.a
 /usr/include
+/usr/lib/*.a
+/usr/lib/*.so
 /usr/lib/pkgconfig

-- 
libdvbpsi packaging