Update to packaging to reflect 64 bit support

diff --git a/debian/changelog b/debian/changelog
index 782288d..365910c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ecere-sdk (0.44.04-1) unstable; urgency=low
+
+  * 64 Bit Support
+  * Basic Android Support
+
+ -- Jerome St-Louis <jerstlouis@gmail.com>  Sun, 06 Mar 2013 06:00:00 -0500
+
 ecere-sdk (0.44.03-1) unstable; urgency=low
 
   * Resolved libec0 conflict with "Library for modular symbols and elliptic

diff --git a/debian/control b/debian/control
index bc8c4df..d2d1d47 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Standards-Version: 3.9.3
 Homepage: http://www.ecere.com/
 
 Package: ecere-sdk
-Architecture: armel armhf i386 powerpc
+Architecture: any
 Depends: ecere-dev, ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Recommends: ecere-extras, ecere-samples, libeda0, libedasqlite0
 Description: Ecere cross-platform SDK
@@ -35,7 +35,7 @@ Description: Ecere cross-platform SDK
  libeda0, libedasqlite0).
 
 Package: ecere-dev
-Architecture: armel armhf i386 powerpc
+Architecture: any
 Recommends: fonts-freefont-ttf
 Depends: libecc0 (= ${binary:Version}),
          libecerecom0 (= ${binary:Version}),
@@ -50,7 +50,7 @@ Description: Ecere SDK Development Tools
 
 Package: libecere0
 Section: libs
-Architecture: armel armhf i386 powerpc
+Architecture: any
 Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
@@ -64,7 +64,7 @@ Description: Ecere Runtime Library
 
 Package: libecerecom0
 Section: libs
-Architecture: armel armhf i386 powerpc
+Architecture: any
 Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
@@ -75,7 +75,7 @@ Description: eC Core Runtime Library
 
 Package: libecc0
 Section: libs
-Architecture: armel armhf i386 powerpc
+Architecture: any
 Multi-Arch: same
 Replaces: libec0 (<= 0.44.02-1)
 Breaks: libec0 (<= 0.44.02-1)
@@ -93,7 +93,7 @@ Description: eC Compiler Library
 
 Package: libeda0
 Section: libs
-Architecture: armel armhf i386 powerpc
+Architecture: any
 Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: libecere0, ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}
@@ -106,7 +106,7 @@ Description: Ecere Data Access
 
 Package: libedasqlite0
 Section: libs
-Architecture: armel armhf i386 powerpc
+Architecture: any
 Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: libeda0, ${devel:Depends}, ${misc:Depends}, ${shlibs:Depends}

diff --git a/debian/libeda0.install b/debian/libeda0.install
index 8db5763..c0a1c4b 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
+${LIBDIR}/ec/libEDA.so.0.44
+${LIBDIR}/ec/libEDA.so.0
 ${LIBDIR}/ec/libEDA.so
 usr/share/doc/libeda0/changelog.gz

diff --git a/debian/libedasqlite0.install b/debian/libedasqlite0.install
index 4e50ec9..14e486c 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
+${LIBDIR}/ec/libEDASQLite.so.0.44
+${LIBDIR}/ec/libEDASQLite.so.0
 ${LIBDIR}/ec/libEDASQLite.so
 usr/share/doc/libedasqlite0/changelog.gz

diff --git a/debian/rules b/debian/rules
index c56f5c1..4bb4567 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,14 +15,9 @@ export LIBDIR=$(prefix)/lib/$(DEB_HOST_MULTIARCH)
 export CPPFLAGS
 CPPFLAGS += -DDEB_HOST_MULTIARCH=\"$(LIBDIR)\"
 else
-ifeq ($(DEB_HOST_ARCH),amd64)
-export LIBDIR=$(prefix)/lib32
-else
 export LIBDIR=$(prefix)/lib
 endif
 
-endif
-
 %:
        dh $@