From 334127cf3fa877c78bcf72e71015b6c82b1d27ed Mon Sep 17 00:00:00 2001 From: Sytse Wielinga Date: Thu, 21 Aug 2003 16:21:11 +0000 Subject: [PATCH] Big overhaul of a lot of the debian packages SVN revision: 7360 --- debian/changelog | 4 ++-- debian/control | 7 ++----- debian/rules | 21 ++++++++++++++++++--- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 587470e..c68cc0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -imlib2 (1.0.7-0cvs20021006) unstable; urgency=low +imlib2 (1.1.0-0cvs20030820) unstable; urgency=low * a CVS release - -- Sytse Wielinga Sun, 6 Oct 2002 15:30:14 +0200 + -- Sytse Wielinga Wed, 20 Aug 2003 14:42:27 +0200 diff --git a/debian/control b/debian/control index 2737106..80a8cef 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,7 @@ Source: imlib2 Section: libs Priority: optional Maintainer: Laurence J. Lane -Build-Depends: libjpeg62-dev, libttf-dev, - libpng3-dev | libpng2-dev | libpng-dev, libtiff3g-dev, - zlib1g-dev, libungif4-dev | libungif3g-dev | giflib3g-dev, - xlibs-dev, freetype2-dev, debhelper (>= 3.0) +Build-Depends: libjpeg62-dev, libttf-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff3g-dev, zlib1g-dev, libungif4-dev | libungif3g-dev | giflib3g-dev, xlibs-dev, libfreetype6-dev | freetype2-dev, debhelper (>= 4.0) Standards-Version: 3.5.7.0 Package: libimlib2 @@ -26,6 +23,6 @@ Package: libimlib2-dev Architecture: any Section: devel Architecture: any -Depends: libimlib2 (= ${Source-Version}), libc6-dev, libjpeg62-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff3g-dev, zlib1g-dev, libttf-dev, libungif4-dev | libungif3g-dev | giflib3g-dev, xlibs-dev, freetype2-dev +Depends: libimlib2 (= ${Source-Version}), libc6-dev, libjpeg62-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff3g-dev, zlib1g-dev, libttf-dev, libungif4-dev | libungif3g-dev | giflib3g-dev, xlibs-dev, libfreetype6-dev | freetype2-dev Description: Imlib2 headers, static libraries and documentation Headers, static libraries and documentation for Imlib2. diff --git a/debian/rules b/debian/rules index d91e2b8..cbff849 100644 --- a/debian/rules +++ b/debian/rules @@ -6,15 +6,31 @@ #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=3 +export DH_COMPAT=4 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +ifneq (,$(findstring mmx,$(DEB_BUILD_OPTIONS))) + ENABLE_MMX = yes +else + ENABLE_MMX = no +endif + INSTALL=/usr/bin/install -p -CONFIGUREOPTS = --prefix=/usr --enable-mmx=no --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +CONFIGUREOPTS = --prefix=/usr --enable-mmx=$(ENABLE_MMX) --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) package=libimlib2 configure: configure-stamp @@ -56,7 +72,6 @@ binary-arch: build install dh_movefiles dh_installdocs AUTHORS README - dh_undocumented -plibimlib2-dev imlib2-config.1 dh_installchangelogs dh_link dh_strip