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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5bde9fd585abd2548a0b57b370d6c403ce1569dd
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 10 00:59:25 2012 +0100

    wrap-and-sort -a -s

diff --git a/debian/cinelerra-cv-data.install b/debian/cinelerra-cv-data.install
index c5af9d5..16caccc 100644
--- a/debian/cinelerra-cv-data.install
+++ b/debian/cinelerra-cv-data.install
@@ -1,2 +1,2 @@
-usr/share/locale
 usr/lib/cinelerra/fonts
+usr/share/locale
diff --git a/debian/cinelerra-cv.install b/debian/cinelerra-cv.install
index c424c0a..e84c8bc 100644
--- a/debian/cinelerra-cv.install
+++ b/debian/cinelerra-cv.install
@@ -1,7 +1,7 @@
 usr/bin/cinelerra
 usr/bin/mplexlo
-usr/lib/cinelerra/shapewipe
 usr/lib/cinelerra/*.so
+usr/lib/cinelerra/shapewipe
 usr/lib/libguicast*
 usr/share/applications
 usr/share/pixmaps
diff --git a/debian/cinelerra.install b/debian/cinelerra.install
index b8057d8..db09923 100644
--- a/debian/cinelerra.install
+++ b/debian/cinelerra.install
@@ -1,4 +1,4 @@
 usr/bin/cinelerra
 usr/bin/mplexlo
 usr/lib/cinelerra
-usr/share
\ No newline at end of file
+usr/share
diff --git a/debian/control b/debian/control
index 121fdc0..a445e95 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,13 @@ Source: cinelerra-cv
 Section: graphics
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Alessio Treglia <alessio at debian.org>
-Build-Depends-Indep: texlive-generic-recommended, texlive-latex-base
-Build-Depends: autotools-dev (>= 20100122.1~),
+Uploaders:
+ Alessio Treglia <alessio at debian.org>
+Build-Depends-Indep:
+ texlive-generic-recommended,
+ texlive-latex-base
+Build-Depends:
+ autotools-dev (>= 20100122.1~),
  debhelper (>= 7.0.50~),
  liba52-0.7.4-dev (>= 0.7.4),
  libasound2-dev (>= 1.0.4),
@@ -33,8 +37,9 @@ Build-Depends: autotools-dev (>= 20100122.1~),
  libtiff-dev,
  libtool (>= 1.5),
  libvorbis-dev (>= 1.0.0),
- libx11-dev, libxft-dev,
+ libx11-dev,
  libxext-dev,
+ libxft-dev,
  libxv-dev,
  libxxf86vm-dev (>=6.8.2),
  nasm [i386],
@@ -47,12 +52,16 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/cinelerra-cv.git
 Package: cinelerra-cv
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
  cinelerra-cv-data,
  ttf-bitstream-vera,
- ${misc:Depends}
-Recommends: mpeg3-utils
-Conflicts: libguicast, cinelerra
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ mpeg3-utils
+Conflicts:
+ cinelerra,
+ libguicast
 Description: An audio/video authoring tool (CV version)
  Cinelerra is a complete audio and video authoring tool. It understands a
  lot of multimedia formats (quicktime, avi, ogg) and audio/video compression
@@ -65,8 +74,9 @@ Description: An audio/video authoring tool (CV version)
 Package: cinelerra-cv-doc
 Section: doc
 Architecture: all
-Conflicts: cinelerra-doc
-Depends: ${misc:Depends},
+Conflicts:
+ cinelerra-doc
+Depends:
  ${misc:Depends}
 Description: An audio/video authoring tool - Documentation
  Cinelerra is a complete audio and video authoring tool. It understands a
@@ -79,8 +89,10 @@ Description: An audio/video authoring tool - Documentation
 Package: cinelerra-cv-data
 Section: graphics
 Architecture: all
-Conflicts: cinelerra-data
-Depends: ${misc:Depends}, ${misc:Depends}
+Conflicts:
+ cinelerra-data
+Depends:
+ ${misc:Depends}
 Description: An audio/video authoring tool
  Cinelerra is a complete audio and video authoring tool. It understands a
  lot of multimedia formats (quicktime, avi, ogg) and audio/video compression
@@ -90,8 +102,9 @@ Description: An audio/video authoring tool
 
 Package: libquicktimehv-1.6.0-1
 Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Architecture: any
 Description: Quicktime 4 Linux Cinelerra internal library
  Quicktime 4 Linux was the first convenient way to read and write
@@ -107,7 +120,8 @@ Description: Quicktime 4 Linux Cinelerra internal library
 
 Package: libquicktimehv-dev
 Section: libdevel
-Depends: libquicktimehv-1.6.0-1 (= ${binary:Version}),
+Depends:
+ libquicktimehv-1.6.0-1 (= ${binary:Version}),
  ${misc:Depends}
 Architecture: any
 Description: Quicktime 4 Linux (Cinelerra internal) library (development files)
@@ -126,10 +140,11 @@ Description: Quicktime 4 Linux (Cinelerra internal) library (development files)
 
 Package: libmpeg3hv-1.5.0-1
 Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Architecture: any
-Description: Advanced editing and manipulation of MPEG streams (cinelerra's internal) 
+Description: Advanced editing and manipulation of MPEG streams (cinelerra's internal)
  Libmpeg3 supports advanced editing and manipulation of MPEG streams. MPEG
  is normally a last mile format but with libmpeg3 you can edit it like a
  first mile solution.
@@ -141,7 +156,8 @@ Description: Advanced editing and manipulation of MPEG streams (cinelerra's inte
 
 Package: libmpeg3hv-dev
 Section: libdevel
-Depends: libmpeg3hv-1.5.0-1 (= ${binary:Version}),
+Depends:
+ libmpeg3hv-1.5.0-1 (= ${binary:Version}),
  ${misc:Depends}
 Architecture: any
 Description: Advanced editing and manipulation of MPEG streams (development files)
diff --git a/debian/libmpeg3hv-dev.install b/debian/libmpeg3hv-dev.install
index 9ca0fd9..004dd44 100644
--- a/debian/libmpeg3hv-dev.install
+++ b/debian/libmpeg3hv-dev.install
@@ -1,2 +1,2 @@
-usr/lib/libmpeg3hv.*
 usr/include/mpeg3hv/*
+usr/lib/libmpeg3hv.*
diff --git a/debian/libmpeg3hv.install b/debian/libmpeg3hv.install
index 06d2d8a..7b05241 100644
--- a/debian/libmpeg3hv.install
+++ b/debian/libmpeg3hv.install
@@ -1,2 +1,2 @@
-usr/lib/libmpeg3hv-*.so*
 usr/bin/mpeg*
+usr/lib/libmpeg3hv-*.so*
diff --git a/debian/libquicktimehv-dev.install b/debian/libquicktimehv-dev.install
index 06e5396..80a7a22 100644
--- a/debian/libquicktimehv-dev.install
+++ b/debian/libquicktimehv-dev.install
@@ -1,2 +1,2 @@
-usr/lib/libquicktimehv.*
 usr/include/quicktimehv/*
+usr/lib/libquicktimehv.*

-- 
cinelerra-cv packaging