Fixed build

diff --git a/trunk/python-ecore/debian/changelog b/trunk/python-ecore/debian/changelog
index a8cccd3..483cbf1 100644 (file)
--- a/trunk/python-ecore/debian/changelog
+++ b/trunk/python-ecore/debian/changelog
@@ -1,3 +1,9 @@
+python-ecore (0.2.0-maemo.1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eduardo Lima <eduardo.lima@indt.org.br>  Sun, 09 Dec 2007 23:01:47 -0200
+
 python-ecore (0.1.1-maemo.2) unstable; urgency=low
 
   * dependency change python2.5-setuptools -> python-setuptools

diff --git a/trunk/python-ecore/debian/control b/trunk/python-ecore/debian/control
index 43a1ec3..87ddc61 100644 (file)
--- a/trunk/python-ecore/debian/control
+++ b/trunk/python-ecore/debian/control
@@ -2,8 +2,7 @@ Source: python-ecore
 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-1osso2), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libecore0-dev (>= 0.9.9.040-maemo.1), python-evas-dev
-#, python2.5-numeric-dev (>= 24.2-1osso4)
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso2), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libecore0-dev (>= 0.9.9.040-maemo.1), python2.5-cython-dev
 Standards-Version: 3.6.2.2
 
 Package: python2.5-ecore
@@ -12,7 +11,7 @@ Architecture: any
 Provides: python-ecore
 Depends: python2.5 (>= 2.5.1-1osso2), ${shlibs:Depends}
 Description: Python bindings for Ecore
- This packages contains modules that allow you to use 
+ This packages contains modules that allow you to use
  Ecore(enlightenment core library) in Python programs.
 
 

diff --git a/trunk/python-ecore/debian/rules b/trunk/python-ecore/debian/rules
index 748dbbf..237e99d 100755 (executable)
--- a/trunk/python-ecore/debian/rules
+++ b/trunk/python-ecore/debian/rules
@@ -4,40 +4,42 @@ PYVER=2.5
 PYTHON=python$(PYVER)
 
 p_base=$(PYTHON)-ecore
-p_dev =$(p_base)-dev
-
 d_base=debian/$(p_base)
-d_dev=debian/$(p_dev)
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-ifeq ($(DEB_BUILD_ARCH),armel)
-    #CFLAGS="-Os -mthumb -mfloat-abi=softfp -Wall -Wstrict-prototypes"
-    CFLAGS+="-DNDEBUG=1 -I/usr/include/python2.5/python-evas -fomit-frame-pointer -O2 -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant"
+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
+    endif
 endif
 
-build: build-stamp 
+build: build-stamp
 build-stamp:
-       dh_testdir 
+       dh_testdir
        touch ecore/ecore.c_evas.pyx
-       CFLAGS=$(CFLAGS) $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
+       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
        touch build-stamp
 clean:
        dh_testdir
        dh_testroot
-       $(PYTHON) setup.py clean 
+       $(PYTHON) setup.py clean
        -rm -f build-stamp
        -rm -rf build dist python_ecore.egg-info
        -rm -f ecore/*.py[co]
        -rm -f *.py[co]
-       dh_clean 
-       
+       dh_clean
+
 install: build
        dh_testdir
        dh_testroot
        dh_installdirs
 
-       $(PYTHON) setup.py install --root=$(d_base) 
+       $(PYTHON) setup.py install --root=$(d_base)
 
 binary: binary-indep binary-arch
 binary-indep: install
@@ -45,7 +47,6 @@ binary-arch: install
        dh_testdir
        dh_testroot
        dh_strip
-       #dh_compress -p$(p_dev) -Xexamples -X.py
        dh_fixperms
        dh_makeshlibs
        dh_installdeb

diff --git a/trunk/python-edje/debian/changelog b/trunk/python-edje/debian/changelog
index faa5a2e..1c9b108 100644 (file)
--- a/trunk/python-edje/debian/changelog
+++ b/trunk/python-edje/debian/changelog
@@ -1,3 +1,9 @@
+python-edje (0.2.0-maemo.1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eduardo Lima <eduardo.lima@indt.org.br>  Sun, 09 Dec 2007 23:01:47 -0200
+
 python-edje (0.1.1-maemo.3) unstable; urgency=low
 
   * dependency change python2.5-setuptools -> python-setuptools

diff --git a/trunk/python-edje/debian/control b/trunk/python-edje/debian/control
index ca5f576..e0c6ee0 100644 (file)
--- a/trunk/python-edje/debian/control
+++ b/trunk/python-edje/debian/control
@@ -2,7 +2,7 @@ Source: python-edje
 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-1osso2), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libedje0-dev (>= 0.5.0.040-maemo.1), python-evas-dev
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso2), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libedje0-dev (>= 0.5.0.040-maemo.1), python2.5-cython-dev
 Standards-Version: 3.6.2.2
 
 Package: python2.5-edje
@@ -11,14 +11,14 @@ Architecture: any
 Provides: python-edje
 Depends: python2.5 (>= 2.5.1-1osso2), ${shlibs:Depends}
 Description: Python bindings for Edje
- This packages contains modules that allow you to use 
+ This packages contains modules that allow you to use
  Edje(enlightenment Graphical layout and animation library) in Python programs.
 
-Package: python-efl-core-demo
+Package: python2.5-edje-demo
 Section: user/accessories
 Architecture: any
 Depends: python2.5 (>= 2.5.1-1osso2), ${shlibs:Depends}, libecore-evas, python2.5-ecore (>= 0.1.1-maemo.1), python2.5-evas (>= 0.1.1-maemo.1), python2.5-edje (>= 0.1.1-maemo.1)
 Description: Python-edje demos
- This package contains python-edje demos: 
- App Launcher, Virtual keyboard 
+ This package contains python-edje demos:
+ App Launcher, Virtual keyboard
 

diff --git a/trunk/python-edje/debian/rules b/trunk/python-edje/debian/rules
index d238b96..8c041da 100755 (executable)
--- a/trunk/python-edje/debian/rules
+++ b/trunk/python-edje/debian/rules
@@ -4,36 +4,37 @@ PYVER=2.5
 PYTHON=python$(PYVER)
 
 p_base=$(PYTHON)-edje
-p_dev =$(p_base)-dev
-
 d_base=debian/$(p_base)
-d_dev=debian/$(p_dev)
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-ifeq ($(DEB_BUILD_ARCH),armel)
-    #CFLAGS="-Os -mthumb -mfloat-abi=softfp -Wall -Wstrict-prototypes"
-    CFLAGS+="-DNDEBUG=1 -fomit-frame-pointer -O2 -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant"
+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
+    endif
 endif
 
-build: build-stamp 
+build: build-stamp
 build-stamp:
-       dh_testdir 
+       dh_testdir
        touch edje/edje.c_evas.pyx
-       CFLAGS=$(CFLAGS) $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
-       for f in debian/*.edj.uue ; do uudecode $$f -o $${f%.*} ; done
+       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
        touch build-stamp
 clean:
        dh_testdir
        dh_testroot
-       $(PYTHON) setup.py clean 
+       $(PYTHON) setup.py clean
        -rm -f build-stamp
        -rm -rf build dist python_edje.egg-info
        -rm -f edje/*.py[co]
        -rm -f *.py[co]
        -rm -f debian/*.edj
-       dh_clean 
-       
+       dh_clean
+
 install: build
        dh_testdir
        dh_testroot
@@ -48,7 +49,6 @@ binary-arch: install
        dh_testroot
        dh_install
        dh_strip
-       #dh_compress -p$(p_dev) -Xexamples -X.py
        dh_fixperms
        dh_makeshlibs
        dh_installdeb

diff --git a/trunk/python-efl-core/debian/control b/trunk/python-efl-core/debian/control
index 2c66225..101b959 100644 (file)
--- a/trunk/python-efl-core/debian/control
+++ b/trunk/python-efl-core/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.1
 Package: python2.5-efl-core
 Priority: optional
 Architecture: all
-Depends: efl-core, python2.5-evas, python2.5-ecore, python2.5-edje, python2.5-epsilon, python2.5-etk
+Depends: efl-core, python2.5-evas, python2.5-ecore, python2.5-edje
 Description: Python bindings for EFL (Enlightenment Foundation Libraries)
  This package includes Python bindings for Enlightenment Foundation Core Libraries
  .

diff --git a/trunk/python-evas/debian/changelog b/trunk/python-evas/debian/changelog
index a6dbe06..48d805a 100644 (file)
--- a/trunk/python-evas/debian/changelog
+++ b/trunk/python-evas/debian/changelog
@@ -1,3 +1,9 @@
+python-evas (0.2.0-maemo.1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eduardo Lima (Etrunko) <eduardo.lima@indt.org.br>  Sun, 09 Dec 2007 23:01:47 -0200
+
 python-evas (0.1.1-maemo.3) unstable; urgency=low
 
   * dependency change python2.5-setuptools -> python-setuptools
@@ -6,7 +12,7 @@ python-evas (0.1.1-maemo.3) unstable; urgency=low
 
 python-evas (0.1.1-maemo.2) unstable; urgency=low
 
-  * Provides python-evas and python-evas-dev 
+  * Provides python-evas and python-evas-dev
 
  -- Ed Bartosh <bartosh@gmail.com>  Sun, 23 Sep 2007 01:01:21 +0300
 

diff --git a/trunk/python-evas/debian/control b/trunk/python-evas/debian/control
index 8f9aa5c..b9c1baf 100644 (file)
--- a/trunk/python-evas/debian/control
+++ b/trunk/python-evas/debian/control
@@ -2,7 +2,7 @@ Source: python-evas
 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-1osso2), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libevas0-dev (>= 0.9.9.040-maemo.1), python2.5-numeric-dev (>= 24.2-1osso4)
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso2), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libevas0-dev (>= 0.9.9.040-maemo.1), python2.5-numeric-dev (>= 24.2-1osso4), python2.5-cython-dev
 Standards-Version: 3.6.2.2
 
 Package: python2.5-evas
@@ -11,13 +11,6 @@ Architecture: any
 Provides: python-evas
 Depends: python2.5 (>= 2.5.1-1osso2), ${shlibs:Depends}
 Description: Python bindings for enlightenment advanced canvas library
- This packages contains modules that allow you to use 
+ This packages contains modules that allow you to use
  Evas(enlightenment advanced canvas library) in Python programs.
 
-Package: python2.5-evas-dev
-Section: python
-Architecture: all
-Provides: python-evas-dev
-Depends: python2.5-evas (= ${Source-Version})
-Description: Development files for Python Evas
-

diff --git a/trunk/python-evas/debian/rules b/trunk/python-evas/debian/rules
index 7ba5e1d..7b4985b 100755 (executable)
--- a/trunk/python-evas/debian/rules
+++ b/trunk/python-evas/debian/rules
@@ -4,53 +4,49 @@ PYVER=2.5
 PYTHON=python$(PYVER)
 
 p_base=$(PYTHON)-evas
-p_dev =$(p_base)-dev
-
 d_base=debian/$(p_base)
-d_dev=debian/$(p_dev)
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-ifeq ($(DEB_BUILD_ARCH),armel)
-    #CFLAGS="-Os -mthumb -mfloat-abi=softfp -Wall -Wstrict-prototypes"
-    CFLAGS+="-DNDEBUG=1 -fomit-frame-pointer -O2 -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant"
+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
+    endif
 endif
 
-build: build-stamp 
+build: build-stamp
 build-stamp:
-       dh_testdir 
+       dh_testdir
        touch evas/evas.c_evas.pyx
-       CFLAGS=$(CFLAGS) $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
+       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
        touch build-stamp
 clean:
        dh_testdir
        dh_testroot
-       $(PYTHON) setup.py clean 
+       $(PYTHON) setup.py clean
        -rm -f build-stamp
        -rm -rf build dist python_evas.egg-info
        -rm -f evas/*.py[co]
        -rm -f *.py[co]
-       dh_clean 
-       
+       dh_clean
+
 install: build
        dh_testdir
        dh_testroot
        dh_installdirs
 
-       $(PYTHON) setup.py install --root=$(d_base) 
-       install -d $(d_dev)/usr/
-       mv $(d_base)/usr/include $(d_dev)/usr/
+       $(PYTHON) setup.py install --root=$(d_base)
 
 binary: binary-indep binary-arch
 binary-indep: install
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs -p$(p_dev)
-       dh_installdocs -p$(p_dev)
-       dh_installman -p$(p_dev)
        dh_strip
-       dh_compress -p$(p_dev) -Xexamples -X.py
        dh_fixperms
        dh_makeshlibs
        dh_installdeb