Bumped version number and added license section to README

diff --git a/README b/README
index fd868dd70a3da8582009d9ea8dd01f37838a3824..5ead2ca8677e575a0f64a05e7ad97cb9459f4c5f 100644 (file)
--- a/README
+++ b/README
@@ -1,14 +1,28 @@
 ================================================================================
 
-                              UCW::Gallery v2.0
+                              UCW::Gallery v2.1
 
                    (c) 2004--2015 Martin Mares <mj@ucw.cz>
 
 ================================================================================
 
 This is a simple photo gallery for my web pages, or rather a set of bricks
-from which you can create one. It can be freely used and distributed according
-to the terms of the GNU GPL v2 or newer.
+from which you can create one.
+
+License
+~~~~~~~
+UCW::Gallery and the accompanying scripts can be freely used and distributed
+according to the terms of the GNU GPL v2 or newer.
+
+The images in nrt-blue/, used by the NrtBlue theme, are derived from images
+in an ancient version of the cthumb package, which is (c) Carlos Puchol
+and which can be distributed under GNU GPL v2. See http://cthumb.sourceforge.net/
+for the current version of cthumb.
+
+The JavaScript files and related data in highslide/, used by the HighSlide theme,
+come from the Highslide JS media viewer, which is (c) Highsoft AS. It can be
+freely used on personal and non-profit websites. For commercial or government
+use, a paid license is required. See http://www.highslide.com/ for details.
 
 Requirements
 ~~~~~~~~~~~~

diff --git a/gal b/gal
index 033ba17b0515e4d6e5fd5680acfc52f63a03afdb..c62d0d86385dbd494d7a27294be72a0603b7e65b 100755 (executable)
--- a/gal
+++ b/gal
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # UCW Gallery -- Master Program
-# (c) 2012 Martin Mares <mj@ucw.cz>
+# (c) 2012--2015 Martin Mares <mj@ucw.cz>
 
 use common::sense;
 use Getopt::Long;
@@ -36,7 +36,7 @@ Getopt::Long::Configure('require_order', 'bundling');
 GetOptions(
        "help" => \&show_help,
        "version" => sub {
-                       print "UCW Gallery 2.0 (c) 2004-2012 Martin Mares <mj\@ucw.cz>\n";
+                       print "UCW Gallery 2.1 (c) 2004-2015 Martin Mares <mj\@ucw.cz>\n";
                },
        "all!" => \$all,
        "p|parallel=i" => \$parallel,