# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: bzr://bzr.savannah.nongnu.org/man-db/trunk/
# testament_sha1: 1dce0e6e13ee58d56a3aebf7d7f7983f5d860edf
# timestamp: 2012-06-07 23:37:41 +0300
# base_revision_id: address@hidden
#   bxwec312402j2m8m
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2012-02-14 12:41:58 +0000
+++ configure.ac	2012-06-07 20:35:49 +0000
@@ -346,18 +346,19 @@
 if test -n "$xz"
 then
 	unxz="$xz -dc"
+else
+dnl lzma not used/needed if we have xz
+MAN_CHECK_PROGS([lzma], [LZMA], [use LZMA as Lempel-Ziv-Markov chain-Algorithm compression utility], [lzma])
+if test -n "$lzma"
+then
+	unlzma="$lzma -dc"
+fi
 fi
 MAN_CHECK_PROGS([lzip], [LZIP], [use LZIP as Lempel-Ziv-Markov chain-Algorithm compression utility], [lzip])
 if test -n "$lzip"
 then
 	unlzip="$lzip -dc"
 fi
-dnl lzma not used/needed if we have xz or lzip
-MAN_CHECK_PROGS([lzma], [LZMA], [use LZMA as Lempel-Ziv-Markov chain-Algorithm compression utility], [lzma])
-if test -n "$lzma" && test -z "$xz" && test -z "$lzip"
-then
-	unlzma="$lzma -dc"
-fi
 if test -n "$gzip" || test -n "$compress" || test -n "$bzip2" || test -n "$xz" || test -n "$lzip" || test -n "$lzma"
 then
 	AC_DEFINE([COMP_CAT], [1], [Define if you have compressors and want to support compressed cat files.])

=== modified file 'include/comp_src.h.in'
--- include/comp_src.h.in	2012-02-02 18:06:25 +0000
+++ include/comp_src.h.in	2012-06-07 20:35:49 +0000
@@ -69,18 +69,16 @@
 #ifdef HAVE_XZ
 	{UNXZ, "xz", NULL},
 	{UNXZ, "lzma", NULL},
-#endif /* HAVE_XZ */
+/* Else if we have lzma, incorporate the following */
+#elif defined (HAVE_LZMA)
+	{UNLZMA, "lzma", NULL},
+#endif /* HAVE_XZ || HAVE_LZMA */
 
 /* If we have lzip, incorporate the following */
 #ifdef HAVE_LZIP
 	{UNLZIP, "lz", NULL},
 #endif /* HAVE_LZIP */
 
-/* Else if we have lzma, incorporate the following */
-#if defined (HAVE_LZMA) && !defined (HAVE_XZ) && !defined (HAVE_LZIP)
-	{UNLZMA, "lzma", NULL},
-#endif /* HAVE_LZMA */
-
 /*------------------------------------------------------*/
 /* Add your decompressor(s) and extension(s) below here */
 /*------------------------------------------------------*/

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcZRht0AAlHflAAwXff//3rP
31q//9/+BAAIAFAFSvVzs1YuOBQ2huuGSE0TEnpqn4iPVPyJNtSb0ppoYAjNAaJ+o8ggSiQGE0Ta
lH6FPSGnqepk9QeiAYDQTIDRgSRARNCn6Bopp6nqANqGmjQZDQAAADgGEYTTEMAgGQAwjTJkwjAQ
0ElBGgAJplPQjNRqNE0aHqHqHqPT1AAjGoQeL+KPGM6SeTBOGqmcl3MR23Yb10RCkCIR2wNkxiil
2HHB9VBY3xXcjtPNx/jY02GUUVUVR+dKZ3CyYjCSlE88ygtQilVs39aT+0ykAlt3bPbDIp4CwalA
fWdIbbYW0CB5q0UMCKXZBjYk8p926bbnzD5vW40T/180rQewHMF0lptmwwBvmlFVnEGDY4+4doVk
cAAg3smErgSmvMAGW1fR39bvOxjN0vCpFiDnomREg8hurWFXVC2Q3l3nGSoHMCCzPqRzE3QojLtG
pOAx4BnTKWCIAPQtEVIomh1MoYjRCLnABcpssVthGA+27Zdr2Gh2fKgjzWjprZ6yoi+njS8yBFmd
PXa0jUMxYObPqv94DQypQxk47CvbqxdlPKvGj+EKg1xgNSHoYOGooX+PC92bywz1fSIlxnGhroRi
jaNLo19E7CJV2a4pVn0CFoD3MVgaJLHgRMdtbx1QnRPtZZBiUA0wVY2H40xJSjJOaBk0BtUxcn1b
7632XEVEpE90y50ZtVMYFsHpZbjIyRfTUOZaFmghA0srMRaA+UlByRXmlPdiX4KlY5pKEaCgYqsA
msJnvsxZQMAbbEKkjh/3ATEblY2U1tIxjsAWaGA6OtJ8aWIC3ElGqGBkkVmgBg2+BbbeOuLANUGB
F+NArqZQI+GtqNRlNwabRVUTo0u4LccK15o3k8zOcJAN3fOiffhIaQ+QPUjQUrwEQ4AhRE81pUx3
3uDiS+6eSeougWlupayLs4GBFkRvN/sQvtz6VXOuUsIi2PnEzXGRE+JUnHbeoPBWPwMxHWR+SGjn
Ik3RURlI1r02IiK4ryNJ7nlhy8wDgtGHPux/IDBp2kkyBh+0Zy5dhVZ/Rbmi2lHZqK5K3iIb4It7
EZL6laUEPhKOZ4IqX967zTgOrNDmdMx7odwGpG3BHjXd+iCGXfqtcOoJ1Sd0hQjwRQQ6jej1ayao
32CJ9hqRZc/RD+MbGSQBjMOnWWTUwCML23RI2FpkXmtFVd/eQn4KqNUeu828GHBqdy8TDbGkVnp6
Om67N3XgONzh4/cVMbwRSUIuboi9O5nbT0qRjLuOjJgSp9lGZ+8mHhUNMPLGug0lAL888sWTJM81
SiWuQ6IWJizjkNHHGol3t6FKsOtBs+4cdRm9oeQaXo6AKwOItPsqb6mJGYmULKlzS2xDAPagteOs
sQxG9FyGs8vahkNd9Facp/KgYKP1aIGkerFtyITdfbsxfkl1FKMNumrlAbwVYEe4DnQZo0An2WoP
rt6mxDBFGRzjY46gRuGQMHv804WYOI3+Greisr0Pa8oTnUGSaByXzSUH2JG9Of5+xMEZMMrziMMy
k2TlF+k7wcZDAMhrx4MyJtC+RBmZFOLZVFKiowMt/dp873j2AJwZGRDZ4mCKFLEcnEjliqRkqZn3
7rjPgZ8GGBwrlxTjKWnSmQ6OQTaII66KulZXq3KqLZo3wdlfCsJMEtoE7pX3M1y4GxE80mBxkglD
OZqHtCQUlHgVY5qtROO8J0Ej3OvRGuO6l2S+JU9CCVrSoVocyBOqwdml90NrusslpmoVr9FSrXSe
JML/zzRxROGaofIpBqNFGsljiIlXRXC1UEF/Fqh6vi/8i7kinChIYyjDboA=