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

[Free Ekanayaka]

Author: free-guest
Date: 2007-05-11 18:33:55 +0000 (Fri, 11 May 2007)
New Revision: 1318

Added:
   ardour/trunk/debian/patches/60-libdir.patch
Modified:
   ardour/trunk/debian/changelog
   ardour/trunk/debian/control
   ardour/trunk/debian/patches/series
Log:
   - recommend also iceweasel as real-package alternative to www-browser
* debian/patches:
   - added 60_libdir.patch, we don't want files in /usr/lib64

Modified: ardour/trunk/debian/changelog
===================================================================
--- ardour/trunk/debian/changelog	2007-05-11 13:41:28 UTC (rev 1317)
+++ ardour/trunk/debian/changelog	2007-05-11 18:33:55 UTC (rev 1318)
@@ -4,6 +4,9 @@
   * debian/control:
      - build-depend on libcairomm-1.0-dev (>= 1.2.4)
      - ardour conflicts with ardour-gtk (>= 1:0.99.3+2.0beta12)
+     - recommend also iceweasel as real-package alternative to www-browser
+  * debian/patches:
+     - added 60_libdir.patch, we don't want files in /usr/lib64
 
  -- Free Ekanayaka <freee at debian.org>  Wed,  9 May 2007 21:21:23 +0000
 

Modified: ardour/trunk/debian/control
===================================================================
--- ardour/trunk/debian/control	2007-05-11 13:41:28 UTC (rev 1317)
+++ ardour/trunk/debian/control	2007-05-11 18:33:55 UTC (rev 1318)
@@ -11,7 +11,7 @@
 Section: sound
 Depends: ${shlibs:Depends}, ${python:Depends}, python, python-twisted, python-gtk2, jackd (>= 0.103.0)
 Conflicts: ardour-gtk (>= 1:0.99.3+2.0beta12-1)
-Recommends: www-browser
+Recommends: www-browser | iceweasel
 Suggests: jamin, qjackctl
 Description: digital audio workstation (graphical gtk2 interface)
  Ardour is a multichannel hard disk recorder (HDR) and digital audio

Added: ardour/trunk/debian/patches/60-libdir.patch
===================================================================
--- ardour/trunk/debian/patches/60-libdir.patch	2007-05-11 13:41:28 UTC (rev 1317)
+++ ardour/trunk/debian/patches/60-libdir.patch	2007-05-11 18:33:55 UTC (rev 1318)
@@ -0,0 +1,11 @@
+--- a/SConstruct.orig	2007-05-11 20:28:39.000000000 +0200
++++ b/SConstruct	2007-05-11 20:28:54.000000000 +0200
+@@ -647,7 +647,7 @@
+ # handle x86/x86_64 libdir properly
+ 
+ if env['DIST_TARGET'] == 'x86_64':
+-    env['LIBDIR']='lib64'
++    env['LIBDIR']='lib'
+ else:
+     env['LIBDIR']='lib'
+ 

Modified: ardour/trunk/debian/patches/series
===================================================================
--- ardour/trunk/debian/patches/series	2007-05-11 13:41:28 UTC (rev 1317)
+++ ardour/trunk/debian/patches/series	2007-05-11 18:33:55 UTC (rev 1318)
@@ -1 +1,2 @@
 50-soundtouch.patch
+60-libdir.patch