diff --git a/build.xml b/build.xml index 7dca98da6118a2295857961c817fb9ac1fdfa7c6..4e979bf35681ea0b44741e122e8f746197daedd9 100644 --- a/build.xml +++ b/build.xml @@ -19,7 +19,7 @@ <property name="mysqlrootpass" value="password" /> <property name="pgsqlhost" value="localhost" /> <property name="pgsqlrootuser" value="postgres" /> - <property name="version" value="2.3" /> + <property name="version" value="2.3.1" /> <!-- We only need the -p switch if the password is non-blank --> <if><not><equals arg1="${mysqlrootpass}" arg2="" /></not><then> @@ -227,15 +227,15 @@ <mkdir dir="${builddir}/packages" /> <!-- build the standard tar.gz archive --> - <exec command="git archive master --format=tar --prefix=vufind-${version}/ -o ${builddir}/packages/vufind-${version}.tar" /> + <exec command="git archive HEAD --format=tar --prefix=vufind-${version}/ -o ${builddir}/packages/vufind-${version}.tar" /> <exec command="gzip ${builddir}/packages/vufind-${version}.tar" /> <!-- build the a zip archive --> - <exec command="git archive master --format=zip --prefix=vufind-${version}/ -o ${builddir}/packages/vufind-${version}.zip" /> + <exec command="git archive HEAD --format=zip --prefix=vufind-${version}/ -o ${builddir}/packages/vufind-${version}.zip" /> <!-- build the DEB package --> <mkdir dir="${builddir}/export/vufind/usr/local/vufind2" /> - <exec command="git archive master --format=tar | tar -x -C ${builddir}/export/vufind/usr/local/vufind2" /> + <exec command="git archive HEAD --format=tar | tar -x -C ${builddir}/export/vufind/usr/local/vufind2" /> <move file="${builddir}/export/vufind/usr/local/vufind2/packages/DEBIAN" todir="${builddir}/export/vufind" includeemptydirs="true"/> <exec command="chmod 0775 ${builddir}/export/vufind/DEBIAN/postinst" /> <exec command="dpkg-deb -b ${builddir}/export/vufind ${builddir}/packages/vufind_${version}.deb" /> diff --git a/config/vufind/config.ini b/config/vufind/config.ini index 80c978ba772326a6b051c358f930f57aa7f2fc53..804128bdbaeb1c22c05e702f11d43a75521466de 100644 --- a/config/vufind/config.ini +++ b/config/vufind/config.ini @@ -89,7 +89,7 @@ showBookBag = false ; Set the maximum amount of items allowed in the Book Bag - Default is 100 bookBagMaxSize = 100 ; Generator value to display in an HTML header <meta> tag: -generator = "VuFind 2.3" +generator = "VuFind 2.3.1" ; This section allows you to configure the mechanism used for storing user ; sessions. Available types: File, Memcache, Database. diff --git a/packages/DEBIAN/changelog b/packages/DEBIAN/changelog index a3d56406862e3fb9257f6eec243de37a7af3080f..022f5ee3fa22a53ae33d7bdf5408dd64e1ac5941 100644 --- a/packages/DEBIAN/changelog +++ b/packages/DEBIAN/changelog @@ -1,3 +1,9 @@ +vufind 2.3.1 distribution; urgency=low + + * VuFind 2.3.1 release (see http://vufind.org/wiki/changelog for details) + + -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net> Mo 17 Nov 2014 08:31:51 UTC + vufind 2.3 distribution; urgency=low * VuFind 2.3 release (see http://vufind.org/wiki/changelog for details) diff --git a/packages/DEBIAN/control b/packages/DEBIAN/control index b7d154063b6e24c6e4f4286be25da22ddece3fd4..e985dc24e0bcc58fc3b12e1a90f073d258fa0e46 100644 --- a/packages/DEBIAN/control +++ b/packages/DEBIAN/control @@ -1,5 +1,5 @@ Package: vufind2 -Version: 2.3 +Version: 2.3.1 Section: World Wide Web Priority: Optional Architecture: all diff --git a/themes/bootstrap3/css/vudl.css b/themes/bootstrap3/css/vudl.css index 360c0a9842cbb7cbf474450e975b1b3e9a60d0ed..95fb012f944f817cd95565b58d3207f2438ded35 100644 --- a/themes/bootstrap3/css/vudl.css +++ b/themes/bootstrap3/css/vudl.css @@ -18,7 +18,7 @@ .panel {border:1px solid #DDD} .panel .panel-heading {background:#EEE} -.panel-collapse {max-height:500px;} +.panel-collapse {max-height:500px;overflow-y:auto} .details {text-align:center} .details .copyright {margin-bottom:1em}