[SCM] lives/master: Wrap and sort

Sat Aug 6 08:23:18 UTC 2011

The following commit has been merged in the master branch:
commit 707634fe68dc4b3381f464b58b780e3de8eb0445
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Aug 6 09:48:34 2011 +0200

    Wrap and sort

diff --git a/debian/control b/debian/control
index b97c084..995d282 100644
--- a/debian/control
+++ b/debian/control
@@ -2,35 +2,37 @@ Source: lives
 Section: video
 Priority: optional
 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>,
  Harry Rickards <hrickards at l33tmyst.com>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends:
+ autoconf,
+ automake,
  autotools-dev (>= 20100122.1~),
- libdirectfb-dev[!hurd-i386],
+ bison,
+ debhelper (>= 7.0.50~),
+ frei0r-plugins-dev [!kfreebsd-any !hurd-i386 !arm !avr32 !sparc64],
+ gettext,
  libaa1-dev,
+ libasound2-dev [linux-any],
+ libavc1394-dev [linux-any],
+ libdirac-dev[!m68k],
+ libdirectfb-dev[!hurd-i386],
+ libdv4-dev[!hurd-i386],
  libgtk2.0-dev (>= 2.16),
- bison,
  libjack-dev,
- libsdl1.2-dev,
- xutils-dev,
- autoconf,
- automake,
- libtool,
- gettext,
- libtheora-dev[!sparc64],
- frei0r-plugins-dev [!kfreebsd-any !hurd-i386 !arm !avr32 !sparc64],
  libogg-dev,
- libdv4-dev[!hurd-i386],
- libraw1394-dev [linux-any],
- libavc1394-dev [linux-any],
  liboil0.3-dev,
- libasound2-dev [linux-any],
  libpulse-dev,
- libvorbis-dev,
+ libraw1394-dev [linux-any],
+ libsdl1.2-dev,
+ libtheora-dev[!sparc64],
+ libtool,
  libv4l-dev [linux-any],
- libdirac-dev[!m68k],
- python-all (>= 2.6.6-3~)
+ libvorbis-dev,
+ python-all (>= 2.6.6-3~),
+ xutils-dev
 DM-Upload-Allowed: yes
 X-Python-Version: >= 2.5
 Homepage: http://lives.sourceforge.net/
@@ -39,31 +41,34 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/lives.git
 
 Package: lives
 Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- ${python:Depends},
- ${perl:Depends},
- mplayer,
- sox,
- imagemagick,
+Depends:
  frei0r-plugins[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !arm !powerpc],
+ imagemagick,
  libweed0 (>= ${source:Version}),
  lives-data,
+ mplayer,
  ogmtools[!hurd-i386],
- procps
-Recommends: icedax,
+ procps,
+ sox,
+ ${misc:Depends},
+ ${perl:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Recommends:
  dvgrab,
- mkvtoolnix,
- x11-utils,
- pulseaudio,
+ icedax,
+ libogg0,
  libtheora-bin,
  libtheora0,
- libogg0
-Suggests: python,
+ mkvtoolnix,
+ pulseaudio,
+ x11-utils
+Suggests:
+ ffmpeg,
  libdv-bin[!hurd-i386],
- mjpegtools,
  mencoder,
- ffmpeg
+ mjpegtools,
+ python
 Description: Video Editing system allowing users to edit and create video
  LiVES is a Video Editing system allowing both novice and advanced users
  to edit and create video straight away. It can also be used as a VJ tool,
@@ -72,8 +77,8 @@ Description: Video Editing system allowing users to edit and create video
 Package: libweed0
 Architecture: any
 Section: libs
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
 Description: Runtime library for inclusion of plugins into LiVES
  A library that was originally only available as part of LiVES (package
  lives) but is now available separately. Allows for the inclusion of
@@ -84,8 +89,8 @@ Description: Runtime library for inclusion of plugins into LiVES
 Package: libweed-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends},
- libweed0 (= ${binary:Version})
+Depends: libweed0 (= ${binary:Version}),
+ ${misc:Depends}
 Description: Development library for inclusion of plugins into LiVES
  A library that was originally only available as part of LiVES (package
  lives) but is now available separately. Allows for the inclusion of
@@ -95,8 +100,8 @@ Description: Development library for inclusion of plugins into LiVES
 
 Package: lives-data
 Architecture: all
-Depends: ${misc:Depends},
- python
+Depends: python,
+ ${misc:Depends}
 Description: Data files for LiVES
  LiVES is a Video Editing system allowing both novice and advanced users
  to edit and create video straight away. It can also be used as a VJ tool,
diff --git a/debian/copyright b/debian/copyright
index 2a947a9..204edbb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,7 +31,7 @@ Copyright:
 
     Copyright (C) 2002-2010 Gabriel Finch
     Copyright (C) 2004-2005 Marco De la Cruz
-    Copyright (C) 2001-2005 Fukuchi Kentaro 
+    Copyright (C) 2001-2005 Fukuchi Kentaro
     Copyright (C) 1998 The Regents of the University of California (Regents)
     Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc
     Copyright (C) 2009 Carles Carbonell Bernado
@@ -68,7 +68,7 @@ License:
     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
     OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS
     BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-     
+
     REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED
diff --git a/debian/lives-data.install b/debian/lives-data.install
index cfbfff4..3b11195 100644
--- a/debian/lives-data.install
+++ b/debian/lives-data.install
@@ -1,14 +1,14 @@
-usr/share/doc/lives-*/* usr/share/doc/lives
-usr/share/lives
-usr/share/locale
-usr/share/pixmaps
+usr/bin/build-lives-rfx-plugin
+usr/bin/build-lives-rfx-plugin-multi
+usr/bin/lives_avi_encoder
 usr/bin/lives_dirac_encoder
 usr/bin/lives_gif_encoder
 usr/bin/lives_mkv_encoder
 usr/bin/lives_mng_encoder
 usr/bin/lives_mpeg_encoder
 usr/bin/lives_ogm_encoder
-usr/bin/lives_avi_encoder
 usr/bin/lives_theora_encoder
-usr/bin/build-lives-rfx-plugin
-usr/bin/build-lives-rfx-plugin-multi
+usr/share/doc/lives-*/* usr/share/doc/lives
+usr/share/lives
+usr/share/locale
+usr/share/pixmaps

-- 
lives packaging

