# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/aleksander/Development/gnu/libgnupdf\
#   /trunk/
# testament_sha1: 8ff82c94fc1f297c06f86176ccb2554f0bc75b32
# timestamp: 2009-01-01 18:55:08 +0100
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'AUTHORS'
--- AUTHORS	2008-11-29 16:21:37 +0000
+++ AUTHORS	2009-01-01 17:54:42 +0000
@@ -204,6 +204,8 @@
   torture/unit/base/hash/pdf-hash-iterator.c
   torture/unit/base/list/pdf-list-iterator-from-to.c
   torture/unit/base/list/pdf-list-iterator-next.c
+  torture/unit/base/stm/pdf-stm-write.c
+  torture/unit/base/stm/pdf-stm-read.c
   
 Daniel Vidal: wrote /torture/unit/base/types/pdf-i64-add.c
   /torture/unit/base/types/pdf-i64-assign.c

=== modified file 'ChangeLog'
--- ChangeLog	2008-12-28 17:01:09 +0000
+++ ChangeLog	2009-01-01 17:54:42 +0000
@@ -1,3 +1,13 @@
+2009-01-01  Aleksander Morgado  <address@hidden>
+
+	* torture/unit/base/stm/pdf-stm-write.c: Disable compilation and
+	execution of test `pdf_stm_write_007' if LIBZ not available, as
+	`PDF_STM_FILTER_FLATE_DEC' is not defined.
+
+	* torture/unit/base/stm/pdf-stm-read.c: Disable compilation and
+	execution of test `pdf_stm_read_009' if LIBZ not available, as
+	`PDF_STM_FILTER_FLATE_DEC' is not defined.
+
 2008-12-28  Jose E. Marchesi  <address@hidden>
 
 	* doc/gnupdf.texi (Creation and Destruction of Functions):

=== modified file 'torture/unit/base/stm/pdf-stm-read.c'
--- torture/unit/base/stm/pdf-stm-read.c	2008-12-25 15:49:31 +0000
+++ torture/unit/base/stm/pdf-stm-read.c	2009-01-01 17:54:42 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: C -*- Time-stamp: "2008-12-25 16:21:49 davazp"
+/* -*- mode: C -*- Time-stamp: "2009-01-01 18:51:13 aleksander"
  *
  *       File:         pdf-stm-read.c
  *       Date:         Sat Sep 20 15:20:17 2008
@@ -537,6 +537,10 @@
 }
 END_TEST
 
+
+/* Note: PDF_STM_FILTER_FLATE_DEC is only available if LIBZ is used */
+#if defined(HAVE_LIBZ)
+
 /*
  * Test: pdf_stm_read_009
  * Description:
@@ -610,11 +614,10 @@
   /* Destroy the stream */
   pdf_stm_destroy (stm);
   pdf_dealloc (buf);
-
 }
 END_TEST
 
-
+#endif
 
 /*
  * Test: pdf_stm_read_011
@@ -745,7 +748,10 @@
   tcase_add_test(tc, pdf_stm_read_006);
   tcase_add_test(tc, pdf_stm_read_007);
   tcase_add_test(tc, pdf_stm_read_008);
+/* Note: PDF_STM_FILTER_FLATE_DEC is only available if LIBZ is used */
+#if defined(HAVE_LIBZ)
   tcase_add_test(tc, pdf_stm_read_009);
+#endif
   tcase_add_test(tc, pdf_stm_read_011);
   tcase_add_test(tc, pdf_stm_read_012);
 

=== modified file 'torture/unit/base/stm/pdf-stm-write.c'
--- torture/unit/base/stm/pdf-stm-write.c	2008-12-25 15:49:31 +0000
+++ torture/unit/base/stm/pdf-stm-write.c	2009-01-01 17:54:42 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: C -*- Time-stamp: "2008-12-25 16:48:54 davazp"
+/* -*- mode: C -*- Time-stamp: "2009-01-01 18:50:46 aleksander"
  *
  *       File:         pdf-stm-write.c
  *       Date:         Sun Sep 21 16:37:27 2008
@@ -348,6 +348,9 @@
 END_TEST
 
 
+/* Note: PDF_STM_FILTER_FLATE_DEC is only available if LIBZ is used */
+#if defined(HAVE_LIBZ)
+
 /*
  * Test: pdf_stm_write_007
  * Description:
@@ -426,7 +429,7 @@
 }
 END_TEST
 
-
+#endif
 
 
 
@@ -708,7 +711,10 @@
   tcase_add_test(tc, pdf_stm_write_004);
   tcase_add_test(tc, pdf_stm_write_005);
   tcase_add_test(tc, pdf_stm_write_006);
+/* Note: PDF_STM_FILTER_FLATE_DEC is only available if LIBZ is used */
+#if defined(HAVE_LIBZ)
   tcase_add_test(tc, pdf_stm_write_007);
+#endif
   tcase_add_test(tc, pdf_stm_write_008);
   tcase_add_test(tc, pdf_stm_write_009);
   tcase_add_test(tc, pdf_stm_write_010);

# Begin bundle
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