[SCM] mjpegtools/master: normalize fields with wrap-and-sort(1)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e0a5a616e9b6f0457e0b47fb004c894057c2e243
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 1 12:18:42 2011 +0200

    normalize fields with wrap-and-sort(1)

diff --git a/debian/control b/debian/control
index f14bd3b..ec4ebfb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,21 @@ Source: mjpegtools
 Section: video
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>,
-           Reinhard Tartler <siretart at tauware.de>,
-           Maia Kozheva <sikon at ubuntu.com>
+Uploaders:
+ Fabian Greffrath <fabian at debian-unofficial.org>,
+ Reinhard Tartler <siretart at tauware.de>,
+ Maia Kozheva <sikon at ubuntu.com>
 Bugs: mailto:pkg-multimedia-maintainers at lists.alioth.debian.org
-Build-Depends: autotools-dev,
-               debhelper (>= 7.0.50~),
-               libdv4-dev,
-               libjpeg62-dev,
-               libgtk2.0-dev,
-               libpng12-dev,
-               libquicktime-dev (>= 2:1.0.0+debian),
-               libsdl1.2-dev,
-               pkg-config
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 7.0.50~),
+ libdv4-dev,
+ libgtk2.0-dev,
+ libjpeg62-dev,
+ libpng12-dev,
+ libquicktime-dev (>= 2:1.0.0+debian),
+ libsdl1.2-dev,
+ pkg-config
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-multimedia/mjpegtools.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mjpegtools.git
@@ -23,9 +25,11 @@ DM-Upload-Allowed: yes
 
 Package: mjpegtools
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Recommends: mjpegtools-gtk
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ mjpegtools-gtk
 Description: MJPEG capture/editing/replay and MPEG encoding toolset
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
@@ -35,11 +39,12 @@ Package: mjpegtools-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: mjpegtools (= ${binary:Version}),
-         mjpegtools-gtk (= ${binary:Version}),
-         libmjpegtools-1.10-0 (= ${binary:Version}),
-         libmjpegtools-dev (= ${binary:Version}),
-         ${misc:Depends}
+Depends:
+ libmjpegtools-1.10-0 (= ${binary:Version}),
+ libmjpegtools-dev (= ${binary:Version}),
+ mjpegtools (= ${binary:Version}),
+ mjpegtools-gtk (= ${binary:Version}),
+ ${misc:Depends}
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (debug)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
@@ -49,9 +54,10 @@ Description: MJPEG capture/editing/replay and MPEG encoding toolset (debug)
 
 Package: mjpegtools-gtk
 Architecture: any
-Depends: mjpegtools (= ${binary:Version}),
-         ${shlibs:Depends},
-         ${misc:Depends}
+Depends:
+ mjpegtools (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (GTK+ frontend)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
@@ -62,8 +68,9 @@ Description: MJPEG capture/editing/replay and MPEG encoding toolset (GTK+ fronte
 Package: libmjpegtools-1.10-0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (libraries)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
@@ -74,8 +81,9 @@ Description: MJPEG capture/editing/replay and MPEG encoding toolset (libraries)
 Package: libmjpegtools-dev
 Section: libdevel
 Architecture: any
-Depends: libmjpegtools-1.10-0 (= ${binary:Version}),
-         ${misc:Depends}
+Depends:
+ libmjpegtools-1.10-0 (= ${binary:Version}),
+ ${misc:Depends}
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (development)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
diff --git a/debian/copyright b/debian/copyright
index 5dcbd6e..3416ea2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -58,18 +58,18 @@ is taken as basis for improvements. Quote from that website:
 
     Sorry, there is no contact for MSSG: The authors of the MSSG
     software have disapeared and left no forwarding address.
-    
+
     The MSSG software is not maintained and provided "as-is".
-    
+
     No support of any sort is available. The MSSG software is known to
     contain a number of bugs and mistakes. You must find and fix the bugs
     yourself.
-    
+
     All the information we have is available is on this page.
-    
+
     The MSSG source code is a reference for a long-frozen standard
     document. Please post serious questions on the comp.compression
     newsgroup.
-    
+
 http://www.mpeg.org/MPEG/mpeg-pointers-and-resources/ implies that MSSG
 software is considered "public-domain" nowadays.
diff --git a/debian/libmjpegtools-dev.install b/debian/libmjpegtools-dev.install
index 0a949ad..fef8a79 100644
--- a/debian/libmjpegtools-dev.install
+++ b/debian/libmjpegtools-dev.install
@@ -1,5 +1,5 @@
 /usr/include/*
 /usr/lib/*.a
-/usr/lib/*.so
 /usr/lib/*.la
+/usr/lib/*.so
 /usr/lib/pkgconfig/*

-- 
mjpegtools packaging