[SCM] jackd2/master: Drop kfreebsd/hurd patch

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Tue May 29 20:31:23 UTC 2012


The following commit has been merged in the master branch:
commit e385072efe578fa107f85a3dabe39b9b7050d6e6
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue May 29 21:23:41 2012 +0200

    Drop kfreebsd/hurd patch
    
    included upstream

diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
deleted file mode 100644
index 478761c..0000000
--- a/debian/patches/kfreebsd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
-Bugs-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=669566
-Forwarded: Not-Yet
-Description: Fix FTBFS on kFreeBSD and HURD
---- a/wscript
-+++ b/wscript
-@@ -79,10 +79,15 @@
-     opt.sub_options('dbus')
- 
- def configure(conf):
-+    conf.load('compiler_cxx')
-+    conf.load('compiler_cc')
-     platform = sys.platform
-     conf.env['IS_MACOSX'] = platform == 'darwin'
-     conf.env['IS_LINUX'] = platform == 'linux' or platform == 'linux2' or platform == 'posix'
-     conf.env['IS_SUN'] = platform == 'sunos'
-+    # GNU/kFreeBSD and GNU/Hurd are treated as Linux
-+    if platform.startswith('gnu0') or platform.startswith('gnukfreebsd'):
-+        conf.env['IS_LINUX'] = True
- 
-     if conf.env['IS_LINUX']:
-         Logs.pprint('CYAN', "Linux detected")

-- 
jackd2 packaging



More information about the pkg-multimedia-commits mailing list