From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 2 Mar 2012 13:00:12 +0000 (+0100)
Subject: Merge branch 'master' into ofop
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/941b8e6effd4c0ffff52fa7e548d866f8454dddb

Merge branch 'master' into ofop
---

941b8e6effd4c0ffff52fa7e548d866f8454dddb
diff --cc scripts/book2partner
index dcc8919,4b84c2f..338b263
--- a/scripts/book2partner
+++ b/scripts/book2partner
@@@ -49,12 -45,8 +49,12 @@@ if __name__ == '__main__'
          packagers.GandalfEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)
      if options.gandalf_pdf:
          packagers.GandalfPdfPackager.prepare(input_filenames, options.output_dir, options.verbose)
 +    if options.artatech:
 +        packagers.ArtaTechEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)
 +    if options.artatech_pdf:
 +        packagers.ArtaTechPdfPackager.prepare(input_filenames, options.output_dir, options.verbose)
      if options.virtualo:
-         packagers.VirtualoEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)
+         packagers.VirtualoPackager.prepare(input_filenames, options.output_dir, options.verbose)
      if options.prestigio:
          packagers.PrestigioEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)
      if options.prestigio_pdf: