[SCM] ogmrip/master: Apply wrap-and-sort

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dfbfc692b6ab7a8ef573ce7dee73f596a0cb72b6
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sat Jun 7 22:59:40 2014 +0200

    Apply wrap-and-sort

diff --git a/debian/control b/debian/control
index b6e1e3d..835bad6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,26 @@ Source: ogmrip
 Section: video
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders:
- Alessio Treglia <alessio at debian.org>
-Build-Depends:
- debhelper (>= 9~),
- dh-autoreconf,
- gtk-doc-tools,
- intltool,
- libdbus-glib-1-dev (>= 0.7.2),
- libdvdread-dev (>= 4.1.3-4),
- libenca-dev,
- libenchant-dev,
- libgconf2-dev,
- libglade2-dev,
- libnotify-dev (>= 0.7),
- libtheora-dev,
- libtiff-dev,
- libtool,
- libvorbis-dev,
- libx264-dev,
- libxml-parser-perl,
- zlib1g-dev
+Uploaders: Alessio Treglia <alessio at debian.org>,
+           Rico Tzschichholz <ricotz at ubuntu.com>
+Build-Depends: debhelper (>= 9~),
+               dh-autoreconf,
+               gtk-doc-tools,
+               intltool,
+               libdbus-glib-1-dev (>= 0.7.2),
+               libdvdread-dev (>= 4.1.3-4),
+               libenca-dev,
+               libenchant-dev,
+               libgconf2-dev,
+               libglade2-dev,
+               libnotify-dev (>= 0.7),
+               libtheora-dev,
+               libtiff-dev,
+               libtool,
+               libvorbis-dev,
+               libx264-dev,
+               libxml-parser-perl,
+               zlib1g-dev
 Standards-Version: 3.9.4
 Homepage: http://ogmrip.sourceforge.net
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/ogmrip.git
@@ -30,30 +29,26 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/ogmrip.git
 
 Package: ogmrip
 Architecture: any
-Depends:
- gpac,
- lame (>= 3.96),
- mencoder,
- mkvtoolnix (>= 0.9.5),
- mplayer-nogui | mplayer,
- ogmrip-plugins (= ${binary:Version}),
- ogmtools,
- tesseract-ocr | ocrad | gocr,
- vorbis-tools (>= 1.0),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends:
- ogmrip-ac3,
- ogmrip-dirac,
- ogmrip-doc,
- ogmrip-mpeg,
- ogmrip-oggz,
- ogmrip-profiles,
- ogmrip-video-copy
-Replaces:
- libogmrip0
-Conflicts:
- libogmrip0
+Depends: gpac,
+         lame (>= 3.96),
+         mencoder,
+         mkvtoolnix (>= 0.9.5),
+         mplayer-nogui | mplayer,
+         ogmrip-plugins (= ${binary:Version}),
+         ogmtools,
+         tesseract-ocr | ocrad | gocr,
+         vorbis-tools (>= 1.0),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: ogmrip-ac3,
+            ogmrip-dirac,
+            ogmrip-doc,
+            ogmrip-mpeg,
+            ogmrip-oggz,
+            ogmrip-profiles,
+            ogmrip-video-copy
+Replaces: libogmrip0
+Conflicts: libogmrip0
 Description: Application for ripping and encoding DVD
  ogmrip is an application and a set of libraries for ripping and encoding
  DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It
@@ -71,16 +66,11 @@ Description: Application for ripping and encoding DVD
 Package: ogmrip-plugins
 Architecture: any
 Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Enhances: ogmrip
-Breaks:
- ogmrip (<< 0.13.8-1~)
-Replaces:
- ogmrip (<< 0.13.8-1~)
+Breaks: ogmrip (<< 1.0.1-1~)
+Replaces: ogmrip (<< 1.0.1-1~)
 Description: Application for ripping and encoding DVD - plugins
  ogmrip is an application and a set of libraries for ripping and encoding
  DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It
@@ -92,8 +82,7 @@ Description: Application for ripping and encoding DVD - plugins
 Package: ogmrip-doc
 Architecture: all
 Section: doc
-Depends:
- ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Application for ripping and encoding DVD - Documentation files
  ogmrip is an application and a set of libraries for ripping and encoding
  DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It
@@ -114,11 +103,8 @@ Package: libogmrip1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Application for ripping and encoding DVD - libraries files
  ogmrip is an application and a set of libraries for ripping and encoding
  DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It
@@ -139,14 +125,13 @@ Package: libogmrip-dev
 Architecture: any
 Section: libdevel
 Multi-Arch: same
-Depends:
- intltool,
- libdvdread-dev,
- libenca-dev,
- libgconf2-dev,
- libglade2-dev,
- libogmrip1 (= ${binary:Version}),
- ${misc:Depends}
+Depends: intltool,
+         libdvdread-dev,
+         libenca-dev,
+         libgconf2-dev,
+         libglade2-dev,
+         libogmrip1 (= ${binary:Version}),
+         ${misc:Depends}
 Description: Application for ripping and encoding DVD - development files
  ogmrip is an application and a set of libraries for ripping and encoding
  DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It

-- 
ogmrip packaging