debian: Multi-Arch support working; Fix for github watch

diff --git a/debian/control b/debian/control
index e99f8f4..5f242aa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: devel
 Priority: optional
 Maintainer: Jerome St-Louis <jerstlouis@gmail.com>
 Build-Depends: debhelper (>= 9~),
-               dpkg-dev (>= 1.16.1~),
                dh-exec (>= 0.3~),
+               dpkg-dev (>= 1.16.1~),
                libffi-dev,
                libfontconfig1-dev,
                libfreetype6-dev,
@@ -26,14 +26,8 @@ Homepage: http://www.ecere.com/
 
 Package: ecere-sdk
 Architecture: armel armhf i386 powerpc
-Depends: ecere-dev,
-         ecere-extras,
-         ecere-samples,
-         libeda0,
-         libedasqlite0,
-         ${devel:Depends},
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ecere-dev, ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Recommends: ecere-extras, ecere-samples, libeda0, libedasqlite0
 Description: Ecere cross-platform SDK
  This package is a metapackage providing
  the entire Ecere cross-platform SDK
@@ -57,6 +51,7 @@ Description: Ecere SDK Development Tools
 Package: libecere0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: Ecere Runtime Library
@@ -70,6 +65,7 @@ Description: Ecere Runtime Library
 Package: libecerecom0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: eC Core Runtime Library
@@ -80,6 +76,7 @@ Description: eC Core Runtime Library
 Package: libec0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: libecere0 (= ${binary:Version}),
          ${devel:Depends},
@@ -95,6 +92,7 @@ Description: eC Compiler Library
 Package: libeda0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: libecere0, ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: Ecere Data Access
@@ -107,6 +105,7 @@ Description: Ecere Data Access
 Package: libedasqlite0
 Section: libs
 Architecture: armel armhf i386 powerpc
+Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: libeda0, ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: EDA SQLite Driver

diff --git a/debian/ecere-extras.install b/debian/ecere-extras.install
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/debian/ecere-samples.install b/debian/ecere-samples.install
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/debian/ecere-sdk.install b/debian/ecere-sdk.install
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/debian/libec0.install b/debian/libec0.install
index 2e63d6d..8753c84 100755 (executable)
--- a/debian/libec0.install
+++ b/debian/libec0.install
@@ -1,5 +1,5 @@
 #!/usr/bin/dh-exec
 ${LIBDIR}/libec.so.0.44
 ${LIBDIR}/libec.so.0
-usr/lib/ec/libec.so
+${LIBDIR}/ec/libec.so
 usr/share/doc/libec0/changelog.gz

diff --git a/debian/libecere0.install b/debian/libecere0.install
index d4bb854..9a7e8e4 100755 (executable)
--- a/debian/libecere0.install
+++ b/debian/libecere0.install
@@ -1,5 +1,5 @@
 #!/usr/bin/dh-exec
 ${LIBDIR}/libecere.so.0.44
 ${LIBDIR}/libecere.so.0
-usr/lib/ec/libecere.so
+${LIBDIR}/ec/libecere.so
 usr/share/doc/libecere0/changelog.gz

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

diff --git a/debian/libeda0.install b/debian/libeda0.install
index 42c1efb..8db5763 100755 (executable)
--- a/debian/libeda0.install
+++ b/debian/libeda0.install
@@ -1,5 +1,5 @@
 #!/usr/bin/dh-exec
 ${LIBDIR}/libEDA.so.0.44
 ${LIBDIR}/libEDA.so.0
-usr/lib/ec/libEDA.so
+${LIBDIR}/ec/libEDA.so
 usr/share/doc/libeda0/changelog.gz

diff --git a/debian/libedasqlite0.install b/debian/libedasqlite0.install
index fab237d..4e50ec9 100755 (executable)
--- a/debian/libedasqlite0.install
+++ b/debian/libedasqlite0.install
@@ -1,5 +1,5 @@
 #!/usr/bin/dh-exec
 ${LIBDIR}/libEDASQLite.so.0.44
 ${LIBDIR}/libEDASQLite.so.0
-usr/lib/ec/libEDASQLite.so
+${LIBDIR}/ec/libEDASQLite.so
 usr/share/doc/libedasqlite0/changelog.gz

diff --git a/debian/rules b/debian/rules
index c05cf89..c56f5c1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,9 @@ prefix=/usr
 endif
 
 ifdef DEB_HOST_MULTIARCH
-export LIBDIR=$(prefix)/$(DEB_HOST_MULTIARCH)
+export LIBDIR=$(prefix)/lib/$(DEB_HOST_MULTIARCH)
+export CPPFLAGS
+CPPFLAGS += -DDEB_HOST_MULTIARCH=\"$(LIBDIR)\"
 else
 ifeq ($(DEB_HOST_ARCH),amd64)
 export LIBDIR=$(prefix)/lib32

diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644 (file)
index 0000000..dd6ce3a
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,4 @@
+ecere-sdk source: dh-exec-subst-unknown-variable
+# We use {LIBDIR} in the install files, to ensure consistency with the upstream Makefiles which accepts LIBDIR
+# It is derived from DEB_HOST_MULTIARCH in our rules files if available, otherwise guessed from DEB_HOST_ARCH
+# in an attempt to be compatible with pre-multiarch Debians.

diff --git a/debian/watch b/debian/watch
index 45f627c..6c461e6 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-https://github.com/ecere/sdk/tags .*/tarball/(\d[\d\.]+)
+https://github.com/ecere/sdk/tags .*/(\d[\d\.]+)\.tar\.gz