SLV2 0.4.1.

git-svn-id: http://svn.drobilla.net/lad/slv2@1027 a436a847-0d15-0410-975c-d299462d15a1

12 files changed, 48 insertions, 30 deletions

diff --git a/Makefile.am b/Makefile.am
index 1072361..16e6064 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,4 +25,5 @@ docs:
 	cd doc && make docs
 
 deb:
-	debuild -i --lintian-opts -i
+	dpkg-buildpackage -sn
+
diff --git a/configure.ac b/configure.ac
index 0370c1f..420079a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 
-AC_INIT([slv2],0.4.0,[dave@drobilla.net])
+AC_INIT([slv2],0.4.1,[dave@drobilla.net])
 
 AC_CONFIG_AUX_DIR([config])
 
@@ -29,7 +29,7 @@ AM_INIT_AUTOMAKE
 # 0.3.2 = 5,0,1
 # 0.4.0 = 6,0,0
 
-SLV2_VERSION="0.4.0"
+SLV2_VERSION="0.4.1"
 SLV2_API_CURRENT="6"
 SLV2_API_REVISION="0"
 SLV2_API_AGE="0"
diff --git a/debian/Makefile.am b/debian/Makefile.am
index 3590e6b..babeea5 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -4,7 +4,9 @@ EXTRA_DIST = \
 	compat \
 	control \
 	copyright \
-	dirs \
 	docs \
+	postinst \
+	postrm \
 	rules \
-	shlibs.local
+	shlibs.local \
+	shlibs
diff --git a/debian/changelog b/debian/changelog
index 0ded9a5..6eafc19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+slv2 (0.4.1) unstable; urgency=low
+
+  * Debian packaging (no functional changes)
+ 
+ -- Dave Robillard <dave@drobilla.net>  Sun, 6 Jan 2008 18:39:57 -0500
+ 
 slv2 (0.4.0) unstable; urgency=low
 
   * Update for most recent LV2 GUI specification
diff --git a/debian/control b/debian/control
index 7780719..5e35a7f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,17 +5,37 @@ Build-Depends: debhelper (>= 5), autotools-dev
 Standards-Version: 3.7.3
 Section: libs
 
+Package: slv2
+Depends: slv2-6
+Architecture: any
+Description: A library for simple use of LV2 plugins
+ SLV2 is a library geared towards music and audio applications which makes
+ the use of LV2 plugins <http://lv2plug.in> as simple as possible.
+
 Package: slv2-dev
-Section: libdevel
+Depends: slv2-6-dev
 Architecture: any
-Depends: slv2 (= ${binary:Version}), librdf0-dev
 Description: Development files (headers) for SLV2
- Files required for compiling programs which use SLV2.
+ Files required for compiling programs which use SLV2, and developer
+ documentation.
 
-Package: slv2
+Package: slv2-6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, librdf0
+Pre-Depends: make
+Depends: ${shlibs:Depends}, librdf0
 Description: A library for simple use of LV2 plugins
  SLV2 is a library geared towards music and audio applications which makes
  the use of LV2 plugins <http://lv2plug.in> as simple as possible.
+
+Package: slv2-6-dev
+Provides: slv2-dev
+Conflicts: slv2-dev
+Section: libdevel
+Architecture: any
+Pre-Depends: make
+Depends: slv2 (= ${binary:Version}), librdf0-dev
+Description: Development files (headers) for SLV2
+ Files required for compiling programs which use SLV2, and developer
+ documentation.
+
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/rules b/debian/rules
index f491e73..d02b169 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,13 +17,13 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
 # shared library versions, option 1
-version=2.0.5
-major=2
+#version=2.0.5
+#major=2
 # option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+version=`ls src/.libs/lib*.so.* | \
+ awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+major=`ls src/.libs/lib*.so.* | \
+ awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
 config.status: configure
 	dh_testdir
@@ -63,8 +63,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/slv2-6 install-exec
+	$(MAKE) DESTDIR=$(CURDIR)/debian/slv2-dev install-data install-man
 
 
 # Build architecture-independent files here.
diff --git a/debian/shlibs.local b/debian/shlibs.local
index 900307e..e79a7b7 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1 +1,2 @@
 libslv2 0.3.0 slv2 (>> 0.3.0-0), slv2 (<< 0.3.0-99)
+libjack 0 jack0 (>= 0.107.0) 
diff --git a/debian/slv2-dev.dirs b/debian/slv2-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/slv2-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/slv2-dev.install b/debian/slv2-dev.install
deleted file mode 100644
index 3c996c8..0000000
--- a/debian/slv2-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
-usr/share/pkgconfig/*
diff --git a/debian/slv21.dirs b/debian/slv21.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/slv21.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/slv21.install b/debian/slv21.install
deleted file mode 100644
index d0dbfd1..0000000
--- a/debian/slv21.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*.so.*