From 68c776d6aada7aebc96051578e13c118a264c2ec Mon Sep 17 00:00:00 2001 From: etrunko Date: Thu, 10 Jul 2008 13:38:29 +0000 Subject: [PATCH] Try to guess the target system automatically. Added .install file for python2.5-edje. Fixed .install file for python2.5-edje-demo. Several fixes in debian/rules. Updated dependency info. --- trunk/python-edje/debian/changelog | 13 ++++ trunk/python-edje/debian/control | 6 +- .../python-edje/debian/python2.5-edje-demo.install | 4 +- trunk/python-edje/debian/python2.5-edje.install | 1 + trunk/python-edje/debian/rules | 80 ++++++++++++++------ 5 files changed, 77 insertions(+), 27 deletions(-) create mode 100644 trunk/python-edje/debian/python2.5-edje.install diff --git a/trunk/python-edje/debian/changelog b/trunk/python-edje/debian/changelog index 3728bfd..20af83b 100644 --- a/trunk/python-edje/debian/changelog +++ b/trunk/python-edje/debian/changelog @@ -1,3 +1,16 @@ +python-edje (0.2.1-maemo5) unstable; urgency=low + + * debian/rules: Install .edj files + + -- Eduardo Lima (Etrunko) Wed, 09 Jul 2008 16:03:59 -0300 + +python-edje (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) Thu, 03 Jul 2008 16:05:28 -0300 + python-edje (0.2.1-maemo3) unstable; urgency=low * New release diff --git a/trunk/python-edje/debian/control b/trunk/python-edje/debian/control index 1e7231c..de5fc6c 100644 --- a/trunk/python-edje/debian/control +++ b/trunk/python-edje/debian/control @@ -2,14 +2,14 @@ Source: python-edje Section: python Priority: optional Maintainer: Maemo-EFL Team -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), libedje0-dev (>= 0.5.0.042-maemo4), 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), libedje0-dev (>= 0.5.0.042-maemo5), edje0-bin (>= 0.5.0.042-maemo5), python2.5-evas-dev (>= 0.2.3-maemo5), python2.5-cython-dev Standards-Version: 3.6.2.2 Package: python2.5-edje Section: python Architecture: any Provides: python-edje -Depends: python2.5 (>= 2.5.1-1osso6), ${shlibs:Depends} +Depends: ${shlibs:Depends}, python2.5 (>= 2.5.1-1osso6), python2.5-evas (>= 0.2.3-maemo5) Description: Python bindings for Edje This packages contains modules that allow you to use Edje(enlightenment Graphical layout and animation library) in Python programs. @@ -17,7 +17,7 @@ Description: Python bindings for Edje Package: python2.5-edje-demo Section: user/accessories Architecture: any -Depends: python2.5 (>= 2.5.1-1osso6), ${shlibs:Depends}, libecore0-evas (>= 0.9.9.042-maemo3), python2.5-ecore (>= 0.3.0-maemo2), python2.5-evas (>= 0.2.3), python2.5-edje (= ${Source-Version}) +Depends: ${shlibs:Depends}, python2.5 (>= 2.5.1-1osso6), libecore0-evas (>= 0.9.9.042-maemo4), python2.5-ecore (>= 0.3.0-maemo3), python2.5-edje (= ${Source-Version}) Description: Python-edje demos This package contains python-edje demos: App Launcher, Virtual keyboard diff --git a/trunk/python-edje/debian/python2.5-edje-demo.install b/trunk/python-edje/debian/python2.5-edje-demo.install index abba9b8..f819e2b 100644 --- a/trunk/python-edje/debian/python2.5-edje-demo.install +++ b/trunk/python-edje/debian/python2.5-edje-demo.install @@ -1,2 +1,2 @@ -examples/evas-demo/01-app_launcher/01-app_launcher.py examples/evas-demo/02-vkbd/02-vkbd.py debian/*.edj usr/bin -debian/*.desktop usr/share/applications/hildon +usr/bin/* +usr/share/applications/hildon/* diff --git a/trunk/python-edje/debian/python2.5-edje.install b/trunk/python-edje/debian/python2.5-edje.install new file mode 100644 index 0000000..52b6b3c --- /dev/null +++ b/trunk/python-edje/debian/python2.5-edje.install @@ -0,0 +1 @@ +usr/lib/python2.5/site-packages/*/* diff --git a/trunk/python-edje/debian/rules b/trunk/python-edje/debian/rules index afb24cd..0050a0d 100755 --- a/trunk/python-edje/debian/rules +++ b/trunk/python-edje/debian/rules @@ -1,33 +1,60 @@ #!/usr/bin/make -f +DEB_DESTDIR=$(CURDIR)/debian/tmp + PYVER=2.5 PYTHON=python$(PYVER) -p_base=$(PYTHON)-edje -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 edje/edje.*.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 cd $(CURDIR)/examples/evas-demo/01-app_launcher && \ - edje_cc 01-app_launcher.edc $(CURDIR)/debian/01-app_launcher.edj + edje_cc 01-app_launcher.edc cd $(CURDIR)/examples/evas-demo/02-vkbd && \ - edje_cc 02-vkbd.edc $(CURDIR)/debian/02-vkbd.edj + edje_cc 02-vkbd.edc clean: dh_testdir @@ -44,19 +71,28 @@ install: build dh_testdir dh_testroot dh_installdirs - CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install --root=$(d_base) + install -D -m 755 $(CURDIR)/examples/evas-demo/01-app_launcher/01-app_launcher.py $(DEB_DESTDIR)/usr/bin/01-app_launcher.py + install -D -m 644 $(CURDIR)/examples/evas-demo/01-app_launcher/01-app_launcher.edj $(DEB_DESTDIR)/usr/bin/01-app_launcher.edj + install -D -m 644 $(CURDIR)/debian/01-app_launcher.desktop $(DEB_DESTDIR)/usr/share/applications/hildon/01-app_launcher.desktop + install -D -m 755 $(CURDIR)/examples/evas-demo/02-vkbd/02-vkbd.py $(DEB_DESTDIR)/usr/bin/02-vkbd.py + install -D -m 644 $(CURDIR)/examples/evas-demo/02-vkbd/02-vkbd.edj $(DEB_DESTDIR)/usr/bin/02-vkbd.edj + install -D -m 644 $(CURDIR)/debian/02-vkbd.desktop $(DEB_DESTDIR)/usr/share/applications/hildon/02-vkbd.desktop + CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install --root=$(DEB_DESTDIR) install_headers -d $(DEB_DESTDIR)/usr/include/$(PYTHON) if [ "x$(DEB_BUILD_ARCH)" = "xarmel" ]; then \ - rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/edje/*.py; \ - rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/edje/*.pyc; \ + rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/edje/*.py; \ + rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/edje/*.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_install + dh_installdocs + dh_installdebconf + dh_installchangelogs dh_strip + dh_compress dh_fixperms dh_makeshlibs dh_installdeb @@ -65,4 +101,4 @@ binary-arch: install dh_md5sums dh_builddeb -.PHONY: build install clean binary binary-indep binary-arch +.PHONY: build install clean binary binary-arch -- 1.7.9.5