[SCM] slv2/master: Port to lv2-dev.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b16be436243d2e4b7b05b09eb47072c13cdb21a5
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 14 19:23:30 2012 +0200

    Port to lv2-dev.
    
    This also reverts c5150716bd20633e03b6c5da79e91e101fdbfd85, it was malformed.

diff --git a/debian/control b/debian/control
index f0ffa0d..b388317 100644
--- a/debian/control
+++ b/debian/control
@@ -2,49 +2,74 @@ Source: slv2
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders:
- Free Ekanayaka <freee at debian.org>,
+Uploaders: Free Ekanayaka <freee at debian.org>,
  Alessio Treglia <alessio at debian.org>,
  Adrian Knoth <adi at drcomp.erfurt.thur.de>,
  Jaromír Mikeš <mira.mikes at seznam.cz>
-Build-Depends:
- debhelper (>= 7.0.50~),
- doxygen,
- libjack-dev,
- libraptor2-dev (>= 2.0.0-2),
+Build-Depends: debhelper (>= 7.0.50~),
+ python,
  librdf0-dev (>= 1.0.13-2),
- lv2core,
- python
+ libraptor2-dev (>= 2.0.0-2),
+ lv2-dev,
+ doxygen,
+ libjack-dev
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/slv2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/slv2.git
 Homepage: http://drobilla.net/software/slv2
 
-Package: slv2-jack
+Package: libslv2-9
+Section: libs
+Depends: ${shlibs:Depends},
+ librdf0,
+ ${misc:Depends}
+Suggests: slv2-jack
+Architecture: any
+Description: library for simple use of LV2 plugins
+ SLV2 is a library geared towards music and audio applications
+ which makes the use of LV2 plugins as simple as possible.
+ LV2 is a standard for plugins and matching host applications,
+ mainly targeted at audio processing and generation.
+ .
+ This package contains the shared library for libslv2.
+ 
+Package: libslv2-dev
 Section: libdevel
-Depends:
- jackd,
+Depends: libslv2-9 (>= ${source:Version}),
+ libslv2-9 (<< ${source:Upstream-Version}+1~),
  ${misc:Depends},
- ${shlibs:Depends}
-Suggests:
- slv2-doc
+ librdf0-dev,
+ lv2core
+Suggests: slv2-doc
+Architecture: any
+Description: Development files (headers) for SLV2 library
+ SLV2 is a library geared towards music and audio applications
+ which makes the use of LV2 plugins as simple as possible. 
+ LV2 is a simple but extensible successor of LADSPA plugins,
+ intended to address the limitations of LADSPA
+ which many applications have outgrown.
+ .
+ This package contains the headers used to build applications
+ that use libslv2.
+ 
+Package: slv2-jack
+Depends: ${shlibs:Depends},
+ jackd,
+ ${misc:Depends}
 Architecture: any
 Description: Jack support for LV2 plugins
  LV2 is a simple but extensible successor of LADSPA plugins,
  intended to address the limitations of LADSPA
  which many applications have outgrown.
  .
- This package contains binary files.
+ This package contains binary files. 
 
 Package: slv2-doc
 Section: doc
-Depends:
- ${misc:Depends}
-Replaces:
- libslv2-9 (<< 0.6.6-8)
-Breaks:
- libslv2-9 (<< 0.6.6-8)
+Depends: ${misc:Depends}
+Replaces: libslv2-9 (<< 0.6.6-8)
+Breaks: libslv2-9 (<< 0.6.6-8)
 Architecture: all
 Description: Documentation for SLV2
  Man pages documenting the SLV2 API.
diff --git a/debian/patches/lv2core_to_lv2.patch b/debian/patches/lv2core_to_lv2.patch
new file mode 100644
index 0000000..d166065
--- /dev/null
+++ b/debian/patches/lv2core_to_lv2.patch
@@ -0,0 +1,24 @@
+---
+ wscript |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- slv2.orig/wscript
++++ slv2/wscript
+@@ -48,7 +48,7 @@ def set_options(opt):
+ def configure(conf):
+ 	autowaf.configure(conf)
+ 	autowaf.check_tool(conf, 'compiler_cc')
+-	autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE', atleast_version='1.0', mandatory=True)
++	autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', atleast_version='1.0', mandatory=True)
+ 	autowaf.check_pkg(conf, 'redland', uselib_store='REDLAND', atleast_version='1.0.6', mandatory=True)
+ 	autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.107.0', mandatory=False)
+ 	conf.env.append_value('CCFLAGS', '-std=c99')
+@@ -97,7 +97,7 @@ def build(bld):
+ 	obj.lib          = 'raptor2'
+ 	obj.vnum         = SLV2_LIB_VERSION
+ 	obj.install_path = '${LIBDIR}'
+-	autowaf.use_lib(bld, obj, 'REDLAND LV2CORE')
++	autowaf.use_lib(bld, obj, 'REDLAND LV2')
+ 
+ 	# Static library (for unit test code coverage)
+ 	if bld.env['BUILD_TESTS']:
diff --git a/debian/patches/series b/debian/patches/series
index 58e23c7..867cecf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-spelling_errors.patch
 02-hppa_parallel.patch
 raptor_symbol_fix.patch
+lv2core_to_lv2.patch

-- 
slv2 packaging