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

Mon Mar 2 10:39:19 EET 2009

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

Added:
   projects/haf/trunk/libcairo/debian/cairo-perf.install
   projects/haf/trunk/libcairo/debian/patches/001-cairo-perf-install.patch
   projects/haf/trunk/libcairo/debian/patches/002-cairo-perf-install-makefile.in.patch
Removed:
   projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch
Modified:
   projects/haf/trunk/libcairo/debian/changelog
   projects/haf/trunk/libcairo/debian/rules
Log:
cairo (1.6.4-6maemo2) unstable; urgency=low

  * new version (so upgrades will work properly)
  * also patch Makefile.in (the build runs without maintainer mode)
  * provide a proper .install file for cairo-perf

 -- Sven Herzberg <herzi at lanedo.com>  Mon, 02 Mar 2009 09:06:34 +0100


Added: projects/haf/trunk/libcairo/debian/cairo-perf.install
===================================================================

--- projects/haf/trunk/libcairo/debian/cairo-perf.install	2009-03-02 08:39:07 UTC (rev 17557)
+++ projects/haf/trunk/libcairo/debian/cairo-perf.install	2009-03-02 08:39:16 UTC (rev 17558)
@@ -0,0 +1 @@
+debian/tmp/usr/bin/cairo-perf /usr/bin/

Modified: projects/haf/trunk/libcairo/debian/changelog
===================================================================
--- projects/haf/trunk/libcairo/debian/changelog	2009-03-02 08:39:07 UTC (rev 17557)
+++ projects/haf/trunk/libcairo/debian/changelog	2009-03-02 08:39:16 UTC (rev 17558)
@@ -1,9 +1,14 @@
-cairo (1.6.4-6maemo1) unstable; urgency=low
+cairo (1.6.4-6maemo2) unstable; urgency=low
 
+  [ Pierre-Luc Beaudoin ]
   * Packages cairo-pref separately
 
- -- Pierre-Luc Beaudoin <pierre-luc.beaudoin at collabora.co.uk>  Thu, 5 Feb 2009 13:49:00 +0200
+  [ Sven Herzberg ]
+  * Fixed the build system (also patch Makefile.in, provide a proper .install
+    file)
 
+ -- Sven Herzberg <herzi at lanedo.com>  Mon, 02 Mar 2009 09:06:34 +0100
+
 cairo (1.6.4-6maemo1) unstable; urgency=low
 
   * Debian packaging (using upstream tarball) for Fremantle.

Copied: projects/haf/trunk/libcairo/debian/patches/001-cairo-perf-install.patch (from rev 17557, projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch)
===================================================================
--- projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch	2009-03-02 08:39:07 UTC (rev 17557)
+++ projects/haf/trunk/libcairo/debian/patches/001-cairo-perf-install.patch	2009-03-02 08:39:16 UTC (rev 17558)
@@ -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 =		\

Added: projects/haf/trunk/libcairo/debian/patches/002-cairo-perf-install-makefile.in.patch
===================================================================
--- projects/haf/trunk/libcairo/debian/patches/002-cairo-perf-install-makefile.in.patch	2009-03-02 08:39:07 UTC (rev 17557)
+++ projects/haf/trunk/libcairo/debian/patches/002-cairo-perf-install-makefile.in.patch	2009-03-02 08:39:16 UTC (rev 17558)
@@ -0,0 +1,130 @@
+--- cairo-1.6.4/perf/Makefile.in.orig	2009-03-02 08:26:57.727015701 +0100
++++ cairo-1.6.4/perf/Makefile.in	2009-03-02 08:37:58.711015388 +0100
+@@ -13,6 +13,7 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
++
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -31,7 +32,8 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-EXTRA_PROGRAMS = cairo-perf$(EXEEXT) cairo-perf-diff-files$(EXEEXT)
++bin_PROGRAMS = cairo-perf$(EXEEXT)
++EXTRA_PROGRAMS = cairo-perf-diff-files$(EXEEXT)
+ @CAIRO_HAS_WIN32_SURFACE_TRUE at am__append_1 = cairo-perf-win32.c
+ @CAIRO_HAS_OS2_SURFACE_TRUE@@CAIRO_HAS_WIN32_SURFACE_FALSE at am__append_2 = cairo-perf-os2.c
+ @CAIRO_HAS_OS2_SURFACE_FALSE@@CAIRO_HAS_WIN32_SURFACE_FALSE at am__append_3 = cairo-perf-posix.c
+@@ -45,6 +47,9 @@
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
++am__installdirs = "$(DESTDIR)$(bindir)"
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++PROGRAMS = $(bin_PROGRAMS)
+ am__cairo_perf_SOURCES_DIST = cairo-perf.c cairo-perf.h \
+ 	cairo-perf-cover.c cairo-stats.c cairo-stats.h box-outline.c \
+ 	fill.c long-lines.c mosaic.c mosaic.h paint.c \
+@@ -354,6 +359,34 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++install-binPROGRAMS: $(bin_PROGRAMS)
++	@$(NORMAL_INSTALL)
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  if test -f $$p \
++	     || test -f $$p1 \
++	  ; then \
++	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	  else :; fi; \
++	done
++
++uninstall-binPROGRAMS:
++	@$(NORMAL_UNINSTALL)
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	done
++
++clean-binPROGRAMS:
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
+ cairo-perf$(EXEEXT): $(cairo_perf_OBJECTS) $(cairo_perf_DEPENDENCIES) 
+ 	@rm -f cairo-perf$(EXEEXT)
+ 	$(LINK) $(cairo_perf_OBJECTS) $(cairo_perf_LDADD) $(LIBS)
+@@ -567,8 +600,11 @@
+ check-am: all-am
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: check-am
+-all-am: Makefile
++all-am: Makefile $(PROGRAMS)
+ installdirs:
++	for dir in "$(DESTDIR)$(bindir)"; do \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -596,7 +632,7 @@
+ 	@echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+ 
+-clean-am: clean-generic clean-libtool mostlyclean-am
++clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+@@ -616,7 +652,7 @@
+ 
+ install-dvi: install-dvi-am
+ 
+-install-exec-am:
++install-exec-am: install-binPROGRAMS
+ 
+ install-html: install-html-am
+ 
+@@ -648,22 +684,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am:
++uninstall-am: uninstall-binPROGRAMS
+ 
+ .MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+-	clean-generic clean-libtool ctags distclean distclean-compile \
+-	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-dvi install-dvi-am \
+-	install-exec install-exec-am install-html install-html-am \
+-	install-info install-info-am install-man install-pdf \
+-	install-pdf-am install-ps install-ps-am install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
++	clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
++	distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-binPROGRAMS install-data \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am
++	tags uninstall uninstall-am uninstall-binPROGRAMS
+ 
+ 
+ $(top_builddir)/boilerplate/libcairoboilerplate.la: $(top_builddir)/src/libcairo.la

Deleted: projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch
===================================================================
--- projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch	2009-03-02 08:39:07 UTC (rev 17557)
+++ projects/haf/trunk/libcairo/debian/patches/cairo-perf-install.patch	2009-03-02 08:39:16 UTC (rev 17558)
@@ -1,13 +0,0 @@
-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 08:39:07 UTC (rev 17557)
+++ projects/haf/trunk/libcairo/debian/rules	2009-03-02 08:39:16 UTC (rev 17558)
@@ -12,9 +12,3 @@
 
 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
-


