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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4442e0ba08e2be3065730a9825c76f1301c6dab6
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 19:45:08 2012 +0200

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

diff --git a/debian/control.in b/debian/control.in
index ae40dd7..73e3f31 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,32 +2,36 @@ Source: gmerlin-encoders
 Section: libs
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Alessio Treglia <alessio at debian.org>,
+Uploaders:
+ Alessio Treglia <alessio at debian.org>,
  IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.3
-Build-Depends: @cdbs@,
+Build-Depends:
+ @cdbs@,
+ libavcodec-dev,
+ libavformat-dev,
+ libflac-dev,
  libgavl-dev (>= 1.2.0),
  libgmerlin-dev (>= 1.2.0~),
- libflac-dev,
- libogg-dev,
- libvorbis-dev,
- libtheora-dev,
- libspeex-dev,
  libmp3lame-dev,
- libavcodec-dev,
- libavformat-dev,
+ libogg-dev,
  libpostproc-dev,
+ libshout3-dev,
+ libspeex-dev,
  libswscale-dev,
- libshout3-dev
+ libtheora-dev,
+ libvorbis-dev
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/gmerlin-encoders.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/gmerlin-encoders.git
 
 Package: gmerlin-encoders-ffmpeg
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Enhances: gmerlin
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Enhances:
+ gmerlin
 Description: ffmpeg encoders for Gmerlin
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -40,9 +44,11 @@ Description: ffmpeg encoders for Gmerlin
 
 Package: gmerlin-encoders-good
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Enhances: gmerlin
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Enhances:
+ gmerlin
 Description: patent-free encoders for Gmerlin
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
diff --git a/debian/gmerlin-encoders-ffmpeg.install b/debian/gmerlin-encoders-ffmpeg.install
index 50b8625..2822b58 100644
--- a/debian/gmerlin-encoders-ffmpeg.install
+++ b/debian/gmerlin-encoders-ffmpeg.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/gmerlin/plugins/e_ffmpeg_audio.so
 debian/tmp/usr/lib/gmerlin/plugins/e_ffmpeg.so
+debian/tmp/usr/lib/gmerlin/plugins/e_ffmpeg_audio.so
 debian/tmp/usr/lib/gmerlin/plugins/e_ffmpeg_video.so
diff --git a/debian/gmerlin-encoders-good.install b/debian/gmerlin-encoders-good.install
index 1a27cbc..74367a6 100644
--- a/debian/gmerlin-encoders-good.install
+++ b/debian/gmerlin-encoders-good.install
@@ -1,6 +1,6 @@
+debian/tmp/usr/lib/gmerlin/plugins/e_flac.so
 debian/tmp/usr/lib/gmerlin/plugins/e_flacogg.so
+debian/tmp/usr/lib/gmerlin/plugins/e_lame.so
 debian/tmp/usr/lib/gmerlin/plugins/e_speex.so
 debian/tmp/usr/lib/gmerlin/plugins/e_theora.so
 debian/tmp/usr/lib/gmerlin/plugins/e_vorbis.so
-debian/tmp/usr/lib/gmerlin/plugins/e_flac.so
-debian/tmp/usr/lib/gmerlin/plugins/e_lame.so

-- 
gmerlin-encoders packaging