Updated CFLAGS for debian/rules

diff --git a/trunk/python-ecore/debian/rules b/trunk/python-ecore/debian/rules
index fc5e8f4..a562cd9 100755 (executable)
--- a/trunk/python-ecore/debian/rules
+++ b/trunk/python-ecore/debian/rules
@@ -27,7 +27,7 @@ build-stamp:
 clean:
        dh_testdir
        dh_testroot
-       $(PYTHON) setup.py clean
+       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py clean
        -rm -f build-stamp
        -rm -rf build dist python_ecore.egg-info
        -rm -f ecore/*.py[co]
@@ -38,8 +38,13 @@ install: build
        dh_testdir
        dh_testroot
        dh_installdirs
-
-       $(PYTHON) setup.py install --root=$(d_base)
+       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/ecore/*.py; \
+               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/ecore/*.pyc; \
+               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/ecore/*/*.py; \
+               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/ecore/*/*.pyc; \
+       fi
 
 binary: binary-indep binary-arch
 binary-indep: install

diff --git a/trunk/python-edje/debian/rules b/trunk/python-edje/debian/rules
index bee2bb0..2d592da 100755 (executable)
--- a/trunk/python-edje/debian/rules
+++ b/trunk/python-edje/debian/rules
@@ -27,7 +27,7 @@ build-stamp:
 clean:
        dh_testdir
        dh_testroot
-       $(PYTHON) setup.py clean
+       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py clean
        -rm -f build-stamp
        -rm -rf build dist python_edje.egg-info
        -rm -f edje/*.py[co]
@@ -39,8 +39,11 @@ install: build
        dh_testdir
        dh_testroot
        dh_installdirs
-
-       $(PYTHON) setup.py install --root=$(d_base)
+       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/edje/*.py; \
+               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/edje/*.pyc; \
+       fi
 
 binary: binary-indep binary-arch
 binary-indep: install

diff --git a/trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.diff b/trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.diff
new file mode 100644 (file)
index 0000000..8b299d1
--- /dev/null
+++ b/trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.diff
@@ -0,0 +1,76 @@
+diff -upr python-epsilon.orig/epsilon/epsilon.c_epsilon.pyx python-epsilon/epsilon/epsilon.c_epsilon.pyx
+--- python-epsilon.orig/epsilon/epsilon.c_epsilon.pyx  2007-11-24 22:50:53.000000000 -0300
++++ python-epsilon/epsilon/epsilon.c_epsilon.pyx       2007-12-10 18:06:21.000000000 -0300
+@@ -8,6 +8,7 @@ def init():
+ 
+ EPSILON_THUMB_NORMAL = 0
+ EPSILON_THUMB_LARGE = 1
++EPSILON_THUMB_CANOLA = 2
+ 
+ cdef class Epsilon:
+     """Epsilon thumbnail generator.
+@@ -21,7 +22,8 @@ cdef class Epsilon:
+         """Epsilon constructor.
+ 
+         @parm path: full path of image to process.
+-        @parm thumb_size: one of EPSILON_THUMB_NORMAL or EPSILON_THUMB_LARGE
++        @parm thumb_size: one of EPSILON_THUMB_NORMAL, EPSILON_THUMB_LARGE
++        or EPSILON_THUMB_CANOLA
+         @parm key: just used by edje to specify the part to process.
+         @parm resolution: just used by edje to specify render size.
+         """
+@@ -113,9 +115,10 @@ cdef class Epsilon:
+         """Specify thumbnail size, either EPSILON_THUMB_NORMAL (128x128) or
+            EPSILON_THUMB_LARGE (256x256).
+         """
+-        if value != EPSILON_THUMB_NORMAL and value != EPSILON_THUMB_LARGE:
+-            raise ValueError("value must be either EPSILON_THUMB_NORMAL or "
+-                             "EPSILON_THUMB_LARGE")
++        if value != EPSILON_THUMB_NORMAL and value != EPSILON_THUMB_LARGE and \
++           value != EPSILON_THUMB_CANOLA:
++            raise ValueError("value must be either EPSILON_THUMB_NORMAL, "
++                             "EPSILON_THUMB_LARGE or EPSILON_THUMB_CANOLA")
+         epsilon_thumb_size(self.obj, value)
+ 
+     def thumb_size_get(self):
+@@ -123,6 +126,8 @@ cdef class Epsilon:
+         if self.obj:
+             if self.obj.tw == EPSILON_THUMB_NORMAL:
+                 return EPSILON_THUMB_NORMAL
++            elif self.obj.tw == EPSILON_THUMB_CANOLA:
++                return EPSILON_THUMB_CANOLA
+             else:
+                 return EPSILON_THUMB_LARGE
+ 
+diff -upr python-epsilon.orig/epsilon/epsilon.request.pyx python-epsilon/epsilon/epsilon.request.pyx
+--- python-epsilon.orig/epsilon/epsilon.request.pyx    2007-11-24 22:50:53.000000000 -0300
++++ python-epsilon/epsilon/epsilon.request.pyx 2007-12-10 18:06:21.000000000 -0300
+@@ -13,6 +13,7 @@ def init():
+ 
+ EPSILON_THUMB_NORMAL = 0
+ EPSILON_THUMB_LARGE = 1
++EPSILON_THUMB_CANOLA = 2
+ 
+ cdef class Request:
+     """Request epsilon_thumbd the thumbnail for the given image at given size.
+@@ -37,9 +38,10 @@ cdef class Request:
+         if not callable(func):
+             raise TypeError("Parameter 'func' must be callable")
+ 
+-        if size != EPSILON_THUMB_NORMAL and size != EPSILON_THUMB_LARGE:
++        if size != EPSILON_THUMB_NORMAL and size != EPSILON_THUMB_LARGE and \
++           size != EPSILON_THUMB_CANOLA:
+             raise ValueError("Invalid size, must be EPSILON_THUMB_NORMAL or "
+-                             "EPSILON_THUMB_LARGE")
++                             "EPSILON_THUMB_LARGE or EPSILON_THUMB_CANOLA")
+ 
+         if self.obj == NULL:
+             self.func = func
+diff -upr python-epsilon.orig/epsilon/__init__.py python-epsilon/epsilon/__init__.py
+--- python-epsilon.orig/epsilon/__init__.py    2007-11-01 15:46:42.000000000 -0300
++++ python-epsilon/epsilon/__init__.py 2007-12-10 18:06:21.000000000 -0300
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env python
+ 
+-from c_epsilon import init, EPSILON_THUMB_NORMAL, EPSILON_THUMB_LARGE, Epsilon
++from c_epsilon import init, EPSILON_THUMB_NORMAL, EPSILON_THUMB_LARGE, EPSILON_THUMB_CANOLA, Epsilon

diff --git a/trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.patch b/trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.patch
deleted file mode 100644 (file)
index 8b299d1..0000000
--- a/trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -upr python-epsilon.orig/epsilon/epsilon.c_epsilon.pyx python-epsilon/epsilon/epsilon.c_epsilon.pyx
---- python-epsilon.orig/epsilon/epsilon.c_epsilon.pyx  2007-11-24 22:50:53.000000000 -0300
-+++ python-epsilon/epsilon/epsilon.c_epsilon.pyx       2007-12-10 18:06:21.000000000 -0300
-@@ -8,6 +8,7 @@ def init():
- 
- EPSILON_THUMB_NORMAL = 0
- EPSILON_THUMB_LARGE = 1
-+EPSILON_THUMB_CANOLA = 2
- 
- cdef class Epsilon:
-     """Epsilon thumbnail generator.
-@@ -21,7 +22,8 @@ cdef class Epsilon:
-         """Epsilon constructor.
- 
-         @parm path: full path of image to process.
--        @parm thumb_size: one of EPSILON_THUMB_NORMAL or EPSILON_THUMB_LARGE
-+        @parm thumb_size: one of EPSILON_THUMB_NORMAL, EPSILON_THUMB_LARGE
-+        or EPSILON_THUMB_CANOLA
-         @parm key: just used by edje to specify the part to process.
-         @parm resolution: just used by edje to specify render size.
-         """
-@@ -113,9 +115,10 @@ cdef class Epsilon:
-         """Specify thumbnail size, either EPSILON_THUMB_NORMAL (128x128) or
-            EPSILON_THUMB_LARGE (256x256).
-         """
--        if value != EPSILON_THUMB_NORMAL and value != EPSILON_THUMB_LARGE:
--            raise ValueError("value must be either EPSILON_THUMB_NORMAL or "
--                             "EPSILON_THUMB_LARGE")
-+        if value != EPSILON_THUMB_NORMAL and value != EPSILON_THUMB_LARGE and \
-+           value != EPSILON_THUMB_CANOLA:
-+            raise ValueError("value must be either EPSILON_THUMB_NORMAL, "
-+                             "EPSILON_THUMB_LARGE or EPSILON_THUMB_CANOLA")
-         epsilon_thumb_size(self.obj, value)
- 
-     def thumb_size_get(self):
-@@ -123,6 +126,8 @@ cdef class Epsilon:
-         if self.obj:
-             if self.obj.tw == EPSILON_THUMB_NORMAL:
-                 return EPSILON_THUMB_NORMAL
-+            elif self.obj.tw == EPSILON_THUMB_CANOLA:
-+                return EPSILON_THUMB_CANOLA
-             else:
-                 return EPSILON_THUMB_LARGE
- 
-diff -upr python-epsilon.orig/epsilon/epsilon.request.pyx python-epsilon/epsilon/epsilon.request.pyx
---- python-epsilon.orig/epsilon/epsilon.request.pyx    2007-11-24 22:50:53.000000000 -0300
-+++ python-epsilon/epsilon/epsilon.request.pyx 2007-12-10 18:06:21.000000000 -0300
-@@ -13,6 +13,7 @@ def init():
- 
- EPSILON_THUMB_NORMAL = 0
- EPSILON_THUMB_LARGE = 1
-+EPSILON_THUMB_CANOLA = 2
- 
- cdef class Request:
-     """Request epsilon_thumbd the thumbnail for the given image at given size.
-@@ -37,9 +38,10 @@ cdef class Request:
-         if not callable(func):
-             raise TypeError("Parameter 'func' must be callable")
- 
--        if size != EPSILON_THUMB_NORMAL and size != EPSILON_THUMB_LARGE:
-+        if size != EPSILON_THUMB_NORMAL and size != EPSILON_THUMB_LARGE and \
-+           size != EPSILON_THUMB_CANOLA:
-             raise ValueError("Invalid size, must be EPSILON_THUMB_NORMAL or "
--                             "EPSILON_THUMB_LARGE")
-+                             "EPSILON_THUMB_LARGE or EPSILON_THUMB_CANOLA")
- 
-         if self.obj == NULL:
-             self.func = func
-diff -upr python-epsilon.orig/epsilon/__init__.py python-epsilon/epsilon/__init__.py
---- python-epsilon.orig/epsilon/__init__.py    2007-11-01 15:46:42.000000000 -0300
-+++ python-epsilon/epsilon/__init__.py 2007-12-10 18:06:21.000000000 -0300
-@@ -1,3 +1,3 @@
- #!/usr/bin/env python
- 
--from c_epsilon import init, EPSILON_THUMB_NORMAL, EPSILON_THUMB_LARGE, Epsilon
-+from c_epsilon import init, EPSILON_THUMB_NORMAL, EPSILON_THUMB_LARGE, EPSILON_THUMB_CANOLA, Epsilon

diff --git a/trunk/python-epsilon/debian/patches/series b/trunk/python-epsilon/debian/patches/series
index 83b4898..e99ac2c 100644 (file)
--- a/trunk/python-epsilon/debian/patches/series
+++ b/trunk/python-epsilon/debian/patches/series
@@ -1,2 +1 @@
-01-python-epsilon-thumb-canola.patch
-series
+01-python-epsilon-thumb-canola.diff

diff --git a/trunk/python-epsilon/debian/rules b/trunk/python-epsilon/debian/rules
index c7095bd..6c45bee 100755 (executable)
--- a/trunk/python-epsilon/debian/rules
+++ b/trunk/python-epsilon/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
 PYVER=2.5
 PYTHON=python$(PYVER)
 
@@ -24,10 +26,10 @@ build-stamp:
        touch epsilon/epsilon.*.pyx
        CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
        touch build-stamp
-clean:
+clean::
        dh_testdir
        dh_testroot
-       $(PYTHON) setup.py clean
+       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py clean
        -rm -f build-stamp
        -rm -rf build dist python_epsilon.egg-info
        -rm -f epsilon/*.py[co]
@@ -38,8 +40,11 @@ install: build
        dh_testdir
        dh_testroot
        dh_installdirs
-
-       $(PYTHON) setup.py install --root=$(d_base)
+       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/epsilon/*.py; \
+               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/epsilon/*.pyc; \
+       fi
 
 binary: binary-indep binary-arch
 binary-indep: install

diff --git a/trunk/python-evas/debian/rules b/trunk/python-evas/debian/rules
index b260f35..5c7c4e0 100755 (executable)
--- a/trunk/python-evas/debian/rules
+++ b/trunk/python-evas/debian/rules
@@ -27,7 +27,7 @@ build-stamp:
 clean:
        dh_testdir
        dh_testroot
-       $(PYTHON) setup.py clean
+       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py clean
        -rm -f build-stamp
        -rm -rf build dist python_evas.egg-info
        -rm -f evas/*.py[co]
@@ -38,8 +38,11 @@ install: build
        dh_testdir
        dh_testroot
        dh_installdirs
-
-       $(PYTHON) setup.py install --root=$(d_base)
+       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/evas/*.py; \
+               rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/evas/*.pyc; \
+       fi
 
 binary: binary-indep binary-arch
 binary-indep: install