Skip to content

Commit

Permalink
Merge 1.5.0 changes back to master.
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-jumper committed Jan 11, 2023
2 parents 4afc1d8 + a5214c9 commit f6893ed
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bin/guacctl
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ error() {
##
usage() {
cat >&2 <<END
guacctl 1.4.0, Apache Guacamole terminal session control utility.
guacctl 1.5.0, Apache Guacamole terminal session control utility.
Usage: guacctl [OPTION] [FILE or NAME]...
-d, --download download each of the files listed.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

AC_PREREQ([2.61])
AC_INIT([guacamole-server], [1.4.0])
AC_INIT([guacamole-server], [1.5.0])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AM_SILENT_RULES([yes])
Expand Down
2 changes: 1 addition & 1 deletion src/libguac/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ libguac_la_CFLAGS = \
-Werror -Wall -pedantic

libguac_la_LDFLAGS = \
-version-info 20:0:0 \
-version-info 21:0:0 \
-no-undefined \
@CAIRO_LIBS@ \
@DL_LIBS@ \
Expand Down
2 changes: 2 additions & 0 deletions src/terminal/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ libguac_terminal_la_LIBADD = \
@LIBGUAC_LTLIB@

libguac_terminal_la_LDFLAGS = \
-version-info 0:0:0 \
-no-undefined \
@CAIRO_LIBS@ \
@MATH_LIBS@ \
@PANGO_LIBS@ \
Expand Down

0 comments on commit f6893ed

Please sign in to comment.