The following commit has been merged in the master branch:
commit d6b0f9237f0f004508665017020d98264ea9e028
Author: Alessio Treglia <alessio at debian.org>
Date: Sun Jan 22 23:00:16 2012 +0100
Add Multi-Arch support.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index a3b47c8..64be161 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Build-Depends:
autoconf,
autotools-dev,
- debhelper (>= 7.0.50~),
+ debhelper (>= 8.1.3~),
libasound2-dev [linux-any],
libjack-dev [linux-any],
libreadline-dev,
@@ -21,6 +21,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/stk.git
Package: libstk0-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends:
librtaudio-dev [linux-any],
librtmidi-dev [linux-any],
@@ -42,6 +43,8 @@ Replaces:
libstk0,
libstk0c2
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
diff --git a/debian/libstk0-dev.install b/debian/libstk0-dev.install
index 28e5cc1..5912cf3 100644
--- a/debian/libstk0-dev.install
+++ b/debian/libstk0-dev.install
@@ -1,2 +1,2 @@
debian/tmp/usr/include/stk/*
-debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/*/lib*.so
diff --git a/debian/libstk0c2a.install b/debian/libstk0c2a.install
index c45ebcf..3ddde58 100644
--- a/debian/libstk0c2a.install
+++ b/debian/libstk0c2a.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 770693d..26fa351 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -10,8 +10,8 @@ Forwarded: no
src/Makefile.in | 18 +++++++++++++++---
5 files changed, 28 insertions(+), 12 deletions(-)
---- stk.orig/projects/demo/Makefile.in
-+++ stk/projects/demo/Makefile.in
+--- stk.orig/projects/demo/Makefile.in 2012-01-22 22:50:13.241232940 +0100
++++ stk/projects/demo/Makefile.in 2012-01-22 22:51:30.413615614 +0100
@@ -1,7 +1,7 @@
### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
### STK demo Makefile - for various flavors of unix
@@ -21,7 +21,7 @@ Forwarded: no
RM = /bin/rm
SRC_PATH = ../../src
OBJECT_PATH = @object_path@
-@@ -57,8 +57,8 @@ DEFS += -DRAWWAVE_PATH=\"$(RAWWAVES)\
+@@ -57,8 +57,8 @@
all : $(PROGRAMS)
@@ -32,9 +32,9 @@ Forwarded: no
libdemo: demo.cpp
$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
---- stk.orig/src/Makefile.in
-+++ stk/src/Makefile.in
-@@ -3,7 +3,7 @@
+--- stk.orig/src/Makefile.in 2012-01-22 22:50:13.273233094 +0100
++++ stk/src/Makefile.in 2012-01-22 22:51:47.873702193 +0100
+@@ -3,13 +3,15 @@
STATICLIB = libstk.a
SHAREDLIB = @sharedlib@
@@ -43,7 +43,15 @@ Forwarded: no
RELEASE = 4.4.3
AR = ar -rsc
-@@ -71,11 +71,23 @@ $(STATICLIB) : $(OBJECTS)
+ RM = /bin/rm
+ LN = /bin/ln
+ OBJECT_PATH = @object_path@
++LIBDIR = @libdir@
++PREFIX = @prefix@
+ vpath %.o $(OBJECT_PATH)
+
+ OBJECTS = Stk.o Generator.o Noise.o Blit.o BlitSaw.o BlitSquare.o Granulate.o \
+@@ -71,11 +73,23 @@
$(AR) $(STATICLIB) $(OBJECT_PATH)/*.o
$(SHAREDLIB) : $(OBJECTS)
@@ -60,24 +68,24 @@ Forwarded: no
+
+install: $(SHAREDLIB) install-headers
+ install -d $(DESTDIR)/usr/share/stk
-+ install -d $(DESTDIR)/usr/lib
-+ install -m 644 $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)/usr/lib
-+ ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)/usr/lib/$(SHAREDLIB).$(MAJOR)
-+ ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)/usr/lib/$(SHAREDLIB)
++ install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
++ install -m 644 $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)
++ ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR)
++ ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
+
$(OBJECTS) : Stk.h
clean :
-@@ -86,4 +98,4 @@ clean :
+@@ -86,4 +100,4 @@
$(RM) -fR *.dSYM
distclean: clean
- $(RM) Makefile
\ No newline at end of file
+ $(RM) Makefile
---- stk.orig/Makefile.in
-+++ stk/Makefile.in
-@@ -4,7 +4,7 @@ RM = /bin/rm
+--- stk.orig/Makefile.in 2012-01-22 22:50:13.377233610 +0100
++++ stk/Makefile.in 2012-01-22 22:51:30.413615614 +0100
+@@ -4,7 +4,7 @@
all :
cd src && $(MAKE)
@@ -86,16 +94,16 @@ Forwarded: no
cd projects/effects && $(MAKE) libeffects
cd projects/ragamatic && $(MAKE) libragamat
cd projects/examples && $(MAKE) -f libMakefile
-@@ -25,3 +25,6 @@ distclean: clean
+@@ -25,3 +25,6 @@
cd projects/ragamatic && $(MAKE) distclean
cd projects/examples && $(MAKE) distclean
+install:
+ make -C src install
+# make -C projects/demo install
---- stk.orig/configure
-+++ stk/configure
-@@ -5237,9 +5237,9 @@ case $host_os in *\ *) host_os=`echo "$h
+--- stk.orig/configure 2012-01-22 22:50:13.321233331 +0100
++++ stk/configure 2012-01-22 22:51:30.421615658 +0100
+@@ -5237,9 +5237,9 @@
sharedlib="libstk.so"
@@ -107,7 +115,7 @@ Forwarded: no
case $host in
*-apple*)
-@@ -6967,7 +6967,8 @@ $debug ||
+@@ -6967,7 +6967,8 @@
if test -n "$CONFIG_FILES"; then
@@ -117,9 +125,9 @@ Forwarded: no
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
ac_cs_awk_cr='\\r'
---- stk.orig/configure.ac
-+++ stk/configure.ac
-@@ -93,8 +93,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
+--- stk.orig/configure.ac 2012-01-22 22:50:13.181232636 +0100
++++ stk/configure.ac 2012-01-22 22:51:30.421615658 +0100
+@@ -93,8 +93,8 @@
AC_CANONICAL_HOST
AC_SUBST( sharedlib, ["libstk.so"] )
--
stk packaging