r16761 - in /desktop/experimental/pango1.0/debian: changelog patches/60_link-pangoxft-to-fontconfig.patch patches/70_automake.patch patches/series

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Aug 13 15:09:20 2008
New Revision: 16761

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16761
Log:
Refresh patches 60_link-pangoxft-to-fontconfig and 70_automake and convert
60_link-pangoxft-to-fontconfig to a -p1 level patch to support
dpkg-source's quilt format.

Modified:
    desktop/experimental/pango1.0/debian/changelog
    desktop/experimental/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch
    desktop/experimental/pango1.0/debian/patches/70_automake.patch
    desktop/experimental/pango1.0/debian/patches/series

Modified: desktop/experimental/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/changelog?rev=16761&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/changelog (original)
+++ desktop/experimental/pango1.0/debian/changelog Wed Aug 13 15:09:20 2008
@@ -2,6 +2,9 @@
 
   * Don't hardcode the pathes to defoma-app and update-pangox-aliases in
     maintainer scripts.
+  * Refresh patches 60_link-pangoxft-to-fontconfig and 70_automake and convert
+    60_link-pangoxft-to-fontconfig to a -p1 level patch to support
+    dpkg-source's quilt format.
 
  -- Loic Minier <lool at dooz.org>  Wed, 13 Aug 2008 16:59:28 +0200
 

Modified: desktop/experimental/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch?rev=16761&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch (original)
+++ desktop/experimental/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch Wed Aug 13 15:09:20 2008
@@ -3,8 +3,8 @@
 pango/Makefile.am: Explicitely include FONTCONFIG_CFLAGS and link to
 FONTCONFIG_LIBS as libpangoxft calls Fc* functions directly.
 
---- pango/Makefile.am.orig	2008-05-03 19:23:01.000000000 +0200
-+++ pango/Makefile.am	2008-06-24 22:57:24.000000000 +0200
+--- a/pango/Makefile.am	2008-08-13 17:07:07.000000000 +0200
++++ b/pango/Makefile.am	2008-08-13 17:07:08.000000000 +0200
 @@ -24,6 +24,7 @@
  	$(PANGO_DEBUG_FLAGS)				\
  	$(GLIB_CFLAGS)					\
@@ -13,7 +13,7 @@
  	$(CAIRO_CFLAGS)					\
  	$(FREETYPE_CFLAGS)				\
  	$(X_CFLAGS)
-@@ -242,6 +243,7 @@
+@@ -244,6 +245,7 @@
  	$(GLIB_LIBS)				\
  	$(X_LIBS)				\
  	$(XFT_LIBS)				\

Modified: desktop/experimental/pango1.0/debian/patches/70_automake.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/70_automake.patch?rev=16761&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/70_automake.patch (original)
+++ desktop/experimental/pango1.0/debian/patches/70_automake.patch Wed Aug 13 15:09:20 2008
@@ -1,8 +1,6 @@
-diff --git a/pango/Makefile.in b/pango/Makefile.in
-index b5edfbb..fe2b652 100644
---- a/pango/Makefile.in
-+++ b/pango/Makefile.in
-@@ -427,6 +427,7 @@ INCLUDES = \
+--- pango1.0-1.21.3.orig/pango/Makefile.in	2008-08-13 17:07:05.000000000 +0200
++++ pango1.0-1.21.3/pango/Makefile.in	2008-08-13 17:07:14.000000000 +0200
+@@ -427,6 +427,7 @@
  	$(PANGO_DEBUG_FLAGS)				\
  	$(GLIB_CFLAGS)					\
  	$(XFT_CFLAGS)					\
@@ -10,7 +8,7 @@
  	$(CAIRO_CFLAGS)					\
  	$(FREETYPE_CFLAGS)				\
  	$(X_CFLAGS)
-@@ -566,6 +567,7 @@ libpangoxft_1_0_la_LIBADD = \
+@@ -568,6 +569,7 @@
  	$(GLIB_LIBS)				\
  	$(X_LIBS)				\
  	$(XFT_LIBS)				\

Modified: desktop/experimental/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/series?rev=16761&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/series (original)
+++ desktop/experimental/pango1.0/debian/patches/series Wed Aug 13 15:09:20 2008
@@ -1,5 +1,5 @@
 10_scan-module-files-in-dirs.patch
 11_module-files-append-module-files-d.patch
 12_module-files-append-compat-module-files-d.patch
-60_link-pangoxft-to-fontconfig.patch -p0
+60_link-pangoxft-to-fontconfig.patch
 70_automake.patch