This commit was manufactured by cvs2git to create branch 'unlabeled-1.23.4'.

Sprout from master 2006-01-11 09:47:32 UTC wrobell <wrobell@pld-linux.org> '- ver. 0.4.4'
Delete:
    poppler-freetype_includes.patch
    poppler-link.patch

diff --git a/poppler-freetype_includes.patch b/poppler-freetype_includes.patch
deleted file mode 100644 (file)
index 123011a..0000000
--- a/poppler-freetype_includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- poppler-0.4.1/test/Makefile.am.orig        2005-03-03 20:46:04.000000000 +0100
-+++ poppler-0.4.1/test/Makefile.am     2005-11-29 17:00:44.000000000 +0100
-@@ -27,6 +27,7 @@
-       -I$(top_srcdir)                         \
-       -I$(top_srcdir)/poppler                 \
-       $(cairo_includes)                       \
-+      $(FREETYPE_CFLAGS)                      \
-       $(GTK_TEST_CFLAGS)                      \
-       -DDATADIR=\""$(datadir)"\"
- 

diff --git a/poppler-link.patch b/poppler-link.patch
deleted file mode 100644 (file)
index 2ab1a32..0000000
--- a/poppler-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN poppler-0.4.3.orig/poppler/Makefile.am poppler-0.4.3/poppler/Makefile.am
---- poppler-0.4.3.orig/poppler/Makefile.am     2005-12-12 22:46:47.000000000 +0100
-+++ poppler-0.4.3/poppler/Makefile.am  2005-12-15 17:50:43.000000000 +0100
-@@ -90,7 +90,7 @@
-       $(arthur_libs)                          \
-       $(libjpeg_libs)                         \
-       $(zlib_libs)                            \
--      $(FREETYPE_LIBS)
-+      $(FREETYPE_LIBS) -lfontconfig
- 
- poppler_includedir = $(includedir)/poppler
- poppler_include_HEADERS =     \