[SCM] lilv/master: Refresh patches.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Aug 28 13:22:44 UTC 2012
The following commit has been merged in the master branch:
commit 143873520a271d0ddffd4c58956f6f10a3636913
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Aug 28 15:17:28 2012 +0200
Refresh patches.
diff --git a/debian/patches/1001-dont_run_ldconfig.patch b/debian/patches/1001-dont_run_ldconfig.patch
index 8914f86..c48a53a 100644
--- a/debian/patches/1001-dont_run_ldconfig.patch
+++ b/debian/patches/1001-dont_run_ldconfig.patch
@@ -8,11 +8,11 @@ Forwarded: not-needed
--- lilv.orig/wscript
+++ lilv/wscript
-@@ -330,7 +330,6 @@ def build(bld):
+@@ -357,7 +357,6 @@ def build(bld):
bld.install_files('${PYTHONDIR}', 'bindings/lilv.py')
- bld.add_post_fun(autowaf.run_ldconfig)
- if bld.env['DOCS']:
+ if bld.env.DOCS:
bld.add_post_fun(fix_docs)
diff --git a/debian/patches/1002-fix_gnu_kfreebsd_build.patch b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
index 382d700..9670cf0 100644
--- a/debian/patches/1002-fix_gnu_kfreebsd_build.patch
+++ b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
@@ -6,26 +6,26 @@ Subject: Fix build on GNU/kFreeBSD
fopen() even though it is a directory
---
- wscript | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ wscript | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
---- lilv.orig/wscript
-+++ lilv/wscript
-@@ -198,7 +198,7 @@ def build(bld):
- if bld.env['MSVC_COMPILER']:
- libflags = []
- defines = ['snprintf=_snprintf']
-- elif sys.platform.find('bsd') > 0:
-+ elif sys.platform.find('bsd') > 0 and sys.platform.find('gnu') < 0:
- lib = []
-
- # Shared Library
-@@ -324,7 +324,7 @@ def build(bld):
- source = 'bindings/lilv.i',
- target = 'bindings/_lilv',
- includes = ['..'],
-- swig_flags = '-c++ -python -Wall -I.. -llilv -features autodoc=1',
-+ swig_flags = '-c++ -python -Wall -I.. -features autodoc=1',
- use = 'liblilv')
- autowaf.use_lib(bld, obj, 'LILV')
-
+--- lilv.orig/wscript
++++ lilv/wscript
+@@ -226,7 +226,7 @@ def build(bld):
+ if bld.env.MSVC_COMPILER:
+ libflags = []
+ defines = ['snprintf=_snprintf']
+- elif sys.platform.find('bsd') > 0:
++ elif sys.platform.find('bsd') > 0 and sys.platform.find('gnu') < 0:
+ lib = []
+
+ # Shared Library
+@@ -351,7 +351,7 @@ def build(bld):
+ source = 'bindings/lilv.i',
+ target = 'bindings/_lilv',
+ includes = ['..'],
+- swig_flags = '-c++ -python -Wall -I.. -llilv -features autodoc=1',
++ swig_flags = '-c++ -python -Wall -I.. -features autodoc=1',
+ use = 'liblilv')
+ autowaf.use_lib(bld, obj, 'LILV')
+
--
lilv packaging
More information about the pkg-multimedia-commits
mailing list