X11 workaround added

don't use patchsys until removing changelog is fixed in upstream
libltdl3-dev removed from build-deps

diff --git a/trunk/imlib2/debian/changelog b/trunk/imlib2/debian/changelog
index 9b09b66..7b91fb7 100644 (file)
--- a/trunk/imlib2/debian/changelog
+++ b/trunk/imlib2/debian/changelog
@@ -1,3 +1,11 @@
+imlib2 (1.4.0.003-maemo.3) unstable; urgency=low
+
+  * X11 workaround added
+  * don't use patchsys until removing changelog is fixed in upstream
+  * libltdl3-dev removed from build-deps
+
+ -- Ed Bartosh <bartosh@gmail.com>  Tue, 11 Dec 2007 01:38:47 +0200
+
 imlib2 (1.4.0.003-maemo.2) unstable; urgency=low
 
   * rules: Include simple-patchsys.mk

diff --git a/trunk/imlib2/debian/control b/trunk/imlib2/debian/control
index f4a9afd..5806d19 100644 (file)
--- a/trunk/imlib2/debian/control
+++ b/trunk/imlib2/debian/control
@@ -2,7 +2,7 @@ Source: imlib2
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: cdbs, quilt, libjpeg62-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, x11proto-core-dev | xlibs-dev, x11proto-xext-dev | xlibs-dev, libfreetype6-dev | freetype2-dev, libbz2-dev, libltdl3-dev, automake1.7 | automaken, libtool, debhelper (>= 4.0)
+Build-Depends: cdbs, quilt, libjpeg62-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, x11proto-core-dev | xlibs-dev, x11proto-xext-dev | xlibs-dev, libfreetype6-dev | freetype2-dev, libbz2-dev, automake1.7 | automaken, libtool, debhelper (>= 4.0)
 Standards-Version: 3.6.2.2
 
 Package: libimlib2

diff --git a/trunk/imlib2/debian/rules b/trunk/imlib2/debian/rules
index bba481f..16e4487 100755 (executable)
--- a/trunk/imlib2/debian/rules
+++ b/trunk/imlib2/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/patchsys-quilt.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-mmx             \
                                                         --disable-amd64        \
@@ -11,6 +11,8 @@ DEB_CONFIGURE_EXTRA_FLAGS := --disable-mmx            \
 
 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)))