diff --git a/debian/control b/debian/control index 1a789ea..17f4d89 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Laurence J. Lane Build-Depends: libjpeg62-dev, libttf-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, libungif4-dev | libungif3g-dev | giflib3g-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) -Standards-Version: 3.6.2.2 +Standards-Version: 3.7.2 Package: imlib2-demo Architecture: any diff --git a/debian/imlib2-demo.install b/debian/imlib2-demo.install index b6cf669..74cc8b7 100644 --- a/debian/imlib2-demo.install +++ b/debian/imlib2-demo.install @@ -1,21 +1,21 @@ -usr/bin/imlib2_conv -usr/bin/imlib2_show -usr/bin/imlib2_view -usr/share/imlib2/data/fonts/*.ttf -usr/share/imlib2/data/images/audio.png -usr/share/imlib2/data/images/bg.png -usr/share/imlib2/data/images/bulb.png -usr/share/imlib2/data/images/calc.png -usr/share/imlib2/data/images/cal.png -usr/share/imlib2/data/images/folder.png -usr/share/imlib2/data/images/globe.png -usr/share/imlib2/data/images/lock.png -usr/share/imlib2/data/images/mail.png -usr/share/imlib2/data/images/menu.png -usr/share/imlib2/data/images/mush.png -usr/share/imlib2/data/images/paper.png -usr/share/imlib2/data/images/sh1.png -usr/share/imlib2/data/images/sh2.png -usr/share/imlib2/data/images/sh3.png -usr/share/imlib2/data/images/stop.png -usr/share/imlib2/data/images/tnt.png +debian/tmp/usr/bin/imlib2_conv +debian/tmp/usr/bin/imlib2_show +debian/tmp/usr/bin/imlib2_view +debian/tmp/usr/share/imlib2/data/fonts/*.ttf +debian/tmp/usr/share/imlib2/data/images/audio.png +debian/tmp/usr/share/imlib2/data/images/bg.png +debian/tmp/usr/share/imlib2/data/images/bulb.png +debian/tmp/usr/share/imlib2/data/images/calc.png +debian/tmp/usr/share/imlib2/data/images/cal.png +debian/tmp/usr/share/imlib2/data/images/folder.png +debian/tmp/usr/share/imlib2/data/images/globe.png +debian/tmp/usr/share/imlib2/data/images/lock.png +debian/tmp/usr/share/imlib2/data/images/mail.png +debian/tmp/usr/share/imlib2/data/images/menu.png +debian/tmp/usr/share/imlib2/data/images/mush.png +debian/tmp/usr/share/imlib2/data/images/paper.png +debian/tmp/usr/share/imlib2/data/images/sh1.png +debian/tmp/usr/share/imlib2/data/images/sh2.png +debian/tmp/usr/share/imlib2/data/images/sh3.png +debian/tmp/usr/share/imlib2/data/images/stop.png +debian/tmp/usr/share/imlib2/data/images/tnt.png diff --git a/debian/imlib2-test.install b/debian/imlib2-test.install index 5ae814c..cdcb4a0 100644 --- a/debian/imlib2-test.install +++ b/debian/imlib2-test.install @@ -1,2 +1,6 @@ -usr/bin/imlib2_* -usr/share/imlib2/data/images/imlib2.png +debian/tmp/usr/bin/imlib2_bumpmap +debian/tmp/usr/bin/imlib2_colorspace +debian/tmp/usr/bin/imlib2_grab +debian/tmp/usr/bin/imlib2_poly +debian/tmp/usr/bin/imlib2_test +debian/tmp/usr/share/imlib2/data/images/imlib2.png diff --git a/debian/libimlib2-dev.install b/debian/libimlib2-dev.install index 47ef60b..55c6f3f 100644 --- a/debian/libimlib2-dev.install +++ b/debian/libimlib2-dev.install @@ -1,18 +1,6 @@ -usr/bin/imlib2-config -usr/lib/pkgconfig/* -usr/include -usr/lib/*.so -usr/lib/*.a -usr/lib/*.la -usr/lib/imlib2_loaders/filter/*.a -usr/lib/imlib2_loaders/filter/*.la -usr/lib/imlib2_loaders/image/*.a -usr/lib/imlib2_loaders/image/*.la -usr/lib/imlib2/loaders/*.a -usr/lib/imlib2/loaders/*.la -usr/lib/imlib2/filters/*.a -usr/lib/imlib2/filters/*.la -usr/share/imlib2/data/fonts/*.a -usr/share/imlib2/data/fonts/*.la -usr/share/imlib2/data/images/*.a -usr/share/imlib2/data/images/*.la +debian/tmp/usr/bin/imlib2-config +debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/include +debian/tmp/usr/lib/*.so +debian/tmp/usr/lib/*.a +debian/tmp/usr/lib/*.la diff --git a/debian/libimlib2.install b/debian/libimlib2.install index fe937f3..76128c9 100644 --- a/debian/libimlib2.install +++ b/debian/libimlib2.install @@ -1,6 +1,4 @@ -usr/lib/*.so.* -usr/lib/imlib2_loaders/filter/*.so -usr/lib/imlib2_loaders/image/*.so -usr/lib/imlib2/loaders/*.so -usr/lib/imlib2/filters/*.so -usr/lib/imlib2/image/*.so +debian/tmp/usr/lib/*.so.* +debian/tmp/usr/lib/imlib2/loaders/*.so +debian/tmp/usr/lib/imlib2/filters/*.so +debian/tmp/usr/lib/imlib2/image/*.so diff --git a/debian/rules b/debian/rules index 0057979..8943888 100644 --- a/debian/rules +++ b/debian/rules @@ -1,93 +1,10 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk -# This is the debhelper compatability version to use. -export DH_COMPAT=4 +DEB_MAKE_CLEAN_TARGET := clean -# 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=$(ENABLE_MMX) --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -package=libimlib2 - -configure: configure-stamp -configure-stamp: - test -x autogen.sh && ./autogen.sh $(CONFIGUREOPTS) || ./configure $(CONFIGUREOPTS) - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - $(MAKE) - touch build-stamp - -clean: - dh_testdir - rm -f build-stamp configure-stamp - - -mv debian/changelog debian/changelog.saved - -$(MAKE) distclean - -mv debian/changelog.saved debian/changelog - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ - - $(INSTALL) -d debian/$(package)-dev/usr/share/doc/$(package)-dev/html - $(INSTALL) -m 644 doc/*.html doc/*.gif \ - debian/$(package)-dev/usr/share/doc/$(package)-dev/html - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot -ifeq (,$(findstring fail-on-missing,$(DEB_BUILD_OPTIONS))) - dh_install --sourcedir=debian/tmp --list-missing -else - dh_install --sourcedir=debian/tmp --fail-missing -endif - dh_installdocs AUTHORS README - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +debian/stamp-autotools-files: + ./autogen.sh --prefix=/usr + touch debian/stamp-autotools-files