Use patchsys-quilt instead of simple-patchsys.

Unifying debian directories.

diff --git a/trunk/e_dbus/debian/control b/trunk/e_dbus/debian/control
index f80fab6..57ee9bd 100644 (file)
--- a/trunk/e_dbus/debian/control
+++ b/trunk/e_dbus/debian/control
@@ -2,7 +2,7 @@ Source: e-dbus
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: cdbs, debhelper (>= 4), libecore0-dev, libdbus-1-dev
+Build-Depends: cdbs, quilt, debhelper (>= 4), libecore0-dev, libdbus-1-dev
 Standards-Version: 3.7.2
 
 Package: libedbus0

diff --git a/trunk/e_dbus/debian/rules b/trunk/e_dbus/debian/rules
index d2dd179..d7668d4 100755 (executable)
--- a/trunk/e_dbus/debian/rules
+++ b/trunk/e_dbus/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --disable-build-test-gui
 

diff --git a/trunk/e_dbus/debian_chinook/rules b/trunk/e_dbus/debian_chinook/rules
index 17d5aee..4fecb6a 100755 (executable)
--- a/trunk/e_dbus/debian_chinook/rules
+++ b/trunk/e_dbus/debian_chinook/rules
@@ -10,6 +10,12 @@ DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CFLAGS += -lpthread
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       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
+       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
 

diff --git a/trunk/e_dbus/debian_gregale/control b/trunk/e_dbus/debian_gregale/control
index f80fab6..57ee9bd 100644 (file)
--- a/trunk/e_dbus/debian_gregale/control
+++ b/trunk/e_dbus/debian_gregale/control
@@ -2,7 +2,7 @@ Source: e-dbus
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: cdbs, debhelper (>= 4), libecore0-dev, libdbus-1-dev
+Build-Depends: cdbs, quilt, debhelper (>= 4), libecore0-dev, libdbus-1-dev
 Standards-Version: 3.7.2
 
 Package: libedbus0

diff --git a/trunk/e_dbus/debian_gregale/rules b/trunk/e_dbus/debian_gregale/rules
index 3b623ef..b4c0336 100755 (executable)
--- a/trunk/e_dbus/debian_gregale/rules
+++ b/trunk/e_dbus/debian_gregale/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --disable-build-test-gui
 
@@ -11,6 +11,12 @@ DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CFLAGS += -lpthread
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mcpu=arm926ej-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
 

diff --git a/trunk/ecore/debian_chinook/control b/trunk/ecore/debian_chinook/control
index 0e09f18..bcbaa47 100644 (file)
--- a/trunk/ecore/debian_chinook/control
+++ b/trunk/ecore/debian_chinook/control
@@ -2,7 +2,7 @@ Source: ecore
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: cdbs, debhelper (>= 4), libeet-dev, libevas-dev, libssl-dev, libcurl3-dev, libxcursor-dev, libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, libfreetype6-dev, libjpeg62-dev
+Build-Depends: cdbs, quilt, debhelper (>= 4), libeet-dev, libevas-dev, libssl-dev, libcurl3-dev, libxcursor-dev, libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, libfreetype6-dev, libjpeg62-dev
 Standards-Version: 3.7.2
 
 Package: libecore0

diff --git a/trunk/ecore/debian_chinook/rules b/trunk/ecore/debian_chinook/rules
index c5eefb6..d860161 100755 (executable)
--- a/trunk/ecore/debian_chinook/rules
+++ b/trunk/ecore/debian_chinook/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --enable-ecore-evas-x11-16       \
                                                          --disable-ecore-fb                    \
@@ -19,6 +19,12 @@ DEB_CONFIGURE_SCRIPT_ENV += CURL_LIBS="-lcurl"
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS := $(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
+       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
 

diff --git a/trunk/ecore/debian_gregale/control b/trunk/ecore/debian_gregale/control
index eb2029e..33aeaad 100644 (file)
--- a/trunk/ecore/debian_gregale/control
+++ b/trunk/ecore/debian_gregale/control
@@ -2,7 +2,7 @@ Source: ecore
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: cdbs, debhelper (>= 4), libeet-dev, libevas-dev, libssl-dev, libcurl3-dev, libxcursor-dev, xlibs-dev, libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, x-dev, libfreetype6-dev, libjpeg62-dev
+Build-Depends: cdbs, quilt, debhelper (>= 4), libeet-dev, libevas-dev, libssl-dev, libcurl3-dev, libxcursor-dev, xlibs-dev, libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, x-dev, libfreetype6-dev, libjpeg62-dev
 Standards-Version: 3.7.2
 
 Package: libecore0

diff --git a/trunk/ecore/debian_gregale/rules b/trunk/ecore/debian_gregale/rules
index 62e6481..12c7eaf 100755 (executable)
--- a/trunk/ecore/debian_gregale/rules
+++ b/trunk/ecore/debian_gregale/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --enable-ecore-evas-x11-16       \
                                                          --disable-ecore-fb                    \
@@ -21,6 +21,12 @@ DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CFLAGS += -I/usr/X11R6/include
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mcpu=arm926ej-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
 

diff --git a/trunk/edje/debian_gregale/control b/trunk/edje/debian_gregale/control
index 092ac27..c380186 100644 (file)
--- a/trunk/edje/debian_gregale/control
+++ b/trunk/edje/debian_gregale/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
 Suggests: edje0-bin
-Build-Depends: debhelper (>> 4.0.0), cdbs (>= 0.4.3-1.1),  automake1.7 | automaken, libtool, libeet-dev, libecore-dev, libevas-dev, libembryo-dev
+Build-Depends: debhelper (>> 4.0.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool, libeet-dev, libecore-dev, libevas-dev, libembryo-dev
 Standards-Version: 3.7.2
 
 Package: edje0-bin

diff --git a/trunk/edje/debian_gregale/rules b/trunk/edje/debian_gregale/rules
index 5b13c0b..10d195a 100755 (executable)
--- a/trunk/edje/debian_gregale/rules
+++ b/trunk/edje/debian_gregale/rules
@@ -2,10 +2,16 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mcpu=arm926ej-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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

diff --git a/trunk/eet/debian/control b/trunk/eet/debian/control
index a640550..16eb79d 100644 (file)
--- a/trunk/eet/debian/control
+++ b/trunk/eet/debian/control
@@ -2,7 +2,7 @@ Source: eet
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23-1.1), automake1.7 | automaken | libtool, zlib1g-dev, libjpeg62-dev
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23-1.1), quilt, automake1.7 | automaken | libtool, zlib1g-dev, libjpeg62-dev
 Standards-Version: 3.6.2.2
 
 Package: libeet0-dev

diff --git a/trunk/eet/debian/rules b/trunk/eet/debian/rules
index e94e71f..d7cc062 100755 (executable)
--- a/trunk/eet/debian/rules
+++ b/trunk/eet/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 

diff --git a/trunk/eet/debian_gregale/control b/trunk/eet/debian_gregale/control
index a640550..16eb79d 100644 (file)
--- a/trunk/eet/debian_gregale/control
+++ b/trunk/eet/debian_gregale/control
@@ -2,7 +2,7 @@ Source: eet
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23-1.1), automake1.7 | automaken | libtool, zlib1g-dev, libjpeg62-dev
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23-1.1), quilt, automake1.7 | automaken | libtool, zlib1g-dev, libjpeg62-dev
 Standards-Version: 3.6.2.2
 
 Package: libeet0-dev

diff --git a/trunk/eet/debian_gregale/rules b/trunk/eet/debian_gregale/rules
index bb531f9..d7cc062 100755 (executable)
--- a/trunk/eet/debian_gregale/rules
+++ b/trunk/eet/debian_gregale/rules
@@ -2,11 +2,17 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mcpu=arm926ej-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
 

diff --git a/trunk/embryo/debian/rules b/trunk/embryo/debian/rules
index 9444fbb..cb7fcf5 100755 (executable)
--- a/trunk/embryo/debian/rules
+++ b/trunk/embryo/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 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)))

diff --git a/trunk/embryo/debian_gregale/control b/trunk/embryo/debian_gregale/control
index ee9864a..4ec95bf 100644 (file)
--- a/trunk/embryo/debian_gregale/control
+++ b/trunk/embryo/debian_gregale/control
@@ -2,7 +2,7 @@ Source: embryo
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>= 4.0.0), automake1.7 | automaken, libtool
+Build-Depends: cdbs, quilt, debhelper (>= 4.0.0), automake1.7 | automaken, libtool
 Standards-Version: 3.7.2
 
 Package: embryo0-bin

diff --git a/trunk/embryo/debian_gregale/rules b/trunk/embryo/debian_gregale/rules
index bb531f9..d7cc062 100755 (executable)
--- a/trunk/embryo/debian_gregale/rules
+++ b/trunk/embryo/debian_gregale/rules
@@ -2,11 +2,17 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mcpu=arm926ej-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
 

diff --git a/trunk/epeg/debian_gregale/control b/trunk/epeg/debian_gregale/control
index 6024b73..3a4bd57 100644 (file)
--- a/trunk/epeg/debian_gregale/control
+++ b/trunk/epeg/debian_gregale/control
@@ -2,7 +2,7 @@ Source: epeg
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: cdbs, debhelper (>= 4), libjpeg62-dev
+Build-Depends: cdbs, quilt, debhelper (>= 4), libjpeg62-dev
 Standards-Version: 3.7.2
 
 Package: libepeg0-dev

diff --git a/trunk/epeg/debian_gregale/rules b/trunk/epeg/debian_gregale/rules
index 5b13c0b..2b93ff8 100755 (executable)
--- a/trunk/epeg/debian_gregale/rules
+++ b/trunk/epeg/debian_gregale/rules
@@ -2,10 +2,16 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mcpu=arm926ej-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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

diff --git a/trunk/epsilon/debian/control b/trunk/epsilon/debian/control
index 9eef5cb..cab7438 100644 (file)
--- a/trunk/epsilon/debian/control
+++ b/trunk/epsilon/debian/control
@@ -2,7 +2,7 @@ Source: epsilon
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: cdbs, debhelper, zlib1g-dev, libepeg-dev, libevas-dev, libecore-dev, libedje-dev, libimlib2-dev, libpng12-dev
+Build-Depends: cdbs, quilt, debhelper, zlib1g-dev, libepeg-dev, libevas-dev, libecore-dev, libedje-dev, libimlib2-dev, libpng12-dev
 Standards-Version: 3.7.2
 
 Package: libepsilon0-dev

diff --git a/trunk/epsilon/debian/rules b/trunk/epsilon/debian/rules
index f6328f0..10d195a 100755 (executable)
--- a/trunk/epsilon/debian/rules
+++ b/trunk/epsilon/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 

diff --git a/trunk/epsilon/debian_gregale/control b/trunk/epsilon/debian_gregale/control
index 9eef5cb..cab7438 100644 (file)
--- a/trunk/epsilon/debian_gregale/control
+++ b/trunk/epsilon/debian_gregale/control
@@ -2,7 +2,7 @@ Source: epsilon
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: cdbs, debhelper, zlib1g-dev, libepeg-dev, libevas-dev, libecore-dev, libedje-dev, libimlib2-dev, libpng12-dev
+Build-Depends: cdbs, quilt, debhelper, zlib1g-dev, libepeg-dev, libevas-dev, libecore-dev, libedje-dev, libimlib2-dev, libpng12-dev
 Standards-Version: 3.7.2
 
 Package: libepsilon0-dev

diff --git a/trunk/epsilon/debian_gregale/rules b/trunk/epsilon/debian_gregale/rules
index bb531f9..cb7fcf5 100755 (executable)
--- a/trunk/epsilon/debian_gregale/rules
+++ b/trunk/epsilon/debian_gregale/rules
@@ -2,11 +2,17 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mcpu=arm926ej-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
 

diff --git a/trunk/evas/debian/rules b/trunk/evas/debian/rules
index 3fdf303..43171b6 100755 (executable)
--- a/trunk/evas/debian/rules
+++ b/trunk/evas/debian/rules
@@ -41,6 +41,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-software-16-x11                 \
                                                         --disable-convert-32-rgb-rot-90        \
                                                         --disable-sdl
 
+CFLAGS += -I/usr/X11R6/include
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 

diff --git a/trunk/evas/debian_gregale/control b/trunk/evas/debian_gregale/control
index f0cf994..c673fad 100644 (file)
--- a/trunk/evas/debian_gregale/control
+++ b/trunk/evas/debian_gregale/control
@@ -2,7 +2,7 @@ Source: evas
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), automake1.7 | automaken, libtool, libeet-dev, libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | xlibs-dev, zlib1g, libjpeg62-dev, autotools-dev
+Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool, libeet-dev, libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | xlibs-dev, zlib1g, libjpeg62-dev, autotools-dev
 Standards-Version: 3.7.2
 
 Package: libevas0

diff --git a/trunk/evas/debian_gregale/rules b/trunk/evas/debian_gregale/rules
index c1fa8e6..c5f7061 100755 (executable)
--- a/trunk/evas/debian_gregale/rules
+++ b/trunk/evas/debian_gregale/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-software-16-x11                  \
                                                         --enable-software-x11                          \
@@ -47,6 +47,12 @@ CFLAGS += -I/usr/X11R6/include
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-    CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mcpu=arm926ej-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
 

diff --git a/trunk/expedite/debian/rules b/trunk/expedite/debian/rules
index e957ac5..e711224 100755 (executable)
--- a/trunk/expedite/debian/rules
+++ b/trunk/expedite/debian/rules
@@ -2,12 +2,17 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       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
+       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