[Demudi-commits] r1504 - in ardour/trunk/debian: . patches

[free-guest at alioth.debian.org]

Author: free-guest
Date: 2007-07-11 23:07:23 +0000 (Wed, 11 Jul 2007)
New Revision: 1504

Added:
   ardour/trunk/debian/patches/70_DARCH.patch
Modified:
   ardour/trunk/debian/changelog
   ardour/trunk/debian/patches/series
   ardour/trunk/debian/rules
Log:
releasing version 1:2.0.3-1

Modified: ardour/trunk/debian/changelog
===================================================================
--- ardour/trunk/debian/changelog	2007-07-11 18:53:46 UTC (rev 1503)
+++ ardour/trunk/debian/changelog	2007-07-11 23:07:23 UTC (rev 1504)
@@ -1,3 +1,16 @@
+ardour (1:2.0.3-1) unstable; urgency=low
+
+  * New upstream release (Closes: #427739). Note that the source is still
+    built without SHLIBS=1, so that the third party libraries shipped with
+    the upstream tarball are used, instead of the system libraries (which
+    is what the upstream developers recommend). At the moment this is the
+    only available workaround to #425507, but we should eventually fix it
+    in the relevant system libraries
+  * Added 70_DARCH patch to prevent setting DARCH=x86 on amd64
+  * Rebuilt against flac 1.1.4 (Closes: #426634)
+
+ -- Free Ekanayaka <freee at debian.org>  Tue,  3 Jul 2007 21:42:15 +0200
+
 ardour (1:2.0.2-2) unstable; urgency=low
 
   * Drop SHLIBS=1 scons flag, which makes ardour run at 100%

Added: ardour/trunk/debian/patches/70_DARCH.patch
===================================================================
--- ardour/trunk/debian/patches/70_DARCH.patch	                        (rev 0)
+++ ardour/trunk/debian/patches/70_DARCH.patch	2007-07-11 23:07:23 UTC (rev 1504)
@@ -0,0 +1,14 @@
+--- a/SConstruct.orig	2007-07-03 22:14:08.000000000 +0200
++++ b/SConstruct	2007-07-03 22:12:40.000000000 +0200
+@@ -601,8 +601,9 @@
+     
+     build_host_supports_sse = 0
+     
+-    debug_flags.append ("-DARCH_X86")
+-    opt_flags.append ("-DARCH_X86")
++    if (re.search ("i[0-9]86", config[config_cpu]) != None):
++        debug_flags.append ("-DARCH_X86")
++        opt_flags.append ("-DARCH_X86")
+     
+     if config[config_kernel] == 'linux' :
+         

Modified: ardour/trunk/debian/patches/series
===================================================================
--- ardour/trunk/debian/patches/series	2007-07-11 18:53:46 UTC (rev 1503)
+++ ardour/trunk/debian/patches/series	2007-07-11 23:07:23 UTC (rev 1504)
@@ -1,2 +1,3 @@
 50-soundtouch.patch
 60-libdir.patch
+70_DARCH.patch

Modified: ardour/trunk/debian/rules
===================================================================
--- ardour/trunk/debian/rules	2007-07-11 18:53:46 UTC (rev 1503)
+++ ardour/trunk/debian/rules	2007-07-11 23:07:23 UTC (rev 1504)
@@ -61,6 +61,7 @@
 	PREFIX=/usr \
 	NLS=yes \
 	$(NJOBS)
+#	SHLIBS=1 \
 
 DEB_SCONS_NOOPT_FLAGS := DEBUG=yes FPU_OPTIMIZATION=no
 ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))