debian/rules: Fixed packaging.

debian/contorl: Fixed dependency info.
Added .install file for python2.5-efl-utils package.

diff --git a/trunk/python-efl_utils/debian/changelog b/trunk/python-efl_utils/debian/changelog
index 238360e..749f1b0 100644 (file)
--- a/trunk/python-efl_utils/debian/changelog
+++ b/trunk/python-efl_utils/debian/changelog
@@ -1,3 +1,16 @@
+python-efl-utils (0.1.3-maemo5) unstable; urgency=low
+
+  * debian/control: Updated dependency info.
+
+ -- Eduardo Lima (Etrunko) <eduardo.lima@indt.org.br>  Tue, 15 Jul 2008 11:55:10 -0300
+
+python-efl-utils (0.1.3-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-efl-utils (0.1.3-maemo3) unstable; urgency=low
 
   * New release.

diff --git a/trunk/python-efl_utils/debian/control b/trunk/python-efl_utils/debian/control
index a318770..a93097a 100644 (file)
--- a/trunk/python-efl_utils/debian/control
+++ b/trunk/python-efl_utils/debian/control
@@ -2,14 +2,14 @@ Source: python-efl-utils
 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-evas (>= 0.2.3), python2.5-ecore (>= 0.3.0-maemo2)
+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)
 Standards-Version: 3.6.2.2
 
 Package: python2.5-efl-utils
 Section: python
 Architecture: all
 Provides: python-efl-utils
-Depends: python2.5 (>= 2.5.1-1osso6), python2.5-evas (>= 0.2.3), python2.5-ecore (>= 0.3.0-maemo2)
+Depends: python2.5 (>= 2.5.1-1osso6), python2.5-evas (>= 0.2.3-maemo6), python2.5-ecore (>= 0.3.0-maemo4)
 Description: Python utilities to work with EFL
  .
  This packages contains helper modules for EFL.

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

diff --git a/trunk/python-efl_utils/debian/rules b/trunk/python-efl_utils/debian/rules
index 17dd01c..81b183e 100755 (executable)
--- a/trunk/python-efl_utils/debian/rules
+++ b/trunk/python-efl_utils/debian/rules
@@ -1,32 +1,19 @@
 #!/usr/bin/make -f
 
+DEB_DESTDIR=$(CURDIR)/debian/tmp
+
 PYVER=2.5
 PYTHON=python$(PYVER)
 
-p_base=$(PYTHON)-efl-utils
-d_base=debian/$(p_base)
-
-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
-    endif
-endif
-
 build: build-stamp
 build-stamp:
        dh_testdir
-       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
+       $(PYTHON) setup.py build_ext build
        touch build-stamp
 clean:
        dh_testdir
        dh_testroot
-       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py clean
+       $(PYTHON) setup.py clean
        -rm -f build-stamp
        -rm -rf build dist python_efl_utils.egg-info
        -rm -f efl_utils/*.py[co]
@@ -37,18 +24,20 @@ install: build
        dh_testdir
        dh_testroot
        dh_installdirs
-       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install --root=$(d_base)
-       if [ "x$(DEB_BUILD_ARCH)" = "xarmel" ]; then \
-               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/efl_utils/*.py; \
-               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/efl_utils/*.pyc; \
-       fi
+       $(PYTHON) setup.py install --root=$(DEB_DESTDIR)
+       rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/efl_utils/*.py; \
+       rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/efl_utils/*.pyc; \
+       dh_install --sourcedir=$(DEB_DESTDIR) --fail-missing
 
-binary: binary-arch binary-indep
-binary-arch: build install
+binary: binary-indep
 binary-indep: build install
        dh_testdir
        dh_testroot
+       dh_installdocs
+       dh_installdebconf
+       dh_installchangelogs
        dh_strip
+       dh_compress
        dh_fixperms
        dh_makeshlibs
        dh_installdeb
@@ -57,4 +46,4 @@ binary-indep: build install
        dh_md5sums
        dh_builddeb
 
-.PHONY: build install clean binary binary-arch binary-indep
+.PHONY: build install clean binary binary-indep