Merge branch 'release-2.5'

build.xml

@@ -26,7 +26,7 @@
   <property name="php-cs-fixers" value="no_blank_lines_before_namespaces,function_call_space,trailing_spaces,unused_use,lowercase_keywords,encoding,parenthesis,php_closing_tag,visibility,duplicate_semicolon,extra_empty_lines,no_blank_lines_after_class_opening,no_empty_lines_after_phpdocs,operators_spaces,spaces_before_semicolon,ternary_spaces,concat_with_spaces,short_array_syntax,phpdoc_no_access,remove_leading_slash_use" />
 
 
-  <property name="version" value="2.5" />
+  <property name="version" value="2.5.1" />
 
   <!-- We only need the -p switch if the password is non-blank -->
   <if><not><equals arg1="${mysqlrootpass}" arg2="" /></not><then>

config/vufind/config.ini

@@ -102,7 +102,7 @@ showBulkOptions = false
 ; Should users be allowed to save searches in their accounts?
 allowSavedSearches = true
 ; Generator value to display in an HTML header <meta> tag:
-generator = "VuFind 2.5"
+generator = "VuFind 2.5.1"
 
 ; This section allows you to configure the mechanism used for storing user
 ; sessions.  Available types: File, Memcache, Database.

module/VuFind/src/VuFind/RecordDriver/EDS.php

@@ -581,4 +581,4 @@ class EDS extends SolrDefault
         // EDS is not export-friendly; disable all formats.
         return true;
     }
-}
+}
\ No newline at end of file

packages/DEBIAN/changelog

+vufind 2.5.1 distribution; urgency=low
+
+  * VuFind 2.5.1 release (see http://vufind.org/wiki/changelog for details) 
+
+ -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net>  Mo 11 Jan 2016 09:30:11 UTC
+
 vufind 2.5 distribution; urgency=low
 
   * VuFind 2.5 release (see http://vufind.org/wiki/changelog for details) 

packages/DEBIAN/control

 Package: vufind2
-Version: 2.5
+Version: 2.5.1
 Section: World Wide Web
 Priority: Optional
 Architecture: all