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

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Fri Aug 23 15:05:54 UTC 2013


The following commit has been merged in the master branch:
commit 896c0048772898bcfc28ab4cf8c91e5805fab4f4
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Aug 23 14:44:40 2013 +0200

    wrap-and-sort -a -s

diff --git a/debian/ardour3-altivec.install b/debian/ardour3-altivec.install
index 6bfb2eb..a4f7757 100644
--- a/debian/ardour3-altivec.install
+++ b/debian/ardour3-altivec.install
@@ -1,6 +1,6 @@
+debian/ardour.desktop usr/share/applications
+debian/tmp/altivec/etc/ardour3* etc/
 debian/tmp/altivec/usr/bin/ardour3 usr/bin
 debian/tmp/altivec/usr/lib*	usr/
 debian/tmp/altivec/usr/share/ardour3 usr/share/
 debian/tmp/altivec/usr/share/locale usr/share/
-debian/tmp/altivec/etc/ardour3* etc/
-debian/ardour.desktop usr/share/applications
diff --git a/debian/ardour3-i686.install b/debian/ardour3-i686.install
index b6a615a..3a35198 100644
--- a/debian/ardour3-i686.install
+++ b/debian/ardour3-i686.install
@@ -1,6 +1,6 @@
+debian/ardour.desktop usr/share/applications
+debian/tmp/i686/etc/ardour3* etc/
 debian/tmp/i686/usr/bin/ardour3 usr/bin
 debian/tmp/i686/usr/lib*	usr/
 debian/tmp/i686/usr/share/ardour3 usr/share/
 debian/tmp/i686/usr/share/locale usr/share/
-debian/tmp/i686/etc/ardour3* etc/
-debian/ardour.desktop usr/share/applications
diff --git a/debian/ardour3-opt.install b/debian/ardour3-opt.install
index 33e876f..0a23191 100644
--- a/debian/ardour3-opt.install
+++ b/debian/ardour3-opt.install
@@ -1,6 +1,6 @@
+debian/ardour.desktop usr/share/applications
+debian/tmp/@optarch@/etc/ardour3* etc/
 debian/tmp/@optarch@/usr/bin/ardour3 usr/bin
 debian/tmp/@optarch@/usr/lib*	usr/
 debian/tmp/@optarch@/usr/share/ardour3 usr/share/
 debian/tmp/@optarch@/usr/share/locale usr/share/
-debian/tmp/@optarch@/etc/ardour3* etc/
-debian/ardour.desktop usr/share/applications
diff --git a/debian/control b/debian/control
index 36707ad..c6f12e4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,50 +2,52 @@ Source: ardour3
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>,
+Uploaders:
+ Adrian Knoth <adi at drcomp.erfurt.thur.de>,
  Jaromír Mikeš <mira.mikes at seznam.cz>
-Build-Depends: cdbs,
+Build-Depends:
  autotools-dev,
- devscripts,
+ cdbs,
  debhelper (>= 9),
+ devscripts,
  dh-buildinfo,
  gettext,
  intltool,
+ ladspa-sdk (>= 1.1-2),
+ libasound2-dev (>= 0.9.4),
+ libaubio-dev (>= 0.3.2),
  libboost-dev (>= 1.49.0),
+ libcairomm-1.0-dev (>= 1.10.0),
  libcurl4-gnutls-dev (>= 7.25.0),
  libfftw3-dev (>= 3.3.1),
- libraptor2-dev (>= 2.0.9),
- librdf0-dev (>= 1.0.15),
- liblrdf0-dev (>= 0.4.0),
- libserd-dev (>= 0.18.2~),
- libsord-dev (>= 0.12.0~),
- libsuil-dev (>= 0.6.10~),
- liblilv-dev,
- libsratom-dev (>= 0.4.2~),
- libsigc++-2.0-dev (>= 2.2.10),
- libusb-dev,
- uuid-dev,
- libxml2-dev (>= 2.5.7),
- librasqal3-dev (>= 0.9.28),
- libcairomm-1.0-dev (>= 1.10.0),
  libgnomecanvas2-dev (>= 2.30.3),
  libgnomecanvasmm-2.6-dev (>= 2.26.0),
  libgtkmm-2.4-dev (>= 2.24.2),
- libpangomm-1.4-dev (>= 2.28.4),
- ladspa-sdk (>= 1.1-2),
- libasound2-dev (>= 0.9.4),
- libaubio-dev (>= 0.3.2),
  libjack-dev,
+ liblilv-dev,
  liblo-dev (>= 0.26~),
+ liblrdf0-dev (>= 0.4.0),
+ libpangomm-1.4-dev (>= 2.28.4),
+ libpcre3-dev,
+ libraptor2-dev (>= 2.0.9),
+ librasqal3-dev (>= 0.9.28),
+ librdf0-dev (>= 1.0.15),
  libsamplerate0-dev (>= 0.1.8),
+ libserd-dev (>= 0.18.2~),
+ libsigc++-2.0-dev (>= 2.2.10),
  libsndfile1-dev (>= 1.0.25),
+ libsord-dev (>= 0.12.0~),
  libsoundtouch-dev (>= 1.5.0),
+ libsratom-dev (>= 0.4.2~),
+ libsuil-dev (>= 0.6.10~),
+ libusb-dev,
+ libxml2-dev (>= 2.5.7),
  lv2-dev (>= 1.2.0),
- vamp-plugin-sdk (>=2.1),
- python-setuptools,
  python-isodate,
- libpcre3-dev,
- python-rdflib
+ python-rdflib,
+ python-setuptools,
+ uuid-dev,
+ vamp-plugin-sdk (>=2.1)
 Standards-Version: 3.9.4
 Homepage: http://www.ardour.org/
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/ardour3.git
@@ -53,18 +55,23 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/ardour3.git
 
 Package: ardour3
 Architecture: any
-Depends: ${shlibs:Depends},
- ${python:Depends},
+Depends:
+ ${cdbs:Depends},
  ${misc:Depends},
- ${cdbs:Depends}
-Recommends: ${cdbs:Recommends}
-Suggests: ${shlibs:Suggests}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
+ ${python:Depends},
+ ${shlibs:Depends}
+Recommends:
+ ${cdbs:Recommends}
+Suggests:
+ ${shlibs:Suggests}
+Conflicts:
+ ${cdbs:Conflicts}
+Replaces:
+ ${cdbs:Replaces}
 Description: digital audio workstation (graphical gtk2 interface)
  Ardour is a multichannel hard disk recorder (HDR) and digital audio
  workstation (DAW).  It can be used to control, record, edit and run
- complex audio setups. 
+ complex audio setups.
  .
  Ardour supports pro-audio interfaces
  through the ALSA project, which provides high quality, well designed
@@ -115,4 +122,3 @@ Description: digital audio workstation (graphical gtk2 interface)
  .
  Further information can be
  found at <http://ardour.org/>.
-
diff --git a/debian/control.in b/debian/control.in
index 4212ad5..ce3bb20 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,9 +2,11 @@ Source: ardour3
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>,
+Uploaders:
+ Adrian Knoth <adi at drcomp.erfurt.thur.de>,
  Jaromír Mikeš <mira.mikes at seznam.cz>
-Build-Depends: @cdbs@
+Build-Depends:
+ @cdbs@
 Standards-Version: 3.9.4
 Homepage: http://www.ardour.org/
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/ardour3.git
@@ -12,18 +14,23 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/ardour3.git
 
 Package: ardour3
 Architecture: any
-Depends: ${shlibs:Depends},
- ${python:Depends},
+Depends:
+ ${cdbs:Depends},
  ${misc:Depends},
- ${cdbs:Depends}
-Recommends: ${cdbs:Recommends}
-Suggests: ${shlibs:Suggests}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
+ ${python:Depends},
+ ${shlibs:Depends}
+Recommends:
+ ${cdbs:Recommends}
+Suggests:
+ ${shlibs:Suggests}
+Conflicts:
+ ${cdbs:Conflicts}
+Replaces:
+ ${cdbs:Replaces}
 Description: digital audio workstation (graphical gtk2 interface)
  Ardour is a multichannel hard disk recorder (HDR) and digital audio
  workstation (DAW).  It can be used to control, record, edit and run
- complex audio setups. 
+ complex audio setups.
  .
  Ardour supports pro-audio interfaces
  through the ALSA project, which provides high quality, well designed
@@ -74,4 +81,3 @@ Description: digital audio workstation (graphical gtk2 interface)
  .
  Further information can be
  found at <http://ardour.org/>.
-

-- 
ardour3 packaging



More information about the pkg-multimedia-commits mailing list