[maemo-commits] [maemo-commits] r15791 - projects/haf/trunk/libcairo/debian
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu Jul 17 14:25:31 EEST 2008
- Previous message: [maemo-commits] r15790 - projects/haf/tags/osso-app-killer
- Next message: [maemo-commits] r15792 - projects/haf/tags/libcairo
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: klattimer Date: 2008-07-17 14:25:30 +0300 (Thu, 17 Jul 2008) New Revision: 15791 Modified: projects/haf/trunk/libcairo/debian/changelog projects/haf/trunk/libcairo/debian/compat projects/haf/trunk/libcairo/debian/control projects/haf/trunk/libcairo/debian/rules Log: * debian/control * debian/compat * debian/changelog * debian/rules * Modified to build for Maemo Fremantle Modified: projects/haf/trunk/libcairo/debian/changelog =================================================================== --- projects/haf/trunk/libcairo/debian/changelog 2008-07-17 08:10:11 UTC (rev 15790) +++ projects/haf/trunk/libcairo/debian/changelog 2008-07-17 11:25:30 UTC (rev 15791) @@ -1,3 +1,13 @@ +cairo (1.6.4-0osso1) unstable; urgency=low + + * debian/control + * debian/compat + * debian/changelog + * debian/rules + * Modified to build for Maemo Fremantle + + -- Karl Lattimer <karl.lattimer at nokia.com> Thu, 17 Jul 2008 13:35:00 +0300 + cairo (1.6.4-6) unstable; urgency=low * debian/control: Modified: projects/haf/trunk/libcairo/debian/compat =================================================================== --- projects/haf/trunk/libcairo/debian/compat 2008-07-17 08:10:11 UTC (rev 15790) +++ projects/haf/trunk/libcairo/debian/compat 2008-07-17 11:25:30 UTC (rev 15791) @@ -1 +1 @@ -5 +4 Modified: projects/haf/trunk/libcairo/debian/control =================================================================== --- projects/haf/trunk/libcairo/debian/control 2008-07-17 08:10:11 UTC (rev 15790) +++ projects/haf/trunk/libcairo/debian/control 2008-07-17 11:25:30 UTC (rev 15791) @@ -68,43 +68,3 @@ This package contains the HTML documentation for the Cairo library in /usr/share/gtk-doc/html/cairo/. -Package: libcairo-directfb2-udeb -XC-Package-Type: udeb -Section: debian-installer -Architecture: any -Depends: ${shlibs:Depends} -Description: The Cairo 2D vector graphics library DirectFB build - Cairo is a multi-platform library providing anti-aliased - vector-based rendering for multiple target backends. - . - This is version of cairo with only the DirectFB backend, intended - primarily for use in the graphical Debian installer. - -Package: libcairo-directfb2 -Section: libs -Architecture: any -Depends: ${shlibs:Depends} -Provides: libcairo-directfb -Conflicts: libcairo2-directfb -Replaces: libcairo2-directfb -Description: The Cairo 2D vector graphics library DirectFB build - Cairo is a multi-platform library providing anti-aliased - vector-based rendering for multiple target backends. - . - This is version of cairo with only the DirectFB backend enabled. - Use libcairo2 for the full backend choice. - -Package: libcairo-directfb2-dev -Section: libdevel -Architecture: any -Conflicts: libcairo2-directfb-dev -Replaces: libcairo2-directfb-dev -Depends: libcairo-directfb2 (= ${binary:Version}), libfontconfig1-dev, libfreetype6-dev (>= 2.1.10), libpng12-dev, libdirectfb-dev (>= 0.9.25), libpixman-1-dev (>= 0.10.0) -Description: Development files for Cairo graphics library DirectFB build - Cairo is a multi-platform library providing anti-aliased - vector-based rendering for multiple target backends. - . - This package contains the development libraries, header files needed by - programs that want to compile with Cairo compiled only against the - DirectFB backend. Intended primarly for use in the graphical Debian - installer, other builds should be against libcairo2-dev Modified: projects/haf/trunk/libcairo/debian/rules =================================================================== --- projects/haf/trunk/libcairo/debian/rules 2008-07-17 08:10:11 UTC (rev 15790) +++ projects/haf/trunk/libcairo/debian/rules 2008-07-17 11:25:30 UTC (rev 15791) @@ -21,39 +21,24 @@ # MAIN_CONFIGURE_FLAGS = \ --enable-xlib --enable-pdf --enable-ps --enable-svg \ ---disable-glitz --enable-xcb --disable-directfb \ +--disable-glitz --disable-directfb \ --enable-png -# udeb package flags -# directfb DirectFB (requires Build-Depend on libdirectfb-dev (>= 0.9.25) ) -DIRECTFB_CONFIGURE_FLAGS = \ ---enable-directfb \ ---disable-xlib --enable-pdf --enable-ps --disable-svg \ ---disable-glitz --disable-xcb \ ---enable-png \ ---program-suffix=-directfb -DIRECTFB_PREFIX=/usr/lib/libcairo-directfb - SRC_DIR=$(CURDIR) MAIN_BUILD_DIR=$(CURDIR)/debian/build-main -DIRECTFB_BUILD_DIR=$(CURDIR)/debian/build-directfb MAIN_DIST_DIR=$(CURDIR)/debian/dist-main -DIRECTFB_DIST_DIR=$(CURDIR)/debian/dist-directfb export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CFLAGS = -g -CFLAGS_UDEB = -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 - CFLAGS_UDEB += -O0 else CFLAGS += -O2 - CFLAGS_UDEB += -Os endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s @@ -103,42 +88,20 @@ $(MAIN_CONFIGURE_FLAGS) touch $@ -configure-udeb: configure-common-stamp configure-udeb-stamp -configure-udeb-stamp: configure-common-stamp - dh_testdir - mkdir -p $(DIRECTFB_BUILD_DIR); \ - cd $(DIRECTFB_BUILD_DIR); \ - $(SRC_DIR)/configure \ - CFLAGS="$(CFLAGS_UDEB)" \ - $(CONFFLAGS) \ - --prefix=$(DIRECTFB_PREFIX) \ - --mandir=$(share)/man \ - --infodir=$(share)/info \ - $(DIRECTFB_CONFIGURE_FLAGS) - touch $@ +build: build-main - -build: build-main build-udeb - build-main: build-main-stamp build-main-stamp: configure-main-stamp dh_testdir cd $(MAIN_BUILD_DIR) && $(MAKE) touch build-stamp -build-udeb: build-udeb-stamp -build-udeb-stamp: configure-udeb-stamp - dh_testdir - cd $(DIRECTFB_BUILD_DIR) && $(MAKE) - touch build-stamp - clean: unpatch dh_testdir dh_testroot rm -f *-stamp libtool - rm -rf debian/libcairo2 debian/libcairo2-dev debian/libcairo2-doc libcairo-directfb2-udeb debian/libcairo-directfb2-udeb-dev debian/libcairo-directfb2 + rm -rf debian/libcairo2 debian/libcairo2-dev debian/libcairo2-doc debian/libcairo-directfb2 rm -rf $(MAIN_BUILD_DIR) $(DIRECTFB_BUILD_DIR) $(MAIN_DIST_DIR) $(DIRECTFB_DIST_DIR) - rm -f debian/cairo-directfb.pc -rm -f config.h config.cache config.status config.log @@ -160,13 +123,7 @@ cd $(MAIN_BUILD_DIR) && $(MAKE) install DESTDIR=$(MAIN_DIST_DIR) - cd $(DIRECTFB_BUILD_DIR) && $(MAKE) install DESTDIR=$(DIRECTFB_DIST_DIR) - - mkdir -p $(DIRECTFB_DIST_DIR)/usr/lib/pkgconfig - sed -e 's/Name: cairo/Name: cairo-directfb/' -e 's/^\(Libs: .*\)$$/\1 -Wl,-rpath,$${libdir}/' $(DIRECTFB_DIST_DIR)/$(DIRECTFB_PREFIX)/lib/pkgconfig/cairo.pc > $(DIRECTFB_DIST_DIR)/usr/lib/pkgconfig/cairo-directfb.pc - sed -i 's:/usr/lib/lib\([^ ]*\).la:-l\1:g' $(MAIN_DIST_DIR)/usr/lib/*.la - sed -i 's:/usr/lib/lib\([^ ]*\).la:-l\1:g' $(DIRECTFB_DIST_DIR)/usr/lib/libcairo-directfb/lib/*.la # Build architecture-independent files here. binary-indep: build install @@ -193,13 +150,9 @@ dh_installman -s dh_installexamples -s dh_link -s - dh_strip -s --dbg-package=libcairo2-dbg -Nlibcairo-directfb2-udeb -Nlibcairo-directfb2 - dh_strip -plibcairo-directfb2-udeb -plibcairo-directfb2 - rm -rf debian/libcairo2-dbg/usr/lib/debug/usr/lib/libcairo-directfb dh_compress -s dh_fixperms -s dh_makeshlibs -plibcairo2 -V 'libcairo2 (>= 1.6.4-5)' -- -c4 - dh_makeshlibs -plibcairo-directfb2 -V 'libcairo-directfb2 (>= 1.6.0)' --add-udeb 'libcairo-directfb2-udeb' -- -edebian/libcairo-directfb2/usr/lib/libcairo-directfb/lib/libcairo.so.2.* -c4 dh_installdeb -s dh_shlibdeps -s dh_perl -s
- Previous message: [maemo-commits] r15790 - projects/haf/tags/osso-app-killer
- Next message: [maemo-commits] r15792 - projects/haf/tags/libcairo
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]