diff --git a/README b/README index ee1d3c880e760489b63429dc69ad188ed264af96..d3ff05e02fff34b68654a5f55d2779bd544ee604 100644 --- a/README +++ b/README @@ -22,6 +22,8 @@ You can subscribe to our mailing lists: https://lists.freedesktop.org/mailman/listinfo/gstreamer-devel +Follow us on Twitter: https://twitter.com/GStreamer + We track bugs, feature requests and merge requests (patches) in GitLab at https://gitlab.freedesktop.org/gstreamer/ diff --git a/hooks/pre-commit.hook b/hooks/pre-commit.hook index 3c1062b9e03da90ad621063ca802534fff280053..6f177402b3481153c5a07602edc020e6ace34a37 100755 --- a/hooks/pre-commit.hook +++ b/hooks/pre-commit.hook @@ -1,6 +1,6 @@ #!/bin/sh # -# Check that the code follows a consistant code style +# Check that the code follows a consistent code style # # Check for existence of indent, and error out if not present. diff --git a/update-readmes b/update-readmes index 1eb9912b45ef754bba44bbd6f25072433f8940a8..b216396eba0ba13326efb34c45dde210b60a3dd0 100755 --- a/update-readmes +++ b/update-readmes @@ -7,13 +7,13 @@ README_FILES="README README.static-linking MAINTAINERS" -if [ ! -f "common/update-readmes" -o ! -f configure.ac ]; then +if [ ! -f "common/update-readmes" -o ! -f meson_options.txt ]; then echo "Run ./common/update-readmes from the top-level source directory of a GStreamer module"; exit 1; fi -MAJOR_VERSION=`grep '^AC_INIT' configure.ac | sed -e 's/[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1/'` -MINOR_VERSION=`grep '^AC_INIT' configure.ac | sed -e 's/[^0-9]*\([0-9]\)\.\([0-9]*\).*/\2/'` +MAJOR_VERSION=`head -n 5 meson.build | grep -e '^\s*version\s*:' | sed -e "s%^\s*version\s*:\s*'%%" -e "s%',%%" | sed -e 's/[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1/'` +MINOR_VERSION=`head -n 5 meson.build | grep -e '^\s*version\s*:' | sed -e "s%^\s*version\s*:\s*'%%" -e "s%',%%" | sed -e 's/[^0-9]*\([0-9]\)\.\([0-9]*\).*/\2/'` if test x$MAJOR_VERSION = x -o x$MINOR_VERSION = x ; then echo "Failed to extract major/minor version";