[maemo-commits] [maemo-commits] r8547 - projects/haf/trunk/libcairo/debian
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Dec 1 17:26:49 EET 2006
- Previous message: [maemo-commits] r8546 - projects/haf/trunk
- Next message: [maemo-commits] r8548 - projects/haf/tags/libcairo
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: tko
Date: 2006-12-01 17:26:48 +0200 (Fri, 01 Dec 2006)
New Revision: 8547
Removed:
projects/haf/trunk/libcairo/debian/libcairo-directfb2-dev.install
projects/haf/trunk/libcairo/debian/libcairo-directfb2-udeb.install
projects/haf/trunk/libcairo/debian/libcairo-directfb2.install
Modified:
projects/haf/trunk/libcairo/debian/changelog
projects/haf/trunk/libcairo/debian/control
projects/haf/trunk/libcairo/debian/rules
Log:
libcairo (1.2.4-4osso1) unstable; urgency=low
* Set myself as Maintainer
* Drop the directfb and the udeb
- debian/control:
+ remove libdirectfb-dev from Build-Depends
+ remove *directfb* packages
- debian/rules:
+ remove rules for udeb and mentions of directfb
- debian/libcairo-directfb2*: removed
* Lower debhelper dependency to (>> 4.0.0)
- debian/control: update Build-Depends
- debian/rules: DH_COMPAT=4
* Lower pkg-config dependency to (>= 0.17)
- NOTE: this might break cairo.pc using Require.private
- debian/control: update Build-Depends
* Remove dependency to xutils-dev
- debian/control: update Build-Depends
Modified: projects/haf/trunk/libcairo/debian/changelog
===================================================================
--- projects/haf/trunk/libcairo/debian/changelog 2006-12-01 15:25:15 UTC (rev 8546)
+++ projects/haf/trunk/libcairo/debian/changelog 2006-12-01 15:26:48 UTC (rev 8547)
@@ -1,3 +1,24 @@
+libcairo (1.2.4-4osso1) unstable; urgency=low
+
+ * Set myself as Maintainer
+ * Drop the directfb and the udeb
+ - debian/control:
+ + remove libdirectfb-dev from Build-Depends
+ + remove *directfb* packages
+ - debian/rules:
+ + remove rules for udeb and mentions of directfb
+ - debian/libcairo-directfb2*: removed
+ * Lower debhelper dependency to (>> 4.0.0)
+ - debian/control: update Build-Depends
+ - debian/rules: DH_COMPAT=4
+ * Lower pkg-config dependency to (>= 0.17)
+ - NOTE: this might break cairo.pc using Require.private
+ - debian/control: update Build-Depends
+ * Remove dependency to xutils-dev
+ - debian/control: update Build-Depends
+
+ -- Tommi Komulainen <tommi.komulainen at nokia.com> Fri, 3 Nov 2006 15:02:02 +0200
+
libcairo (1.2.4-4) unstable; urgency=medium
* Acknowledge NMU.
Modified: projects/haf/trunk/libcairo/debian/control
===================================================================
--- projects/haf/trunk/libcairo/debian/control 2006-12-01 15:25:15 UTC (rev 8546)
+++ projects/haf/trunk/libcairo/debian/control 2006-12-01 15:26:48 UTC (rev 8547)
@@ -1,8 +1,8 @@
Source: libcairo
Section: libs
Priority: optional
-Maintainer: Dave Beckett <dajobe at debian.org>
-Build-Depends: debhelper (>= 5.0.22), autotools-dev, pkg-config (>= 0.18), libfontconfig1-dev, libfreetype6-dev (>=2.1.10), libxrender-dev (>=0.6.0), libx11-dev, libpng12-dev, libdirectfb-dev (>=0.9.25), libsm-dev, xutils-dev, libxt-dev, dpatch
+Maintainer: Tommi Komulainen <tommi.komulainen at nokia.com>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, pkg-config (>= 0.17), libfontconfig1-dev, libfreetype6-dev (>=2.1.10), libxrender-dev (>=0.6.0), libx11-dev, libpng12-dev, libsm-dev, libxt-dev, dpatch
Standards-Version: 3.7.2
Package: libcairo2-dev
@@ -57,43 +57,3 @@
This package contains the HTML documentation for the Cairo library
in /usr/share/doc/libcairo2-doc/ .
-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 (= ${Source-Version}), libfontconfig1-dev, libfreetype6-dev (>=2.1.10), libpng12-dev, libdirectfb-dev (>=0.9.25)
-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
Deleted: projects/haf/trunk/libcairo/debian/libcairo-directfb2-dev.install
===================================================================
--- projects/haf/trunk/libcairo/debian/libcairo-directfb2-dev.install 2006-12-01 15:25:15 UTC (rev 8546)
+++ projects/haf/trunk/libcairo/debian/libcairo-directfb2-dev.install 2006-12-01 15:26:48 UTC (rev 8547)
@@ -1,4 +0,0 @@
-debian/dist-directfb/usr/lib/libcairo-directfb/include/cairo/*.h /usr/lib/libcairo-directfb/include/cairo
-debian/dist-directfb/usr/lib/libcairo-directfb/lib/libcairo.so /usr/lib/libcairo-directfb/lib
-debian/dist-directfb/usr/lib/libcairo-directfb/lib/libcairo*.a /usr/lib/libcairo-directfb/lib
-debian/dist-directfb/usr/lib/pkgconfig/cairo-directfb.pc /usr/lib/pkgconfig
Deleted: projects/haf/trunk/libcairo/debian/libcairo-directfb2-udeb.install
===================================================================
--- projects/haf/trunk/libcairo/debian/libcairo-directfb2-udeb.install 2006-12-01 15:25:15 UTC (rev 8546)
+++ projects/haf/trunk/libcairo/debian/libcairo-directfb2-udeb.install 2006-12-01 15:26:48 UTC (rev 8547)
@@ -1 +0,0 @@
-debian/dist-directfb/usr/lib/libcairo-directfb/lib/libcairo.so.* /usr/lib
Deleted: projects/haf/trunk/libcairo/debian/libcairo-directfb2.install
===================================================================
--- projects/haf/trunk/libcairo/debian/libcairo-directfb2.install 2006-12-01 15:25:15 UTC (rev 8546)
+++ projects/haf/trunk/libcairo/debian/libcairo-directfb2.install 2006-12-01 15:26:48 UTC (rev 8547)
@@ -1 +0,0 @@
-debian/dist-directfb/usr/lib/libcairo-directfb/lib/libcairo.so.* /usr/lib/libcairo-directfb/lib
Modified: projects/haf/trunk/libcairo/debian/rules
===================================================================
--- projects/haf/trunk/libcairo/debian/rules 2006-12-01 15:25:15 UTC (rev 8546)
+++ projects/haf/trunk/libcairo/debian/rules 2006-12-01 15:26:48 UTC (rev 8547)
@@ -24,26 +24,13 @@
--disable-glitz --disable-xcb --disable-directfb \
--enable-png
-# udeb package flags
-# directfb DirectFB (requires Build-Depend on libdirectfb-0.9-24-dev )
-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 DH_COMPAT=5
+export DH_COMPAT=4
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -100,40 +87,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 $(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 $(MAIN_BUILD_DIR) $(DIRECTFB_BUILD_DIR) $(MAIN_DIST_DIR) $(DIRECTFB_DIST_DIR)
- rm -f debian/cairo-directfb.pc
+ rm -rf debian/libcairo2 debian/libcairo2-dev debian/libcairo2-doc
+ rm -rf $(MAIN_BUILD_DIR) $(MAIN_DIST_DIR)
-rm -f config.h config.cache config.status config.log
@@ -155,13 +122,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
@@ -181,8 +142,7 @@
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs -plibcairo2 -V --add-udeb 'libcairo-directfb2-udeb'
- dh_makeshlibs -plibcairo-directfb2 -V 'libcairo-directfb2 (>= 1.2.4-4)' --add-udeb 'libcairo-directfb2-udeb'
+ dh_makeshlibs -plibcairo2 -V
dh_installdeb
dh_shlibdeps
dh_perl
- Previous message: [maemo-commits] r8546 - projects/haf/trunk
- Next message: [maemo-commits] r8548 - projects/haf/tags/libcairo
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]