xorgproto: Branch 'master' - 3 commits

[GitLab Mirror]

 specs/Makefile.am             |    6 +++---
 specs/SIAddresses/Makefile.am |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c62e8203402cafafa5ba0357b6d1c019156c9f36
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Apr 6 10:52:07 2020 -0400

    xorgproto 2020.1
    
    Fixes: xorgproto#28
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/configure.ac b/configure.ac
index 5b73036..5c7e6c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
-AC_INIT([xorgproto], [2019.2],
+AC_INIT([xorgproto], [2020.1],
         [https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
diff --git a/meson.build b/meson.build
index eadc2fd..6254dce 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-project('xorgproto', 'c', license : 'MIT', version : '2019.2')
+project('xorgproto', 'c', license : 'MIT', version : '2020.1')
 pkg = import('pkgconfig')
 cc = meson.get_compiler('c')
 sed = find_program('sed')
commit 4e2faa0093d590d68e88fb4103dbc2a6770074a4
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Apr 14 11:20:29 2020 -0400

    automake: Fix install and dist for the new markdown docs

diff --git a/specs/Makefile.am b/specs/Makefile.am
index f3d77ba..b75c09e 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = \
     printproto/xp_protoIX.doc \
     printproto/xp_protoTOC.doc \
     printproto/xp_proto_cov.mif \
-    SIAddresses/hostname.txt \
-    SIAddresses/IPv6.txt \
-    SIAddresses/localuser.txt \
+    SIAddresses/hostname.md \
+    SIAddresses/IPv6.md \
+    SIAddresses/localuser.md \
     SIAddresses/README
diff --git a/specs/SIAddresses/Makefile.am b/specs/SIAddresses/Makefile.am
index 662776a..af8f5c8 100644
--- a/specs/SIAddresses/Makefile.am
+++ b/specs/SIAddresses/Makefile.am
@@ -1,6 +1,6 @@
 dist_noinst_DATA = 	\
-	hostname.txt	\
-	IPv6.txt	\
-	localuser.txt	\
+	hostname.md	\
+	IPv6.md		\
+	localuser.md	\
 	README
 
commit 7c22419acc2b9f6432181fd57e0634cd4c9e495b
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Apr 14 11:19:17 2020 -0400

    Revert "xorgproto 2020.1"
    
    Fails distcheck.
    
    This reverts commit 032a3a16cd6c283fc596c6410c59665cfa1c6cab.

diff --git a/configure.ac b/configure.ac
index 5c7e6c7..5b73036 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
-AC_INIT([xorgproto], [2020.1],
+AC_INIT([xorgproto], [2019.2],
         [https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
diff --git a/meson.build b/meson.build
index 6254dce..eadc2fd 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-project('xorgproto', 'c', license : 'MIT', version : '2020.1')
+project('xorgproto', 'c', license : 'MIT', version : '2019.2')
 pkg = import('pkgconfig')
 cc = meson.get_compiler('c')
 sed = find_program('sed')