[Demudi-commits] r1032 - in ardour/trunk: . debian debian/patches
Free Ekanayaka
free-guest at alioth.debian.org
Fri Jan 19 17:34:12 CET 2007
Author: free-guest
Date: 2007-01-19 17:34:07 +0100 (Fri, 19 Jan 2007)
New Revision: 1032
Added:
ardour/trunk/debian/patches/50-soundtouch.patch
Removed:
ardour/trunk/++patches-missing-files.0/
ardour/trunk/,,changes.1141469815.28872.1/
ardour/trunk/,,changes.1141470172.17748.1/
ardour/trunk/gtk_ardour/
ardour/trunk/libs/
Modified:
ardour/trunk/debian/ardour-doc.docs
ardour/trunk/debian/ardour-doc.examples
ardour/trunk/debian/ardour-gtk-altivec.desktop
ardour/trunk/debian/ardour-gtk-altivec.install
ardour/trunk/debian/ardour-gtk-altivec.menu
ardour/trunk/debian/ardour-gtk-i686.desktop
ardour/trunk/debian/ardour-gtk-i686.install
ardour/trunk/debian/ardour-gtk-i686.menu
ardour/trunk/debian/ardour-gtk-opt.desktop
ardour/trunk/debian/ardour-gtk-opt.install
ardour/trunk/debian/ardour-gtk-opt.menu
ardour/trunk/debian/ardour-gtk.desktop
ardour/trunk/debian/ardour-gtk.install
ardour/trunk/debian/ardour-gtk.menu
ardour/trunk/debian/changelog
ardour/trunk/debian/control
ardour/trunk/debian/control.in
ardour/trunk/debian/opt-control.in
ardour/trunk/debian/patches/22_remove-atomic-impl-sparc.patch
ardour/trunk/debian/patches/40_use-shipped-soundtouch.patch
ardour/trunk/debian/patches/series
ardour/trunk/debian/rules
Log:
* New upstream pre-release
* Added libboost-dev, liblo0-dev, libsoundtouch1-dev to Build-Depends
* Merged changes between 0.99.2-2 and 0.99.3-1
* Added icon to .desktop files
* Bumped Standards-Version to 3.7.2
* new upstream pre-release
* merge ardour 0.99.2-2 changes.
+ debian/rules: don't build SSE stuff on altivec.
* new upstream alpha snapshot
Modified: ardour/trunk/debian/ardour-doc.docs
===================================================================
--- ardour/trunk/debian/ardour-doc.docs 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-doc.docs 2007-01-19 16:34:07 UTC (rev 1032)
@@ -7,7 +7,6 @@
DOCUMENTATION/CONTRIBUTORS
DOCUMENTATION/CONTRIBUTORS.es
DOCUMENTATION/FAQ
-DOCUMENTATION/README
DOCUMENTATION/README.es
DOCUMENTATION/README.fr
DOCUMENTATION/README.it
Modified: ardour/trunk/debian/ardour-doc.examples
===================================================================
--- ardour/trunk/debian/ardour-doc.examples 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-doc.examples 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,3 +1,3 @@
ardour.rc
ardour_system.rc
-gtk_ardour/ardour_ui.rc
+gtk2_ardour/ardour2_ui.rc
Modified: ardour/trunk/debian/ardour-gtk-altivec.desktop
===================================================================
--- ardour/trunk/debian/ardour-gtk-altivec.desktop 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk-altivec.desktop 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,10 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
-Name=Ardour GTK [altivec]
-Comment=Ardour Digital Audio Workstation (GTK Interface) [altivec]
-Exec=/usr/bin/ardour
+Name=Ardour GTK2 [altivec]
+Comment=Ardour Digital Audio Workstation (GTK2 Interface) [altivec]
+Exec=/usr/bin/ardour2
Terminal=false
Type=Application
+Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
Categories=Application;AudioVideo;Audio;
-Icon=/usr/share/icons/ardour-gtk.png
Modified: ardour/trunk/debian/ardour-gtk-altivec.install
===================================================================
--- ardour/trunk/debian/ardour-gtk-altivec.install 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk-altivec.install 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,5 +1,6 @@
-debian/tmp/altivec/usr/bin/ardour usr/bin/
-debian/tmp/altivec/usr/share/ardour usr/share/
+debian/tmp/altivec/usr/bin/ardour2 usr/bin
+debian/tmp/altivec/usr/lib* usr/
+debian/tmp/altivec/usr/share/ardour2 usr/share/
debian/tmp/altivec/usr/share/locale usr/share/
-debian/tmp/altivec/etc/ardour* etc/
+debian/tmp/altivec/etc/ardour2* etc/
debian/ardour-gtk.desktop usr/share/applications
Modified: ardour/trunk/debian/ardour-gtk-altivec.menu
===================================================================
--- ardour/trunk/debian/ardour-gtk-altivec.menu 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk-altivec.menu 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,4 +1,4 @@
?package(ardour-gtk-altivec):needs="X11" section="Apps/Sound" \
hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
- title="Ardour GTK [altivec]" command="/usr/bin/ardour"
+ title="Ardour GTK [altivec]" command="/usr/bin/ardour2"
Modified: ardour/trunk/debian/ardour-gtk-i686.desktop
===================================================================
--- ardour/trunk/debian/ardour-gtk-i686.desktop 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk-i686.desktop 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,10 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
-Name=Ardour GTK [i686]
-Comment=Ardour Digital Audio Workstation (GTK Interface) [i686]
-Exec=/usr/bin/ardour
+Name=Ardour GTK2 [i686]
+Comment=Ardour Digital Audio Workstation (GTK2 Interface) [i686]
+Exec=/usr/bin/ardour2
Terminal=false
Type=Application
+Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
Categories=Application;AudioVideo;Audio;
-Icon=/usr/share/icons/ardour-gtk.png
Modified: ardour/trunk/debian/ardour-gtk-i686.install
===================================================================
--- ardour/trunk/debian/ardour-gtk-i686.install 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk-i686.install 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,5 +1,6 @@
-debian/tmp/i686/usr/bin/ardour usr/bin/
-debian/tmp/i686/usr/share/ardour usr/share/
+debian/tmp/i686/usr/bin/ardour2 usr/bin
+debian/tmp/i686/usr/lib* usr/
+debian/tmp/i686/usr/share/ardour2 usr/share/
debian/tmp/i686/usr/share/locale usr/share/
-debian/tmp/i686/etc/ardour* etc/
+debian/tmp/i686/etc/ardour2* etc/
debian/ardour-gtk.desktop usr/share/applications
Modified: ardour/trunk/debian/ardour-gtk-i686.menu
===================================================================
--- ardour/trunk/debian/ardour-gtk-i686.menu 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk-i686.menu 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,4 +1,4 @@
?package(ardour-gtk-i686):needs="X11" section="Apps/Sound" \
hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
- title="Ardour GTK [i686]" command="/usr/bin/ardour"
+ title="Ardour GTK [i686]" command="/usr/bin/ardour2"
Modified: ardour/trunk/debian/ardour-gtk-opt.desktop
===================================================================
--- ardour/trunk/debian/ardour-gtk-opt.desktop 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk-opt.desktop 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,10 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
-Name=Ardour GTK [@optarch@]
-Comment=Ardour Digital Audio Workstation (GTK Interface) [@optarch@]
-Exec=/usr/bin/ardour
+Name=Ardour GTK2 [@optarch@]
+Comment=Ardour Digital Audio Workstation (GTK2 Interface) [@optarch@]
+Exec=/usr/bin/ardour2
Terminal=false
Type=Application
+Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
Categories=Application;AudioVideo;Audio;
-Icon=/usr/share/icons/ardour-gtk.png
Modified: ardour/trunk/debian/ardour-gtk-opt.install
===================================================================
--- ardour/trunk/debian/ardour-gtk-opt.install 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk-opt.install 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,5 +1,6 @@
-debian/tmp/@optarch@/usr/bin/ardour usr/bin/
-debian/tmp/@optarch@/usr/share/ardour usr/share/
+debian/tmp/@optarch@/usr/bin/ardour2 usr/bin
+debian/tmp/@optarch@/usr/lib* usr/
+debian/tmp/@optarch@/usr/share/ardour2 usr/share/
debian/tmp/@optarch@/usr/share/locale usr/share/
-debian/tmp/@optarch@/etc/ardour* etc/
+debian/tmp/@optarch@/etc/ardour2* etc/
debian/ardour-gtk.desktop usr/share/applications
Modified: ardour/trunk/debian/ardour-gtk-opt.menu
===================================================================
--- ardour/trunk/debian/ardour-gtk-opt.menu 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk-opt.menu 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,4 +1,4 @@
?package(ardour-gtk- at optarch@):needs="X11" section="Apps/Sound" \
hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
- title="Ardour GTK [@optarch@]" command="/usr/bin/ardour"
+ title="Ardour GTK [@optarch@]" command="/usr/bin/ardour2"
Modified: ardour/trunk/debian/ardour-gtk.desktop
===================================================================
--- ardour/trunk/debian/ardour-gtk.desktop 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk.desktop 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,10 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
-Name=Ardour GTK
-Comment=Ardour Digital Audio Workstation (GTK Interface)
-Exec=/usr/bin/ardour
+Name=Ardour GTK2
+Comment=Ardour Digital Audio Workstation (GTK2 Interface)
+Exec=/usr/bin/ardour2
Terminal=false
Type=Application
+Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
Categories=Application;AudioVideo;Audio;
-Icon=/usr/share/icons/ardour-gtk.png
Modified: ardour/trunk/debian/ardour-gtk.install
===================================================================
--- ardour/trunk/debian/ardour-gtk.install 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk.install 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,5 +1,6 @@
-debian/tmp/generic/usr/bin/ardour usr/bin/
-debian/tmp/generic/usr/share/ardour usr/share/
+debian/tmp/generic/usr/bin/ardour2 usr/bin
+debian/tmp/generic/usr/lib* usr/
+debian/tmp/generic/usr/share/ardour2 usr/share/
debian/tmp/generic/usr/share/locale usr/share/
-debian/tmp/generic/etc/ardour* etc/
+debian/tmp/generic/etc/ardour2* etc/
debian/ardour-gtk.desktop usr/share/applications
Modified: ardour/trunk/debian/ardour-gtk.menu
===================================================================
--- ardour/trunk/debian/ardour-gtk.menu 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/ardour-gtk.menu 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,4 +1,4 @@
?package(ardour-gtk):needs="X11" section="Apps/Sound" \
hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
- title="Ardour GTK" command="/usr/bin/ardour"
+ title="Ardour GTK" command="/usr/bin/ardour2"
Modified: ardour/trunk/debian/changelog
===================================================================
--- ardour/trunk/debian/changelog 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/changelog 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,3 +1,27 @@
+ardour (0.99.3+2.0beta10-1) UNRELEASED; urgency=low
+
+ * New upstream pre-release
+ * Added libboost-dev, liblo0-dev, libsoundtouch1-dev to Build-Depends
+ * Merged changes between 0.99.2-2 and 0.99.3-1
+ * Added icon to .desktop files
+ * Bumped Standards-Version to 3.7.2
+
+ -- Free Ekanayaka <freee at debian.org> Tue, 16 Jan 2007 19:53:47 +0100
+
+ardour (1+2.0alpa2-1) experimental; urgency=low
+
+ * new upstream pre-release
+ * merge ardour 0.99.2-2 changes.
+ + debian/rules: don't build SSE stuff on altivec.
+
+ -- Robert Jordens <jordens at debian.org> Wed, 15 Mar 2006 15:33:31 +0100
+
+ardour (1+2.0alpa1-1) experimental; urgency=low
+
+ * new upstream alpha snapshot
+
+ -- Robert Jordens <jordens at debian.org> Sun, 5 Mar 2006 19:34:15 +0100
+
ardour (0.99.3-1) unstable; urgency=low
* New upstream release (Closes: #386384).
Modified: ardour/trunk/debian/control
===================================================================
--- ardour/trunk/debian/control 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/control 2007-01-19 16:34:07 UTC (rev 1032)
@@ -3,9 +3,8 @@
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), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), debhelper (>= 4.2.0), scons, dh-buildinfo, libgdbm-dev, libsigc++-dev (>= 1.0.4-9.1), libxml2-dev (>= 2.5.7), libncurses5-dev, 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-dev (>= 1.2.10-7.1), libgtk-canvas1-dev (>= 0.1.1-7), pkg-config, gettext, cvs, netbase (>= 4.13)
-Build-Conflicts: libardour0, libpbd0, libmidi++0, libgtkmmext0, libsoundtouch0
-Standards-Version: 3.6.1
+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-doc
Architecture: all
@@ -37,10 +36,8 @@
Architecture: any
Section: sound
Depends: ${shlibs:Depends}
-Conflicts: libardour0
-Replaces: libardour0
Suggests: jamin, qjackctl, ardour-session-exchange
-Description: digital audio workstation (graphical gtk interface)
+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.
@@ -119,11 +116,11 @@
Architecture: powerpc
Section: sound
Depends: ${shlibs:Depends}
-Conflicts: ardour-gtk, libardour0
-Replaces: ardour-gtk, libardour0
+Conflicts: ardour-gtk
+Replaces: ardour-gtk
Provides: ardour-gtk
Suggests: jamin, qjackctl, ardour-session-exchange
-Description: digital audio workstation (graphical gtk interface) [altivec]
+Description: digital audio workstation (graphical gtk2 interface) [altivec]
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. Fro more information see the description
@@ -131,7 +128,7 @@
.
This package is optimized for altivec and will not run on
subarchitectures that don't support features enabled in altivec.
- It might fail with weird error SIGILLs and other non-obvious failures.
+ It might fail with wierd 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.
@@ -139,11 +136,11 @@
Architecture: i386
Section: sound
Depends: ${shlibs:Depends}
-Conflicts: ardour-gtk, libardour0
-Replaces: ardour-gtk, libardour0
+Conflicts: ardour-gtk
+Replaces: ardour-gtk
Provides: ardour-gtk
Suggests: jamin, qjackctl, ardour-session-exchange
-Description: digital audio workstation (graphical gtk interface) [i686]
+Description: digital audio workstation (graphical gtk2 interface) [i686]
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. Fro more information see the description
@@ -151,7 +148,7 @@
.
This package is optimized for i686 and will not run on
subarchitectures that don't support features enabled in i686.
- It might fail with weird error SIGILLs and other non-obvious failures.
+ It might fail with wierd 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.
Modified: ardour/trunk/debian/control.in
===================================================================
--- ardour/trunk/debian/control.in 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/control.in 2007-01-19 16:34:07 UTC (rev 1032)
@@ -3,9 +3,8 @@
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@, scons, dh-buildinfo, libgdbm-dev, libsigc++-dev (>= 1.0.4-9.1), libxml2-dev (>= 2.5.7), libncurses5-dev, 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-dev (>= 1.2.10-7.1), libgtk-canvas1-dev (>= 0.1.1-7), pkg-config, gettext, cvs, netbase (>= 4.13)
-Build-Conflicts: libardour0, libpbd0, libmidi++0, libgtkmmext0, libsoundtouch0
-Standards-Version: 3.6.1
+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-doc
Architecture: all
@@ -37,10 +36,8 @@
Architecture: any
Section: sound
Depends: ${shlibs:Depends}
-Conflicts: libardour0
-Replaces: libardour0
Suggests: jamin, qjackctl, ardour-session-exchange
-Description: digital audio workstation (graphical gtk interface)
+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.
Modified: ardour/trunk/debian/opt-control.in
===================================================================
--- ardour/trunk/debian/opt-control.in 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/opt-control.in 2007-01-19 16:34:07 UTC (rev 1032)
@@ -2,11 +2,11 @@
Architecture: @basearch@
Section: sound
Depends: ${shlibs:Depends}
-Conflicts: ardour-gtk, libardour0
-Replaces: ardour-gtk, libardour0
+Conflicts: ardour-gtk
+Replaces: ardour-gtk
Provides: ardour-gtk
Suggests: jamin, qjackctl, ardour-session-exchange
-Description: digital audio workstation (graphical gtk interface) [@optarch@]
+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. Fro more information see the description
@@ -14,7 +14,7 @@
.
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.
+ It might fail with wierd 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.
Modified: ardour/trunk/debian/patches/22_remove-atomic-impl-sparc.patch
===================================================================
--- ardour/trunk/debian/patches/22_remove-atomic-impl-sparc.patch 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/patches/22_remove-atomic-impl-sparc.patch 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: libs/pbd/pbd/atomic.h
+Index: libs/pbd3/pbd/atomic.h
===================================================================
---- libs/pbd/pbd/atomic.h.orig 2005-03-15 00:26:33.000000000 +0100
-+++ libs/pbd/pbd/atomic.h 2005-03-15 00:28:44.000000000 +0100
+--- libs/pbd3/pbd/atomic.h.orig 2005-03-15 00:26:33.000000000 +0100
++++ libs/pbd3/pbd/atomic.h 2005-03-15 00:28:44.000000000 +0100
@@ -426,120 +426,6 @@
#else /* !PPC && !i386 */
Modified: ardour/trunk/debian/patches/40_use-shipped-soundtouch.patch
===================================================================
--- ardour/trunk/debian/patches/40_use-shipped-soundtouch.patch 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/patches/40_use-shipped-soundtouch.patch 2007-01-19 16:34:07 UTC (rev 1032)
@@ -6,38 +6,44 @@
Patch from and credits to Guenter Geiger <geiger at xdv.org>.
-Index: ardour-0.99.2/SConstruct
+Index: ardour2-1+2.0alpha1/SConstruct
===================================================================
---- ardour-0.99.2.orig/SConstruct 2006-03-04 13:47:45.000000000 +0100
-+++ ardour-0.99.2/SConstruct 2006-03-04 13:52:10.000000000 +0100
-@@ -377,6 +377,7 @@
- libraries['midi++'] = LibraryInfo (LIBS='midi++', LIBPATH='#libs/midi++', CPPPATH='#libs/midi++')
- libraries['pbd'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd', CPPPATH='#libs/pbd')
- libraries['gtkmmext'] = LibraryInfo (LIBS='gtkmmext', LIBPATH='#libs/gtkmmext', CPPPATH='#libs/gtkmmext')
+--- ardour2-1+2.0alpha1.orig/SConstruct 2006-03-15 15:45:35.000000000 +0100
++++ ardour2-1+2.0alpha1/SConstruct 2006-03-15 15:47:20.000000000 +0100
+@@ -396,6 +396,7 @@
+ libraries['pbd3'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd3', CPPPATH='#libs/pbd3')
+ libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext')
+ #libraries['cassowary'] = LibraryInfo(LIBS='cassowary', LIBPATH='#libs/cassowary', CPPPATH='#libs/cassowary')
+libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', LIBPATH='#libs/soundtouch', CPPPATH=['#libs', '#libs/soundtouch'])
libraries['fst'] = LibraryInfo()
if env['VST']:
-@@ -409,11 +410,10 @@
+@@ -441,8 +442,8 @@
+ libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
- libraries['gtkmm'] = LibraryInfo()
- libraries['gtkmm'].ParseConfig ('gtkmm-config --cflags --libs')
--
-- libraries['soundtouch'] = LibraryInfo(LIBS='SoundTouch')
- libraries['gtk-canvas'] = LibraryInfo(LIBS='gtk-canvas')
+ # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
+- libraries['soundtouch'] = LibraryInfo()
+- libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
++# libraries['soundtouch'] = LibraryInfo()
++# libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
coredirs = [
+ 'templates'
+@@ -451,6 +452,7 @@
+ subdirs = [
+ 'libs/pbd3',
+ 'libs/midi++2',
+ 'libs/soundtouch',
- 'templates'
- ]
+ 'libs/ardour'
+ ]
-@@ -436,9 +436,6 @@
- libraries['gtkmm'] = LibraryInfo(LIBS='gtkmm',
- LIBPATH="#libs/gtkmm",
- CPPPATH=[ '#libs/gtkmm', '#libs/gtkmm/gdk--', '#libs/gtkmm/src'])
+@@ -483,9 +485,6 @@
+ LIBPATH='#libs/libgnomecanvasmm',
+ CPPPATH='#libs/libgnomecanvasmm')
+
- libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
- LIBPATH='#libs/soundtouch',
- CPPPATH=['#libs', '#libs/soundtouch'])
- libraries['gtk-canvas'] = LibraryInfo(LIBS='gtk-canvas',
- LIBPATH='#libs/gtk-canvas',
- CPPPATH='#libs/gtk-canvas')
+ libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
+ LIBPATH='#libs/libglademm',
+ CPPPATH='#libs/libglademm')
Added: ardour/trunk/debian/patches/50-soundtouch.patch
===================================================================
--- ardour/trunk/debian/patches/50-soundtouch.patch 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/patches/50-soundtouch.patch 2007-01-19 16:34:07 UTC (rev 1032)
@@ -0,0 +1,13 @@
+Index: ardour-0.9beta30/SConstruct
+===================================================================
+--- ardour-0.9beta30.orig/SConstruct 2007-01-18 15:40:30.000000000 +0100
++++ ardour-0.9beta30/SConstruct 2007-01-18 15:40:57.000000000 +0100
+@@ -836,7 +836,7 @@
+
+ # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
+ libraries['soundtouch'] = LibraryInfo()
+- libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
++ libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+
+ libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
+ LIBPATH='#libs/appleutility',
Modified: ardour/trunk/debian/patches/series
===================================================================
--- ardour/trunk/debian/patches/series 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/patches/series 2007-01-19 16:34:07 UTC (rev 1032)
@@ -1,4 +1,2 @@
-22_remove-atomic-impl-sparc.patch -p0
-30_new-config.guess.patch
31_add-O2-to-DEBUG-CFLAGS.patch
-40_use-shipped-soundtouch.patch
+50-soundtouch.patch
Modified: ardour/trunk/debian/rules
===================================================================
--- ardour/trunk/debian/rules 2007-01-17 10:29:39 UTC (rev 1031)
+++ ardour/trunk/debian/rules 2007-01-19 16:34:07 UTC (rev 1032)
@@ -18,6 +18,7 @@
DEB_UPSTREAM_TARBALL_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+[^+]*$$//')
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+DEB_CLEAN_EXCLUDE=debian/tmp
### set up the variables ###
debian/control::
@@ -58,8 +59,6 @@
DEB_SCONS_EXTRA_FLAGS := \
PREFIX=/usr \
SYSLIBS=yes \
- KSI=no \
- GTK=yes \
NLS=yes \
$(NJOBS)
@@ -116,6 +115,7 @@
-$(DEB_SCONS_INVOKE) --clean
-rm -rf $(DEB_DESTDIR) debian/stamp-scons-build
-rm -rf config.log scache.conf .sconf_temp .sconsign.dblite
+ -rm -rf libs/gtkmm2ext/*.mo gtk2_ardour/po/*.mo libs/ardour/*.mo
# after the directories are created but before dh_compress is run.
More information about the Demudi-commits
mailing list