25729114 Need to replace https://java.net/projects/solaris-x11 s12_123
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Tue Apr 25 21:47:29 2017 -0700 (2017-04-25)
changeset 170911297414509c
parent 1708 e360d1d26b1d
child 1710 a9aea92d6fb5
25729114 Need to replace https://java.net/projects/solaris-x11
open-src/common/Makefile.options.opensolaris
open-src/doc/xorg-docs/Makefile
open-src/doc/xorg-docs/maintainers.patch
pkg/transforms/common_actions
     1.1 --- a/open-src/common/Makefile.options.opensolaris	Tue Apr 25 14:08:12 2017 -0700
     1.2 +++ b/open-src/common/Makefile.options.opensolaris	Tue Apr 25 21:47:29 2017 -0700
     1.3 @@ -1,6 +1,6 @@
     1.4  # X build options for OpenSolaris sources
     1.5  #
     1.6 -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7 +# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
     1.8  #
     1.9  # Permission is hereby granted, free of charge, to any person obtaining a
    1.10  # copy of this software and associated documentation files (the "Software"),
    1.11 @@ -38,4 +38,4 @@
    1.12  
    1.13  # Xserver configuration options for vendor name & support URL
    1.14  VENDOR_NAME = OpenSolaris, based on X.Org Foundation sources
    1.15 -VENDOR_SUPPORT_URL = http://solaris-x11.java.net/
    1.16 +VENDOR_SUPPORT_URL = https://github.com/oracle/solaris-xorg
     2.1 --- a/open-src/doc/xorg-docs/Makefile	Tue Apr 25 14:08:12 2017 -0700
     2.2 +++ b/open-src/doc/xorg-docs/Makefile	Tue Apr 25 21:47:29 2017 -0700
     2.3 @@ -1,6 +1,6 @@
     2.4  ###############################################################################
     2.5  #
     2.6 -# Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
     2.7 +# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
     2.8  #
     2.9  # Permission is hereby granted, free of charge, to any person obtaining a
    2.10  # copy of this software and associated documentation files (the "Software"),
    2.11 @@ -40,6 +40,7 @@
    2.12  # Patches to apply to source after unpacking, in order
    2.13  SOURCE_PATCHES += upstream-manpages.patch,-p1
    2.14  SOURCE_PATCHES += solaris-manpages.patch,-p1
    2.15 +SOURCE_PATCHES += maintainers.patch,-p1
    2.16  
    2.17  # Man pages to apply distro customizations to
    2.18  # Normal attributes table not added, since these aren't simple interfaces
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/open-src/doc/xorg-docs/maintainers.patch	Tue Apr 25 21:47:29 2017 -0700
     3.3 @@ -0,0 +1,21 @@
     3.4 +commit	2ee2b7f0f0304879214f09d48c43c742894cf82e (patch)
     3.5 +tree	eea23a1c0dfd259897cfe3ae4a20975a9a319f7b
     3.6 +parent	ebc0ba09cb2fe7d4fb1e223e274feec4879d8536 (diff)
     3.7 +Update Solaris URL in MAINTAINERS fileHEADmaster
     3.8 +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
     3.9 +Reviewed-by: Niveditha Rau <niveditha.rau@oracle.com>
    3.10 +Diffstat
    3.11 +-rw-r--r--	MAINTAINERS	2	
    3.12 +		
    3.13 +1 files changed, 1 insertions, 1 deletions
    3.14 +diff --git a/MAINTAINERS b/MAINTAINERS
    3.15 +index e0b2d27..f7871da 100644
    3.16 +--- a/MAINTAINERS
    3.17 ++++ b/MAINTAINERS
    3.18 +@@ -502,7 +502,7 @@ Solaris (x86 & sparc)
    3.19 + P:	Alan Coopersmith
    3.20 + M:	alan.coopersmith@oracle.com
    3.21 + L:	xorg-devel@lists.x.org
    3.22 +-W:	http://wiki.x.org & http://solaris-x11.java.net/
    3.23 ++W:	http://wiki.x.org & https://github.com/oracle/solaris-xorg
    3.24 + S:	Maintained
     4.1 --- a/pkg/transforms/common_actions	Tue Apr 25 14:08:12 2017 -0700
     4.2 +++ b/pkg/transforms/common_actions	Tue Apr 25 21:47:29 2017 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  #
     4.5 -# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
     4.6 +# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
     4.7  #
     4.8  # Permission is hereby granted, free of charge, to any person obtaining a
     4.9  # copy of this software and associated documentation files (the "Software"),
    4.10 @@ -41,9 +41,9 @@
    4.11  #
    4.12  
    4.13  set name=org.opensolaris.consolidation value=X
    4.14 -set name=info.maintainer-url value="http://solaris-x11.java.net/"
    4.15 +set name=info.maintainer-url value="https://github.com/oracle/solaris-xorg"
    4.16  set name=com.oracle.info.consolidation.repository-url \
    4.17 -    value="https://hg.java.net/hg/solaris-x11~x-s12-clone"
    4.18 +    value="https://github.com/oracle/solaris-xorg"
    4.19  
    4.20  #
    4.21  # Indicate that the package was published in a zones aware