[Pkg-mono-svn-commits] rev 2116 - in libgdiplus/trunk/debian: . patches

[Mirco Bauer]

Author: meebey-guest
Date: 2005-11-21 16:32:27 +0000 (Mon, 21 Nov 2005)
New Revision: 2116

Added:
   libgdiplus/trunk/debian/patches/
   libgdiplus/trunk/debian/patches/00list
   libgdiplus/trunk/debian/patches/pixmap_remap_fix.dpatch
Modified:
   libgdiplus/trunk/debian/changelog
   libgdiplus/trunk/debian/control
   libgdiplus/trunk/debian/rules
Log:
- libgdiplus 1.1.10-1 release.



Modified: libgdiplus/trunk/debian/changelog
===================================================================
--- libgdiplus/trunk/debian/changelog	2005-11-21 16:26:58 UTC (rev 2115)
+++ libgdiplus/trunk/debian/changelog	2005-11-21 16:32:27 UTC (rev 2116)
@@ -1,3 +1,14 @@
+libgdiplus (1.1.10-1) unstable; urgency=low
+
+  * New upstream release
+  * Mirco 'meebey' Bauer
+    + Added dpatch to build-deps.
+    + debian/patches/pixmap_remap_fix.dpatch:
+      - Patch to fix the build using current binutils
+        (thanks to Sebastian 'slomo' Dröge <slomo at ubuntu.com>)
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 13 Nov 2005 18:34:04 +0100
+
 libgdiplus (1.1.9.1-1) unstable; urgency=low
 
   * New upstream release

Modified: libgdiplus/trunk/debian/control
===================================================================
--- libgdiplus/trunk/debian/control	2005-11-21 16:26:58 UTC (rev 2115)
+++ libgdiplus/trunk/debian/control	2005-11-21 16:32:27 UTC (rev 2116)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>, Dave Beckett <dajobe at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.2.3), libmono-dev, libmono0 (>= 1.0), xlibs-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev (>= 2.0), libpng12-dev, libjpeg62-dev, libtiff4-dev, libungif4-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, libglib2.0-dev (>= 2.2.3), libmono-dev, libmono0 (>= 1.0), xlibs-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev (>= 2.0), libpng12-dev, libjpeg62-dev, libtiff4-dev, libungif4-dev
 Standards-Version: 3.6.2.1
 
 Package: libgdiplus

Added: libgdiplus/trunk/debian/patches/00list
===================================================================
--- libgdiplus/trunk/debian/patches/00list	2005-11-21 16:26:58 UTC (rev 2115)
+++ libgdiplus/trunk/debian/patches/00list	2005-11-21 16:32:27 UTC (rev 2116)
@@ -0,0 +1 @@
+pixmap_remap_fix

Added: libgdiplus/trunk/debian/patches/pixmap_remap_fix.dpatch
===================================================================
--- libgdiplus/trunk/debian/patches/pixmap_remap_fix.dpatch	2005-11-21 16:26:58 UTC (rev 2115)
+++ libgdiplus/trunk/debian/patches/pixmap_remap_fix.dpatch	2005-11-21 16:32:27 UTC (rev 2116)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pixmap_remap_fix.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libgdiplus-1.1.10~/cairo/pixman/src/pixman-remap.h libgdiplus-1.1.10/cairo/pixman/src/pixman-remap.h
+--- libgdiplus-1.1.10~/cairo/pixman/src/pixman-remap.h	2005-08-29 20:11:27.000000000 +0200
++++ libgdiplus-1.1.10/cairo/pixman/src/pixman-remap.h	2005-11-21 17:18:29.000000000 +0100
+@@ -1,9 +1,9 @@
+ #define pixman_add_trapezoids _cairo_pixman_add_trapezoids
+-#define INT_pixman_color_to_pixel _cairo_pixman_color_to_pixel
++#define pixman_color_to_pixel _cairo_pixman_color_to_pixel
+ #define pixman_color_to_pixel _cairo_pixman_color_to_pixel
+ #define composeFunctions _cairo_pixman_compose_functions
+ #define fbComposeSetupMMX _cairo_pixman_compose_setup_mmx
+-#define INT_pixman_composite _cairo_pixman_composite
++#define pixman_composite _cairo_pixman_composite
+ #define pixman_composite _cairo_pixman_composite
+ #define fbCompositeCopyAreammx _cairo_pixman_composite_copy_area_mmx
+ #define fbCompositeSolidMask_nx8888x0565Cmmx _cairo_pixman_composite_solid_mask_nx8888x0565Cmmx


Property changes on: libgdiplus/trunk/debian/patches/pixmap_remap_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: libgdiplus/trunk/debian/rules
===================================================================
--- libgdiplus/trunk/debian/rules	2005-11-21 16:26:58 UTC (rev 2115)
+++ libgdiplus/trunk/debian/rules	2005-11-21 16:32:27 UTC (rev 2116)
@@ -5,6 +5,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+include /usr/share/dpatch/dpatch.make
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -16,7 +18,7 @@
 	INSTALL_PROGRAM += -s
 endif
 
-config.status: configure
+config.status: patch-stamp configure
 	dh_testdir
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -30,12 +32,12 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp config.log config.status
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	-$(MAKE) clean
 	dh_clean 
 
 install: build