From 1efcb041955d8dc8d0d40292169b202742601d45 Mon Sep 17 00:00:00 2001 From: mfrasca Date: Mon, 9 Oct 2017 21:41:17 -0500 Subject: [PATCH 1/2] use A4 size, scale to fit, centre in page. --- .../mako/templates/accession-label-qr.ps | Bin 604712 -> 604591 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bauble/plugins/report/mako/templates/accession-label-qr.ps b/bauble/plugins/report/mako/templates/accession-label-qr.ps index ce1d22def3d47845f20020b9a709ed571f891eeb..4e4a1d47477bfdac11eae4e507f7ce32c04262d5 100644 GIT binary patch delta 209 zcmZ4SMP>bGl?|&|xD6Bx6ih8m6)a4QCU0U{Gd<6QlYes#>r=z#VDt81b4DO$0%B$$ zW&vVWAZ7z%_U*yu90z_G>jyhK`nW1oD;VgRm_mr+}OG*o-uQB0NWQ>{aX3TkQx~vJO19tiC bXH7V37+Jw~Zuc Date: Mon, 9 Oct 2017 21:47:59 -0500 Subject: [PATCH 2/2] bumping to 1.0.74 --- bauble/version.py | 2 +- data/ghini.desktop | 2 +- doc/conf.py | 2 +- packages/builddeb.sh | 2 +- scripts/build.nsi | 2 +- scripts/installer.cfg | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bauble/version.py b/bauble/version.py index 9f0427c30..b124822ee 100644 --- a/bauble/version.py +++ b/bauble/version.py @@ -21,4 +21,4 @@ # The Ghini version. # major, minor, revision version tuple -version = "1.0.73" # :bump +version = "1.0.74" # :bump diff --git a/data/ghini.desktop b/data/ghini.desktop index 517fa8b6b..226be3a63 100644 --- a/data/ghini.desktop +++ b/data/ghini.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=Ghini -Version=1.0.73 # :bump +Version=1.0.74 # :bump Comment=An application for managing botanical collections Terminal=False Icon=ghini diff --git a/doc/conf.py b/doc/conf.py index 8ea6e10d3..4cb162798 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -70,7 +70,7 @@ # The short X.Y version. version = '1.0' # The full version, including alpha/beta/rc tags. -release = '1.0.73' # :bump +release = '1.0.74' # :bump # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/packages/builddeb.sh b/packages/builddeb.sh index 0c514e8ea..4cc35966d 100755 --- a/packages/builddeb.sh +++ b/packages/builddeb.sh @@ -3,7 +3,7 @@ # Requires bzr, devscripts, debhelper packages TOPLEVEL=`pwd` -VERSION="1.0.73" # :bump +VERSION="1.0.74" # :bump TARBALL="bauble-$VERSION.tar.gz" ORIG_TARBALL="bauble_$VERSION.orig.tar.gz" diff --git a/scripts/build.nsi b/scripts/build.nsi index 8bfd6bc4d..38d0bc9e5 100755 --- a/scripts/build.nsi +++ b/scripts/build.nsi @@ -12,7 +12,7 @@ ; general Name "Bauble" -!define version "1.0.73" ; :bump +!define version "1.0.74" ; :bump !define src_dir "../dist" Outfile "bauble-${version}-setup.exe" diff --git a/scripts/installer.cfg b/scripts/installer.cfg index c1d3e6d85..808d4ff99 100644 --- a/scripts/installer.cfg +++ b/scripts/installer.cfg @@ -1,6 +1,6 @@ [Application] name=Bauble -version=1.0.73 # :bump +version=1.0.74 # :bump entry_point=bauble:main icon=images/icon.ico