[maemo-commits] [maemo-commits] r17557 - in projects/haf/trunk/libcairo/debian: . patches

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-03-02 10:39:07 +0200 (Mon, 02 Mar 2009)
New Revision: 17557

Added:
   projects/haf/trunk/libcairo/debian/patches/
   projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch
Modified:
   projects/haf/trunk/libcairo/debian/changelog
   projects/haf/trunk/libcairo/debian/control
   projects/haf/trunk/libcairo/debian/rules
Log:
cairo (1.6.4-6maemo1) unstable; urgency=low

  * Packages cairo-pref separately

 -- Pierre-Luc Beaudoin <pierre-luc.beaudoin at collabora.co.uk>  Thu, 5 Feb 2009 13:49:00 +0200


Modified: projects/haf/trunk/libcairo/debian/changelog
===================================================================
--- projects/haf/trunk/libcairo/debian/changelog	2009-03-02 07:47:55 UTC (rev 17556)
+++ projects/haf/trunk/libcairo/debian/changelog	2009-03-02 08:39:07 UTC (rev 17557)
@@ -1,5 +1,11 @@
 cairo (1.6.4-6maemo1) unstable; urgency=low
 
+  * Packages cairo-pref separately
+
+ -- Pierre-Luc Beaudoin <pierre-luc.beaudoin at collabora.co.uk>  Thu, 5 Feb 2009 13:49:00 +0200
+
+cairo (1.6.4-6maemo1) unstable; urgency=low
+
   * Debian packaging (using upstream tarball) for Fremantle.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 06 Aug 2008 15:33:57 +0300

Modified: projects/haf/trunk/libcairo/debian/control
===================================================================
--- projects/haf/trunk/libcairo/debian/control	2009-03-02 07:47:55 UTC (rev 17556)
+++ projects/haf/trunk/libcairo/debian/control	2009-03-02 08:39:07 UTC (rev 17557)
@@ -65,3 +65,13 @@
  This package contains the HTML documentation for the Cairo library
  in /usr/share/gtk-doc/html/cairo/.
 
+Package: cairo-perf
+Section: misc
+Architecture: any
+Depends: libcairo2 (= ${Source-Version})
+Description: Performance analisys tool for cairo
+ Cairo is a multi-platform library providing anti-aliased
+ vector-based rendering for multiple target backends.
+ .
+ This packages contains the binaries for cairo-perf tool.
+

Added: projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch
===================================================================
--- projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch	2009-03-02 07:47:55 UTC (rev 17556)
+++ projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch	2009-03-02 08:39:07 UTC (rev 17557)
@@ -0,0 +1,13 @@
+diff -Nur -x '*.orig' -x '*~' libcairo/build-tree/cairo-1.6.4/perf/Makefile.am libcairo.new/build-tree/cairo-1.6.4/perf/Makefile.am
+--- cairo-1.6.4/perf/Makefile.am	2008-04-05 01:45:22.000000000 +0300
++++ cairo-1.6.4/perf/Makefile.am	2009-02-18 16:09:47.000000000 +0200
+@@ -10,7 +10,8 @@
+ 	-I$(top_builddir)/src			\
+ 	$(CAIRO_CFLAGS)
+ 
+-EXTRA_PROGRAMS = cairo-perf cairo-perf-diff-files
++bin_PROGRAMS = cairo-perf
++EXTRA_PROGRAMS = cairo-perf-diff-files
+ EXTRA_DIST = cairo-perf-diff
+ 
+ cairo_perf_SOURCES =		\

Modified: projects/haf/trunk/libcairo/debian/rules
===================================================================
--- projects/haf/trunk/libcairo/debian/rules	2009-03-02 07:47:55 UTC (rev 17556)
+++ projects/haf/trunk/libcairo/debian/rules	2009-03-02 08:39:07 UTC (rev 17557)
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_TAR_SRCDIR := cairo-1.6.4
 include /usr/share/cdbs/1/rules/tarball.mk
@@ -10,3 +11,10 @@
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-xlib --enable-pdf --enable-ps --enable-svg --disable-glitz --disable-directfb --enable-png
 
 DEB_DH_STRIP_ARGS := --dbg-package=libcairo2
+
+build/cairo-perf::
+	$(MAKE) -C $(DEB_BUILDDIR)/perf cairo-perf
+
+install/cairo-perf::
+	dh_install -p cairo-perf $(DEB_BUILDDIR)/perf/cairo-perf /usr/bin
+