Merge remote-tracking branch 'origin/master' into obsd

4 files changed, 25 insertions, 32 deletions

diff --git a/Makefile.am b/Makefile.am
index 7b70eb4..409aa55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,4 +40,4 @@ ChangeLog:
 
 dist-hook: ChangeLog INSTALL
 
-
+EXTRA_DIST = README.md
diff --git a/README b/README
deleted file mode 100644
index a1bb465..0000000
--- a/README
+++ /dev/null
@@ -1,29 +0,0 @@
-xdriinfo - query configuration information of X11 DRI drivers
-
-More information about the Direct Rendering Infrastructure project
-can be found at:
-	http://dri.freedesktop.org/
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/app/xdriinfo
-
-        http://cgit.freedesktop.org/xorg/app/xdriinfo
-
-For patch submission instructions, see:
-
-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
-
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..71e9882
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+xdriinfo - query configuration information of X11 DRI drivers
+-------------------------------------------------------------
+
+More information about the Direct Rendering Infrastructure project
+can be found at:
+  https://dri.freedesktop.org/
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+  https://lists.x.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+  https://gitlab.freedesktop.org/xorg/app/xdriinfo
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
diff --git a/configure.ac b/configure.ac
index aaf2102..e0070d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xdriinfo], [1.0.5],
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xdriinfo])
+AC_INIT([xdriinfo], [1.0.6],
+        [https://gitlab.freedesktop.org/xorg/app/xdriinfo/issues], [xdriinfo])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])