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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0c5306032ad0731e38977a2b7d419bc22df0b466
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 4 18:27:49 2012 +0100

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

diff --git a/debian/control b/debian/control
index 49384a2..0abed09 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,14 @@ Source: dirac
 Section: libs
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Andres Mejia <amejia at debian.org>
+Uploaders:
+ Andres Mejia <amejia at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7),
- autoconf
-Build-Depends-Indep: doxygen-latex,
+Build-Depends:
+ autoconf,
+ debhelper (>= 7)
+Build-Depends-Indep:
+ doxygen-latex,
  graphviz
 Standards-Version: 3.9.2
 Homepage: http://diracvideo.org/
@@ -16,7 +19,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/dirac.git
 Package: dirac
 Architecture: any
 Section: video
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: open and royalty free high quality video codec - commandline utilities
  Dirac is an advanced royalty-free video compression format designed for a wide
  range of uses, from delivering low-resolution web content to broadcasting HD
@@ -26,9 +31,15 @@ Description: open and royalty free high quality video codec - commandline utilit
 
 Package: libdirac-decoder0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libdirac0, libdirac0c2a
-Conflicts: libdirac0, libdirac0c2a
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ libdirac0,
+ libdirac0c2a
+Conflicts:
+ libdirac0,
+ libdirac0c2a
 Description: open and royalty free high quality video codec - decoder library
  Dirac is an advanced royalty-free video compression format designed for a wide
  range of uses, from delivering low-resolution web content to broadcasting HD
@@ -38,9 +49,15 @@ Description: open and royalty free high quality video codec - decoder library
 
 Package: libdirac-encoder0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libdirac0, libdirac0c2a
-Conflicts: libdirac0, libdirac0c2a
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ libdirac0,
+ libdirac0c2a
+Conflicts:
+ libdirac0,
+ libdirac0c2a
 Description: open and royalty free high quality video codec - encoder library
  Dirac is an advanced royalty-free video compression format designed for a wide
  range of uses, from delivering low-resolution web content to broadcasting HD
@@ -51,9 +68,10 @@ Description: open and royalty free high quality video codec - encoder library
 Package: libdirac-dev
 Architecture: any
 Section: libdevel
-Depends: libdirac-decoder0 (= ${binary:Version}),
+Depends:
+ libdirac-decoder0 (= ${binary:Version}),
  libdirac-encoder0 (= ${binary:Version}),
- ${misc:Depends},
+ ${misc:Depends}
 Description: open and royalty free high quality video codec - development files
  Dirac is an advanced royalty-free video compression format designed for a wide
  range of uses, from delivering low-resolution web content to broadcasting HD
@@ -64,8 +82,10 @@ Description: open and royalty free high quality video codec - development files
 Package: libdirac-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Suggests: libdirac-dev (= ${source:Version})
+Depends:
+ ${misc:Depends}
+Suggests:
+ libdirac-dev (= ${source:Version})
 Description: open and royalty free high quality video codec - library documentation
  Dirac is an advanced royalty-free video compression format designed for a wide
  range of uses, from delivering low-resolution web content to broadcasting HD
diff --git a/debian/dirac.install b/debian/dirac.install
index 5623199..bc8f96e 100644
--- a/debian/dirac.install
+++ b/debian/dirac.install
@@ -1,2 +1,2 @@
-usr/bin/{BMP,RGB,UYVY,YUV}*
 usr/bin/dirac_*
+usr/bin/{BMP,RGB,UYVY,YUV}*
diff --git a/debian/libdirac-dev.install b/debian/libdirac-dev.install
index 4b01ce7..f7746e3 100644
--- a/debian/libdirac-dev.install
+++ b/debian/libdirac-dev.install
@@ -1,4 +1,4 @@
-usr/lib/pkgconfig
 usr/include
-usr/lib/libdirac_encoder.so
 usr/lib/libdirac_decoder.so
+usr/lib/libdirac_encoder.so
+usr/lib/pkgconfig

-- 
dirac packaging