No need of debian/patches

diff --git a/trunk/ecore/debian/control b/trunk/ecore/debian/control
index d1b405c..64cc620 100644 (file)
--- a/trunk/ecore/debian/control
+++ b/trunk/ecore/debian/control
@@ -2,7 +2,7 @@ Source: ecore
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-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
+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
 Standards-Version: 3.7.2
 
 Package: libecore0

diff --git a/trunk/ecore/debian/patches/series b/trunk/ecore/debian/patches/series
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/trunk/ecore/debian/rules b/trunk/ecore/debian/rules
index 8c862b4..c4b1989 100755 (executable)
--- a/trunk/ecore/debian/rules
+++ b/trunk/ecore/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --enable-ecore-evas-x11-16       \
                                                          --disable-ecore-fb                    \

diff --git a/trunk/ecore/debian_chinook/control b/trunk/ecore/debian_chinook/control
index bcbaa47..0e09f18 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, 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
+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
 Standards-Version: 3.7.2
 
 Package: libecore0

diff --git a/trunk/ecore/debian_chinook/patches/01_dont_overwrite_changelog b/trunk/ecore/debian_chinook/patches/01_dont_overwrite_changelog
deleted file mode 100644 (file)
index e85df5c..0000000
--- a/trunk/ecore/debian_chinook/patches/01_dont_overwrite_changelog
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ecore/Makefile.am
-===================================================================
---- ecore.orig/Makefile.am     2007-07-16 10:23:10.000000000 +0300
-+++ ecore/Makefile.am  2007-08-18 21:08:17.000000000 +0300
-@@ -9,7 +9,6 @@
-                      ecore_docs.tar.gz ecore.c \
-                      README \
-                      ecore.spec \
--                     debian/changelog \
-                      ecore-con.pc \
-                      ecore-config.pc \
-                      ecore-desktop.pc \
-Index: ecore/configure.in
-===================================================================
---- ecore.orig/configure.in    2007-07-28 22:54:40.000000000 +0300
-+++ ecore/configure.in 2007-08-18 21:08:04.000000000 +0300
-@@ -857,7 +857,6 @@
- src/lib/ecore_directfb/Makefile
- README
- ecore.spec
--debian/changelog
- ])
- 
- echo

diff --git a/trunk/ecore/debian_chinook/patches/series b/trunk/ecore/debian_chinook/patches/series
deleted file mode 100644 (file)
index 9f2346c..0000000
--- a/trunk/ecore/debian_chinook/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_dont_overwrite_changelog

diff --git a/trunk/ecore/debian_chinook/rules b/trunk/ecore/debian_chinook/rules
index d860161..afa6e59 100755 (executable)
--- a/trunk/ecore/debian_chinook/rules
+++ b/trunk/ecore/debian_chinook/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --enable-ecore-evas-x11-16       \
                                                          --disable-ecore-fb                    \
@@ -18,6 +17,8 @@ DEB_CONFIGURE_SCRIPT_ENV += CURL_LIBS="-lcurl"
 
 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 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
        ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS)))

diff --git a/trunk/ecore/debian_gregale/control b/trunk/ecore/debian_gregale/control
index 33aeaad..eb2029e 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, 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
+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
 Standards-Version: 3.7.2
 
 Package: libecore0

diff --git a/trunk/ecore/debian_gregale/patches/01_dont_overwrite_changelog b/trunk/ecore/debian_gregale/patches/01_dont_overwrite_changelog
deleted file mode 100644 (file)
index e85df5c..0000000
--- a/trunk/ecore/debian_gregale/patches/01_dont_overwrite_changelog
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ecore/Makefile.am
-===================================================================
---- ecore.orig/Makefile.am     2007-07-16 10:23:10.000000000 +0300
-+++ ecore/Makefile.am  2007-08-18 21:08:17.000000000 +0300
-@@ -9,7 +9,6 @@
-                      ecore_docs.tar.gz ecore.c \
-                      README \
-                      ecore.spec \
--                     debian/changelog \
-                      ecore-con.pc \
-                      ecore-config.pc \
-                      ecore-desktop.pc \
-Index: ecore/configure.in
-===================================================================
---- ecore.orig/configure.in    2007-07-28 22:54:40.000000000 +0300
-+++ ecore/configure.in 2007-08-18 21:08:04.000000000 +0300
-@@ -857,7 +857,6 @@
- src/lib/ecore_directfb/Makefile
- README
- ecore.spec
--debian/changelog
- ])
- 
- echo

diff --git a/trunk/ecore/debian_gregale/patches/series b/trunk/ecore/debian_gregale/patches/series
deleted file mode 100644 (file)
index 9f2346c..0000000
--- a/trunk/ecore/debian_gregale/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_dont_overwrite_changelog

diff --git a/trunk/ecore/debian_gregale/rules b/trunk/ecore/debian_gregale/rules
index 12c7eaf..afa6e59 100755 (executable)
--- a/trunk/ecore/debian_gregale/rules
+++ b/trunk/ecore/debian_gregale/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --enable-ecore-evas-x11-16       \
                                                          --disable-ecore-fb                    \