Trying to guess the target system automatically.

Updated dependency version info.
Added .install file for python2.5-epsilon.
Several fixes in debian/rules.

diff --git a/trunk/python-epsilon/debian/changelog b/trunk/python-epsilon/debian/changelog
index 009bdf6..fde615c 100644 (file)
--- a/trunk/python-epsilon/debian/changelog
+++ b/trunk/python-epsilon/debian/changelog
@@ -1,3 +1,10 @@
+python-epsilon (0.2.1-maemo4) unstable; urgency=low
+
+  * debian/rules: Try to guess the target device in a bit more clever way.
+  * debian/control: Fix build dependency info.
+
+ -- Eduardo Lima (Etrunko) <eduardo.lima@indt.org.br>  Thu, 03 Jul 2008 16:05:28 -0300
+
 python-epsilon (0.2.1-maemo3) unstable; urgency=low
 
   * New release.

diff --git a/trunk/python-epsilon/debian/control b/trunk/python-epsilon/debian/control
index 691d84c..32f5451 100644 (file)
--- a/trunk/python-epsilon/debian/control
+++ b/trunk/python-epsilon/debian/control
@@ -2,14 +2,14 @@ Source: python-epsilon
 Section: python
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libepsilon0-dev (>= 0.3.0.012-maemo3), python2.5-cython-dev
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libecore0-dev (>= 0.9.9.042-maemo4), libepsilon0-dev (>= 0.3.0.012-maemo4), python2.5-evas-dev (>= 0.2.3-maemo5), python2.5-cython-dev
 Standards-Version: 3.6.2.2
 
 Package: python2.5-epsilon
 Section: python
 Architecture: any
 Provides: python-epsilon
-Depends: python2.5 (>= 2.5.1-1osso6), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, python2.5 (>= 2.5.1-1osso6), libepsilon0 (>= 0.3.0.012-maemo4)
 Description: Python bindings for Ecore
  This packages contains modules that allow you to use
  Ecore(enlightenment core library) in Python programs.

diff --git a/trunk/python-epsilon/debian/python2.5-epsilon.install b/trunk/python-epsilon/debian/python2.5-epsilon.install
new file mode 100644 (file)
index 0000000..52b6b3c
--- /dev/null
+++ b/trunk/python-epsilon/debian/python2.5-epsilon.install
@@ -0,0 +1 @@
+usr/lib/python2.5/site-packages/*/*

diff --git a/trunk/python-epsilon/debian/rules b/trunk/python-epsilon/debian/rules
index 6c45bee..84a7eb9 100755 (executable)
--- a/trunk/python-epsilon/debian/rules
+++ b/trunk/python-epsilon/debian/rules
@@ -2,29 +2,56 @@
 
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+DEB_DESTDIR=$(CURDIR)/debian/tmp
+
 PYVER=2.5
 PYTHON=python$(PYVER)
 
-p_base=$(PYTHON)-epsilon
-d_base=debian/$(p_base)
-
-DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-    CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
-    ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s
-    endif
-    ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS)))
-         CFLAGS += -mcpu=arm926ej-s
+ifeq ($(DEB_BUILD_ARCH),armel)
+       COMMON_CFLAGS=-DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       N770_CFLAGS=-mcpu=arm926ej-s
+       N8x0_CFLAGS=-mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s
+       ifneq ($(DEB_BUILD_OPTIONS),)
+               ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS)))
+                       SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
+               else
+                       ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS)))
+                               SPECIFIC_CFLAGS=$(N770_CFLAGS)
+                       endif
+               endif
+       endif
+    ifeq ($(SPECIFIC_CFLAGS),)
+        ifeq (0,$(shell test -e /etc/osso_software_version; echo $$?))
+            SW_VERSION?=$(shell cat /etc/osso_software_version|cut -d_ -f2)
+                       ifneq (,$(findstring $(SW_VERSION),OSSO1.1 2008SE DIABLO))
+                               SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
+            endif
+               endif
+       ifeq ($(SPECIFIC_CFLAGS),)
+            # Our last hope is to look at the value returned by `sb-conf current`
+            SB_CURRENT?=$(shell sb-conf current|cut -d_ -f1)
+                       ifneq (,$(findstring $(SB_CURRENT),GREGALE BORA CHINOOK DIABLO))
+                               ifeq ($(SB_CURRENT),GREGALE)
+                                       SPECIFIC_CFLAGS=$(N770_CFLAGS)
+                               else
+                                       SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
+                               endif
+                       else
+                               COMMON_CFLAGS=
+                       endif
+        endif
     endif
 endif
 
+CFLAGS+=$(COMMON_CFLAGS) $(SPECIFIC_CFLAGS)
+
 build: build-stamp
 build-stamp:
        dh_testdir
        touch epsilon/epsilon.*.pyx
-       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
+       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build_ext build
        touch build-stamp
 clean::
        dh_testdir
@@ -40,18 +67,22 @@ install: build
        dh_testdir
        dh_testroot
        dh_installdirs
-       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install --root=$(d_base)
+       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install --root=$(DEB_DESTDIR)
        if [ "x$(DEB_BUILD_ARCH)" = "xarmel" ]; then \
-               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/epsilon/*.py; \
-               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/epsilon/*.pyc; \
+               rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/epsilon/*.py; \
+               rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/epsilon/*.pyc; \
        fi
+       dh_install --sourcedir=$(DEB_DESTDIR) --fail-missing
 
-binary: binary-indep binary-arch
-binary-indep: install
-binary-arch: install
+binary: binary-arch
+binary-arch: build install
        dh_testdir
        dh_testroot
+       dh_installdocs
+       dh_installdebconf
+       dh_installchangelogs
        dh_strip
+       dh_compress
        dh_fixperms
        dh_makeshlibs
        dh_installdeb
@@ -60,4 +91,4 @@ binary-arch: install
        dh_md5sums
        dh_builddeb
 
-.PHONY: build install clean binary binary-indep binary-arch
+.PHONY: build install clean binary binary-arch