debian: Initial attempt at proper multi-arch support

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/debian/control b/debian/control
index b99ffd3..e99f8f4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: ecere-sdk
 Section: devel
 Priority: optional
 Maintainer: Jerome St-Louis <jerstlouis@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9~),
                dpkg-dev (>= 1.16.1~),
+               dh-exec (>= 0.3~),
                libffi-dev,
                libfontconfig1-dev,
                libfreetype6-dev,
@@ -56,6 +57,7 @@ Description: Ecere SDK Development Tools
 Package: libecere0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Pre-Depends: multiarch-support
 Depends: ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: Ecere Runtime Library
  This package provides the Linux version
@@ -68,6 +70,7 @@ Description: Ecere Runtime Library
 Package: libecerecom0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Pre-Depends: multiarch-support
 Depends: ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: eC Core Runtime Library
  This package provides the bare minimum
@@ -77,6 +80,7 @@ Description: eC Core Runtime Library
 Package: libec0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Pre-Depends: multiarch-support
 Depends: libecere0 (= ${binary:Version}),
          ${devel:Depends},
          ${misc:Depends},
@@ -91,6 +95,7 @@ Description: eC Compiler Library
 Package: libeda0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Pre-Depends: multiarch-support
 Depends: libecere0, ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: Ecere Data Access
  This package provides the Ecere
@@ -102,6 +107,7 @@ Description: Ecere Data Access
 Package: libedasqlite0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Pre-Depends: multiarch-support
 Depends: libeda0, ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: EDA SQLite Driver
  This package provides SQLite driver

diff --git a/debian/ecere-dev.install b/debian/ecere-dev.install
new file mode 100644 (file)
index 0000000..9932e7f
--- /dev/null
+++ b/debian/ecere-dev.install
@@ -0,0 +1,10 @@
+#!/usr/bin/dh-exec
+usr/bin
+${LIBDIR}/libecereVanilla.a
+${LIBDIR}/libec.so
+${LIBDIR}/libecereCOM.so
+${LIBDIR}/libecere.so
+usr/share/applications
+usr/share/pixmaps
+usr/share/man
+usr/share/doc/ecere-dev/changelog.gz

diff --git a/debian/ecere-dev.install.in32 b/debian/ecere-dev.install.in32
deleted file mode 100644 (file)
index 6f837b7..0000000
--- a/debian/ecere-dev.install.in32
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin
-usr/lib/libecereVanilla.a
-usr/lib/libec.so
-usr/lib/libecereCOM.so
-usr/lib/libecere.so
-usr/share/applications
-usr/share/pixmaps
-usr/share/man
-usr/share/doc/ecere-dev/changelog.gz

diff --git a/debian/ecere-dev.install.in64 b/debian/ecere-dev.install.in64
deleted file mode 100644 (file)
index 6f24cde..0000000
--- a/debian/ecere-dev.install.in64
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin
-usr/lib32/libecereVanilla.a
-usr/lib32/libec.so
-usr/lib32/libecereCOM.so
-usr/lib32/libecere.so
-usr/share/applications
-usr/share/pixmaps
-usr/share/man
-usr/share/doc/ecere-dev/changelog.gz

diff --git a/debian/libec0.install b/debian/libec0.install
new file mode 100644 (file)
index 0000000..2e63d6d
--- /dev/null
+++ b/debian/libec0.install
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+${LIBDIR}/libec.so.0.44
+${LIBDIR}/libec.so.0
+usr/lib/ec/libec.so
+usr/share/doc/libec0/changelog.gz

diff --git a/debian/libec0.install.in32 b/debian/libec0.install.in32
deleted file mode 100644 (file)
index e9c9402..0000000
--- a/debian/libec0.install.in32
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libec.so.0.44
-usr/lib/libec.so.0
-usr/lib/ec/libec.so
-usr/share/doc/libec0/changelog.gz

diff --git a/debian/libec0.install.in64 b/debian/libec0.install.in64
deleted file mode 100644 (file)
index c0fd9f4..0000000
--- a/debian/libec0.install.in64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib32/libec.so.0.44
-usr/lib32/libec.so.0
-usr/lib/ec/libec.so
-usr/share/doc/libec0/changelog.gz

diff --git a/debian/libecere0.install b/debian/libecere0.install
new file mode 100644 (file)
index 0000000..d4bb854
--- /dev/null
+++ b/debian/libecere0.install
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+${LIBDIR}/libecere.so.0.44
+${LIBDIR}/libecere.so.0
+usr/lib/ec/libecere.so
+usr/share/doc/libecere0/changelog.gz

diff --git a/debian/libecere0.install.in32 b/debian/libecere0.install.in32
deleted file mode 100644 (file)
index 6c21388..0000000
--- a/debian/libecere0.install.in32
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libecere.so.0.44
-usr/lib/libecere.so.0
-usr/lib/ec/libecere.so
-usr/share/doc/libecere0/changelog.gz

diff --git a/debian/libecere0.install.in64 b/debian/libecere0.install.in64
deleted file mode 100644 (file)
index 22af57c..0000000
--- a/debian/libecere0.install.in64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib32/libecere.so.0.44
-usr/lib32/libecere.so.0
-usr/lib/ec/libecere.so
-usr/share/doc/libecere0/changelog.gz

diff --git a/debian/libecerecom0.install b/debian/libecerecom0.install
new file mode 100644 (file)
index 0000000..00d4293
--- /dev/null
+++ b/debian/libecerecom0.install
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+${LIBDIR}/libecereCOM.so.0.44
+${LIBDIR}/libecereCOM.so.0
+usr/lib/ec/libecereCOM.so
+usr/share/doc/libecerecom0/changelog.gz

diff --git a/debian/libecerecom0.install.in32 b/debian/libecerecom0.install.in32
deleted file mode 100644 (file)
index 5bb6667..0000000
--- a/debian/libecerecom0.install.in32
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libecereCOM.so.0.44
-usr/lib/libecereCOM.so.0
-usr/lib/ec/libecereCOM.so
-usr/share/doc/libecerecom0/changelog.gz

diff --git a/debian/libecerecom0.install.in64 b/debian/libecerecom0.install.in64
deleted file mode 100644 (file)
index f5f1779..0000000
--- a/debian/libecerecom0.install.in64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib32/libecereCOM.so.0.44
-usr/lib32/libecereCOM.so.0
-usr/lib/ec/libecereCOM.so
-usr/share/doc/libecerecom0/changelog.gz

diff --git a/debian/libeda0.install b/debian/libeda0.install
new file mode 100644 (file)
index 0000000..42c1efb
--- /dev/null
+++ b/debian/libeda0.install
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+${LIBDIR}/libEDA.so.0.44
+${LIBDIR}/libEDA.so.0
+usr/lib/ec/libEDA.so
+usr/share/doc/libeda0/changelog.gz

diff --git a/debian/libeda0.install.in32 b/debian/libeda0.install.in32
deleted file mode 100644 (file)
index 3983d86..0000000
--- a/debian/libeda0.install.in32
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libEDA.so.0.44
-usr/lib/libEDA.so.0
-usr/lib/ec/libEDA.so
-usr/share/doc/libeda0/changelog.gz

diff --git a/debian/libeda0.install.in64 b/debian/libeda0.install.in64
deleted file mode 100644 (file)
index 1489b83..0000000
--- a/debian/libeda0.install.in64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib32/libEDA.so.0.44
-usr/lib32/libEDA.so.0
-usr/lib/ec/libEDA.so
-usr/share/doc/libeda0/changelog.gz

diff --git a/debian/libedasqlite0.install b/debian/libedasqlite0.install
new file mode 100644 (file)
index 0000000..fab237d
--- /dev/null
+++ b/debian/libedasqlite0.install
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+${LIBDIR}/libEDASQLite.so.0.44
+${LIBDIR}/libEDASQLite.so.0
+usr/lib/ec/libEDASQLite.so
+usr/share/doc/libedasqlite0/changelog.gz

diff --git a/debian/libedasqlite0.install.in32 b/debian/libedasqlite0.install.in32
deleted file mode 100644 (file)
index 52f8348..0000000
--- a/debian/libedasqlite0.install.in32
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libEDASQLite.so.0.44
-usr/lib/libEDASQLite.so.0
-usr/lib/ec/libEDASQLite.so
-usr/share/doc/libedasqlite0/changelog.gz

diff --git a/debian/libedasqlite0.install.in64 b/debian/libedasqlite0.install.in64
deleted file mode 100644 (file)
index aacd4bd..0000000
--- a/debian/libedasqlite0.install.in64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib32/libEDASQLite.so.0.44
-usr/lib32/libEDASQLite.so.0
-usr/lib/ec/libEDASQLite.so
-usr/share/doc/libedasqlite0/changelog.gz

diff --git a/debian/rules b/debian/rules
index 07246f3..c05cf89 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,27 @@
 #!/usr/bin/make -f
 
 DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export DEBIAN_PACKAGE=1
 export DPKG_EXPORT_BUILDFLAGS=1
 include /usr/share/dpkg/buildflags.mk
 
-%:
-       dh $@
+ifndef prefix
+prefix=/usr
+endif
 
-override_dh_install:
+ifdef DEB_HOST_MULTIARCH
+export LIBDIR=$(prefix)/$(DEB_HOST_MULTIARCH)
+else
 ifeq ($(DEB_HOST_ARCH),amd64)
-       cp debian/libecere0.install.in64 debian/libecere0.install
-       cp debian/libecerecom0.install.in64 debian/libecerecom0.install
-       cp debian/libeda0.install.in64 debian/libeda0.install
-       cp debian/libedasqlite0.install.in64 debian/libedasqlite0.install
-       cp debian/libec0.install.in64 debian/libec0.install
-       cp debian/ecere-dev.install.in64 debian/ecere-dev.install
+export LIBDIR=$(prefix)/lib32
+else
+export LIBDIR=$(prefix)/lib
 endif
 
-ifeq ($(DEB_HOST_ARCH),i386)
-       cp debian/libecere0.install.in32 debian/libecere0.install
-       cp debian/libecerecom0.install.in32 debian/libecerecom0.install
-       cp debian/libeda0.install.in32 debian/libeda0.install
-       cp debian/libedasqlite0.install.in32 debian/libedasqlite0.install
-       cp debian/libec0.install.in32 debian/libec0.install
-       cp debian/ecere-dev.install.in32 debian/ecere-dev.install
 endif
-       dh_install
+
+%:
+       dh $@
 
 override_dh_strip: