Bug#559526: ardour: Synching Ubuntu Patches

Dmitrijs Ledkovs dmitrij.ledkov at gmail.com
Sat Dec 5 05:06:56 UTC 2009


Package: ardour
Version: 1:2.8.4-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu lucid ubuntu-patch

Dear Debian maintainer =)

I would like to propose following patches for inclusion in debian package. If
decided to include all of them, there won't be any delta carried in Ubuntu.

This patches are made against your git repo, so you can apply them with git am.

I really hope you are going to include all of them.

Questions and comments welcome =)

-- System Information:
Debian Release: squeeze/sid
  APT prefers karmic-updates
  APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 'karmic-proposed'), (500, 'karmic-backports'), (500, 'karmic')
Architecture: i386 (i686)

Kernel: Linux 2.6.31-15-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
-------------- next part --------------
>From 27aaed63cf235a2f7c0b93b37dbf4e7de89ed33b Mon Sep 17 00:00:00 2001
From: Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>
Date: Sat, 5 Dec 2009 04:44:26 +0000
Subject: [PATCH 1/4] Added mimetype handles to i686 and altivec optimized builds as well

---
 debian/ardour-altivec.sharedmimeinfo |    8 ++++++++
 debian/ardour-i686.sharedmimeinfo    |    8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 debian/ardour-altivec.sharedmimeinfo
 create mode 100644 debian/ardour-i686.sharedmimeinfo

diff --git a/debian/ardour-altivec.sharedmimeinfo b/debian/ardour-altivec.sharedmimeinfo
new file mode 100644
index 0000000..c93411b
--- /dev/null
+++ b/debian/ardour-altivec.sharedmimeinfo
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-ardour">
+  <comment>Ardour session file</comment>
+  <glob pattern="*.ardour"/>
+  <generic-icon name="application-x-ardour"/>
+  </mime-type>
+</mime-info>
diff --git a/debian/ardour-i686.sharedmimeinfo b/debian/ardour-i686.sharedmimeinfo
new file mode 100644
index 0000000..c93411b
--- /dev/null
+++ b/debian/ardour-i686.sharedmimeinfo
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-ardour">
+  <comment>Ardour session file</comment>
+  <glob pattern="*.ardour"/>
+  <generic-icon name="application-x-ardour"/>
+  </mime-type>
+</mime-info>
-- 
1.6.3.3

-------------- next part --------------
>From e7aa70d9879204a730be3ef3a50d717f93907079 Mon Sep 17 00:00:00 2001
From: Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>
Date: Sat, 5 Dec 2009 04:46:08 +0000
Subject: [PATCH 2/4] Added libusb-dev to enable Tranzport driver (LP: #248269)

---
 debian/control |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index 594580e..9da17f0 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,8 @@ Build-Depends: autotools-dev,
               libslv2-dev,
               lv2core,
               libcurl4-gnutls-dev,
-              vamp-plugin-sdk
+              vamp-plugin-sdk,
+	      libusb-dev
 Standards-Version: 3.8.3
 Homepage: http://www.ardour.org/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/ardour.git
-- 
1.6.3.3

-------------- next part --------------
>From 222df6c1d3b5c73175bdac5a2cc4a0a4e1a63c14 Mon Sep 17 00:00:00 2001
From: Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>
Date: Sat, 5 Dec 2009 04:48:30 +0000
Subject: [PATCH 3/4] Removed debian/control.in & debian/opt-control.in unused since 2007.

---
 debian/control.in     |   69 -------------------------------------------------
 debian/opt-control.in |   21 ---------------
 2 files changed, 0 insertions(+), 90 deletions(-)
 delete mode 100644 debian/control.in
 delete mode 100644 debian/opt-control.in

diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index e0f35c5..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,69 +0,0 @@
-Source: ardour
-Section: sound
-Priority: optional
-Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
-Uploaders: Guenter Geiger (Debian/GNU) <geiger at debian.org>, Robert Jordens <jordens at debian.org>, Free Ekanayaka <freee at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), debhelper (>= 4.1.0), scons, dh-buildinfo, libsigc++-2.0-dev, libxml2-dev (>= 2.5.7), libasound2-dev (>= 0.9.4), libsndfile1-dev, libsamplerate0-dev, liblrdf0-dev (>= 0.3.1-4), ladspa-sdk (>= 1.1-2), libjack0.100.0-dev, libgtkmm-2.4-dev, libglade2-dev, libpango1.0-dev, libgnomecanvasmm-2.6-dev, libgnomecanvas2-dev, libglib2.0-dev, libglademm-2.4-dev, gettext, intltool, libboost-dev, libsoundtouch1-dev, liblo0-dev
-Standards-Version: 3.7.2
-
-Package: ardour
-Architecture: any
-Section: sound
-Depends: ${shlibs:Depends}, ${python:Depends}, python, python-twisted, python-gtk2, jackd
-Conflicts: ardour-gtk (>= 1:0.99.3+2.0beta12-1)
-Recommends: www-browser
-Suggests: jamin, qjackctl
-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 and
- complex audio setups. 
- .
- Ardour supports pro-audio interfaces
- through the ALSA project, which provides high quality, well design
- device drivers and API's for audio I/O under Linux. Any interface
- supported by ALSA can be used with Ardour. This includes the
- all-digital 26 channel RME Hammerfall, the Midiman Delta 1010 and many
- others.
- .
- Ardour has support for 24 bit samples
- using floating point internally, non-linear editing with unlimited undo,
- a user-configurable mixer, MTC master/slave capabilities, MIDI hardware
- control surface compatibility.
- .
- It supports MIDI
- Machine Control, and so can be controlled from any MMC controller and
- many modern digital mixers.
- .
- Ardour contains a
- powerful multitrack audio editor/arranger that is completely
- non-destructive and capable of all standard non-linear editing
- operations (insert, replace, delete, move, trim, select,
- cut/copy/paste). The editor has unlimited undo/redo capacity and can
- save independent "versions" of a track or entire piece.
- .
- Ardour's editor supports the community-developed LADSPA
- plugin standard.  Arbitrary chains of plugins can be attached to any
- portion of a track.  Every mixer strip can have any number of inputs
- and outputs, not just mono, stereo or 5.1.  An N-way panner is
- included, with support for various panning models.  Pre- and post-fader
- sends exist, each with their own gain and pan controls.  Every mixer
- strip acts as its own bus, and thus the bus count in Ardour is
- unlimited.  You can submix any number of strips into another
- strip.
- .
- Ardour's channel capacity is limited only
- by the number on your audio interface and the ability of your disk
- subsystem to stream the data back and forth.
- .
- JACK
- (the JACK Audio Connection Kit) is used for all audio I/O, permitting
- data to be exchanged in perfect samplesync with other applications
- and/or hardware audio interfaces.
- .
- Ardour is
- sample rate and size neutral - any hardware formats from 8 to 32 bits,
- rates from 8kHz to 192kHz.  Internal processing in 32/64 bit IEEE
- floating point format.
- .
- Further information can be
- found at <http://ardour.org/>.
diff --git a/debian/opt-control.in b/debian/opt-control.in
deleted file mode 100644
index 1407207..0000000
--- a/debian/opt-control.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Package: ardour- at optarch@
-Architecture: @basearch@
-Section: sound
-Depends: ${shlibs:Depends}, ${python:Depends}, python, python-twisted, python-gtk2, jackd
-Conflicts: ardour, ardour- at optarch@
-Replaces: ardour, ardour- at optarch@
-Provides: ardour
-Recommends: www-browser
-Suggests: jamin, qjackctl
-Description: digital audio workstation (graphical gtk2 interface) [@optarch@]
- Ardour is a multichannel hard disk recorder (HDR) and digital audio
- workstation (DAW).  It can be used to control, record, edit and run
- and complex audio setups. For more information see the description
- of the ardour package or <http://ardour.org/>.
- .
- This package is optimized for @optarch@ and will not run on
- subarchitectures that don't support features enabled in @optarch at .
- It might fail with weird error SIGILLs and other non-obvious failures.
- Please refrain from filling bugs to the upstream author about this package
- that are not reproducible in the non-optimized package.
-
-- 
1.6.3.3

-------------- next part --------------
>From 71143d4a3af24f9e65b23a3441249a006b9d8c01 Mon Sep 17 00:00:00 2001
From: Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>
Date: Sat, 5 Dec 2009 04:49:48 +0000
Subject: [PATCH 4/4] Added firefox as a third alternative in recommends field

---
 debian/control |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index 9da17f0..184627e 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Depends: ${shlibs:Depends},
         jackd (>= 0.103.0)
 Conflicts: ardour-gtk
 Replaces: ardour-gtk
-Recommends: www-browser | iceweasel
+Recommends: www-browser | iceweasel | firefox
 Suggests: jamin, qjackctl
 Description: digital audio workstation (graphical gtk2 interface)
  Ardour is a multichannel hard disk recorder (HDR) and digital audio
-- 
1.6.3.3

-------------- next part --------------
>From acd7f9ba6737aae9321414709b2d3f6be05ae79f Mon Sep 17 00:00:00 2001
From: Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>
Date: Sat, 5 Dec 2009 05:05:06 +0000
Subject: [PATCH 5/5] debian/changelog entry

---
 debian/changelog |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf5f042..bfa88b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ardour (1:2.8.4-2) UNRELEASED; urgency=low
+
+  [ Dmitrijs Ledkovs ]
+  * Added mimetype handles to i686 and altivec optimized builds as well
+  * Added libusb-dev to enable Tranzport driver (LP: #248269)
+  * Removed debian/control.in & debian/opt-control.in unused since 2007.
+  * Added firefox as a third alternative in recommends field
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>  Sat, 05 Dec 2009 05:03:27 +0000
+
 ardour (1:2.8.4-1) unstable; urgency=low
 
   * New upstream release 
-- 
1.6.3.3



More information about the pkg-multimedia-maintainers mailing list