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

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Apr 25 17:17:17 UTC 2012 

The following commit has been merged in the master branch:
commit e240134ab8f0def0c6c8b56d5bd978b9f85ce2a8
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Apr 25 19:17:05 2012 +0200

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

diff --git a/debian/control b/debian/control
index 2a5e6c5..c22397f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,23 @@ Source: snd
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Alessio Treglia <alessio at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
- ladspa-sdk,
- xutils-dev,
- libgsl0-dev (>= 1.1.1),
+Uploaders:
+ Alessio Treglia <alessio at debian.org>
+Build-Depends:
  autotools-dev (>= 20100122.1~),
+ bzip2,
+ debhelper (>= 7.0.50~),
+ ladspa-sdk,
+ libasound2-dev [linux-any],
  libfftw3-dev (>= 2.1.3),
+ libgsl0-dev (>= 1.1.1),
  libgtk2.0-dev (>= 2.9),
- libsamplerate0-dev,
- libxmu-dev,
- libpulse-dev,
  libjack-dev [i386 amd64 powerpc kfreebsd-i386 kfreebsd-amd64 hurd-i386],
- libasound2-dev [linux-any],
  libmpc-dev (>= 0.8),
- bzip2
+ libpulse-dev,
+ libsamplerate0-dev,
+ libxmu-dev,
+ xutils-dev
 Standards-Version: 3.9.1
 Homepage: http://ccrma.stanford.edu/software/snd/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/snd.git
@@ -24,9 +26,13 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/snd.git;a=summary
 
 Package: snd
 Architecture: all
-Depends: ${misc:Depends}
-Recommends: guile, ladspa-plugin
-Suggests: snd-doc
+Depends:
+ ${misc:Depends}
+Recommends:
+ guile,
+ ladspa-plugin
+Suggests:
+ snd-doc
 Description: Sound file editor
  Snd is a powerful sound file editor that can be customized and extended using
  the Scheme programming language.
@@ -38,7 +44,8 @@ Description: Sound file editor
 Package: snd-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: Sound file editor (documentation)
  Snd is a powerful sound file editor that can be customized and extended using
  the Scheme programming language.
@@ -46,16 +53,30 @@ Description: Sound file editor (documentation)
  This package contains the documentation for snd.
 
 Package: snd-gtk-jack
-Architecture: any-i386 any-amd64 any-powerpc
-Provides: snd-gtk-alsa [linux-any], snd-gtk
-Depends: snd (>= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif, snd-gtk-alsa,
- snd-gtk-pulse
-Breaks: snd-gtk (<< 11-3)
-Replaces: snd (<< 5.10), snd-dmotif, snd-dmotif-alsa, snd-smotif,
- snd-gtk-alsa, snd-gtk (<< 11-3), snd-gtk-pulse
+Architecture: any-amd64 any-i386 any-powerpc
+Provides:
+ snd-gtk,
+ snd-gtk-alsa [linux-any]
+Depends:
+ snd (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ snd-dmotif,
+ snd-dmotif-alsa,
+ snd-gtk-alsa,
+ snd-gtk-pulse,
+ snd-smotif
+Breaks:
+ snd-gtk (<< 11-3)
+Replaces:
+ snd (<< 5.10),
+ snd-dmotif,
+ snd-dmotif-alsa,
+ snd-gtk (<< 11-3),
+ snd-gtk-alsa,
+ snd-gtk-pulse,
+ snd-smotif
 Description: Sound file editor (GTK+ user interface - JACK)
  Snd is a powerful sound file editor that can be customized and extended using
  the Scheme programming language.
@@ -65,15 +86,29 @@ Description: Sound file editor (GTK+ user interface - JACK)
 
 Package: snd-gtk-pulse
 Architecture: any
-Provides: snd-gtk-alsa [linux-any], snd-gtk
-Depends: snd (>= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif, snd-gtk-alsa,
- snd-gtk-jack
-Breaks: snd-gtk (<< 11-3)
-Replaces: snd (<< 5.10), snd-dmotif, snd-dmotif-alsa, snd-smotif,
- snd-gtk-alsa, snd-gtk (<< 11-3), snd-gtk-jack
+Provides:
+ snd-gtk,
+ snd-gtk-alsa [linux-any]
+Depends:
+ snd (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ snd-dmotif,
+ snd-dmotif-alsa,
+ snd-gtk-alsa,
+ snd-gtk-jack,
+ snd-smotif
+Breaks:
+ snd-gtk (<< 11-3)
+Replaces:
+ snd (<< 5.10),
+ snd-dmotif,
+ snd-dmotif-alsa,
+ snd-gtk (<< 11-3),
+ snd-gtk-alsa,
+ snd-gtk-jack,
+ snd-smotif
 Description: Sound file editor (GTK+ user interface - PulseAudio)
  Snd is a powerful sound file editor that can be customized and extended using
  the Scheme programming language.
@@ -83,17 +118,32 @@ Description: Sound file editor (GTK+ user interface - PulseAudio)
 
 Package: snd-nox
 Architecture: any
-Depends: snd (>= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Provides: snd-nox-alsa [linux-any]
-Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif, snd-gtk-alsa,
- snd-gtk-jack, snd-gtk-pulse
-Breaks: snd-gtk (<< 11-3),
- snd-nox-alsa (<< 11.2-2)
-Replaces: snd (<< 5.10), snd-dmotif, snd-dmotif-alsa, snd-smotif,
- snd-gtk-alsa, snd-gtk (<< 11-3), snd-gtk-jack, snd-gtk-pulse,
+Depends:
+ snd (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides:
+ snd-nox-alsa [linux-any]
+Conflicts:
+ snd-dmotif,
+ snd-dmotif-alsa,
+ snd-gtk-alsa,
+ snd-gtk-jack,
+ snd-gtk-pulse,
+ snd-smotif
+Breaks:
+ snd-gtk (<< 11-3),
  snd-nox-alsa (<< 11.2-2)
+Replaces:
+ snd (<< 5.10),
+ snd-dmotif,
+ snd-dmotif-alsa,
+ snd-gtk (<< 11-3),
+ snd-gtk-alsa,
+ snd-gtk-jack,
+ snd-gtk-pulse,
+ snd-nox-alsa (<< 11.2-2),
+ snd-smotif
 Description: Sound file editor (without X support)
  Snd is a powerful sound file editor that can be customized and extended using
  the Scheme programming language.
@@ -102,7 +152,8 @@ Description: Sound file editor (without X support)
 
 Package: snd-nox-alsa
 Architecture: all
-Depends: snd-nox (>= ${source:Version}),
+Depends:
+ snd-nox (>= ${source:Version}),
  ${misc:Depends}
 Description: Sound file editor (dummy transitional package)
  Snd is a powerful sound file editor that can be customized and extended using
@@ -113,8 +164,9 @@ Description: Sound file editor (dummy transitional package)
 
 Package: snd-gtk
 Architecture: all
-Depends: ${misc:Depends},
- snd-gtk-pulse (>= ${source:Version}) | snd-gtk-jack (>= ${source:Version})
+Depends:
+ snd-gtk-pulse (>= ${source:Version}) | snd-gtk-jack (>= ${source:Version}),
+ ${misc:Depends}
 Description: Sound file editor (dummy transitional package)
  Snd is a powerful sound file editor that can be customized and extended using
  the Scheme programming language.
diff --git a/debian/copyright b/debian/copyright
index 0d5b33f..1c63f28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ Thomas Klausner:                    the NetBSD port.
 Steve Beet:                         minGW
 
 Plus many other contributions from
-  Fernando Lopez-Lezcano, 
+  Fernando Lopez-Lezcano,
   Tom Roth,
   Fabio Furlanete,
   Rick Taube,
@@ -37,8 +37,8 @@ Plus many other contributions from
 
 License: other
  Snd is a sound editor written by Bill Schottstaedt (bil at ccrma.stanford.edu).
- Except where otherwise noted, it is Copyright 1996-2006 The Board of Trustees 
- of Stanford University.	
+ Except where otherwise noted, it is Copyright 1996-2006 The Board of Trustees
+ of Stanford University.
  .
  The authors hereby grant permission to use, copy, modify, distribute,
  and license this software and its documentation for any purpose.  No
@@ -99,10 +99,10 @@ Files: ./dlocsig.scm
 Copyright: 1992-2001 Fernando Lopez Lezcano <nando at ccrma.stanford.edu>
 License: other
  Use and copying of this software and preparation of derivative works
- based upon this software are permitted and may be copied as long as 
+ based upon this software are permitted and may be copied as long as
  no fees or compensation are charged for use, copying, or accessing
  this software and all copies of this software include this copyright
- notice. Suggestions, comments and bug reports are welcome. Please 
+ notice. Suggestions, comments and bug reports are welcome. Please
  address email to: nando at ccrma.stanford.edu
 
 Files: ./gl2ps.*
@@ -131,7 +131,7 @@ X-Comment: GL2PS license text
  or other form of this software, or via a mechanism generally accepted
  in the software development community for the electronic transfer of
  data.
-. 
+.
  This software is provided "as is" without express or implied warranty.
 
 Files: ./pretty-print.scm
diff --git a/debian/snd-doc.install b/debian/snd-doc.install
index 16fdca3..4c7b061 100644
--- a/debian/snd-doc.install
+++ b/debian/snd-doc.install
@@ -1,4 +1,4 @@
 *.html  usr/share/doc/snd-doc/HTML/manual
+index.html usr/share/doc/snd-doc/HTML/tutorial
 pix/*.png   usr/share/doc/snd-doc/HTML/manual/pix
 tutorial/* usr/share/doc/snd-doc/HTML/tutorial
-index.html usr/share/doc/snd-doc/HTML/tutorial
diff --git a/debian/snd-gtk-jack.install b/debian/snd-gtk-jack.install
index 454a1d2..b15e3af 100644
--- a/debian/snd-gtk-jack.install
+++ b/debian/snd-gtk-jack.install
@@ -1,2 +1,2 @@
-snd usr/bin
 debian/snd.xpm usr/share/pixmaps
+snd usr/bin
diff --git a/debian/snd-gtk-pulse.install b/debian/snd-gtk-pulse.install
index 454a1d2..b15e3af 100644
--- a/debian/snd-gtk-pulse.install
+++ b/debian/snd-gtk-pulse.install
@@ -1,2 +1,2 @@
-snd usr/bin
 debian/snd.xpm usr/share/pixmaps
+snd usr/bin
diff --git a/debian/snd-nox.install b/debian/snd-nox.install
index 454a1d2..b15e3af 100644
--- a/debian/snd-nox.install
+++ b/debian/snd-nox.install
@@ -1,2 +1,2 @@
-snd usr/bin
 debian/snd.xpm usr/share/pixmaps
+snd usr/bin

-- 
snd packaging

More information about the pkg-multimedia-commits mailing list