7062962 X pkg attribute name changes underscored by desire for consistency
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 12 Jul 2011 17:03:49 -0700
changeset 1162 9045745b7172
parent 1161 92cb0ee2804d
child 1163 46339fe9f136
7062962 X pkg attribute name changes underscored by desire for consistency
open-src/common/Makefile.inc
pkg/transforms/branding_Oracle
pkg/transforms/common_actions
pkg/transforms/versions.tmpl
--- a/open-src/common/Makefile.inc	Tue Jul 12 16:44:52 2011 -0700
+++ b/open-src/common/Makefile.inc	Tue Jul 12 17:03:49 2011 -0700
@@ -807,17 +807,17 @@
 	-rm -f $@
 	@if [[ "$(SOURCE_TARBALL_NAME)" != "NONE" ]] ; then \
 	    $(START_CMD_ECHO) ; \
-	    print 'set name=info.source_url value="$(SOURCE_URL)"' >> $@ ; \
+	    print 'set name=info.source-url value="$(SOURCE_URL)"' >> $@ ; \
 	fi
 	@if [[ "$(UPSTREAM)" != "NONE" ]] ; then \
 	    $(START_CMD_ECHO) ; \
 	    print 'set name=info.upstream value="$(UPSTREAM)"' >> $@ ; \
-	    print 'set name=info.upstream_url value="$(UPSTREAM_URL)"' >> $@ ; \
+	    print 'set name=info.upstream-url value="$(UPSTREAM_URL)"' >> $@ ; \
 	fi
 	@if [[ ! -z "$(MODULE_ARC_CASES)" ]] ; then \
 	    $(START_CMD_ECHO) ; \
-	    print 'set name=opensolaris.arc_url' \
-		'$(MODULE_ARC_CASES:%=value="$(ARC_URL_BASE)%/")' >> $@ ;  \
+	    print 'set name=org.opensolaris.arc-caseid' \
+		'$(MODULE_ARC_CASES:%=value="%")' >> $@ ;  \
 	fi
 	@if [[ ! -z "$(MODULE_PKGCLASS)" ]] ; then \
 	    $(START_CMD_ECHO) ; \
--- a/pkg/transforms/branding_Oracle	Tue Jul 12 16:44:52 2011 -0700
+++ b/pkg/transforms/branding_Oracle	Tue Jul 12 17:03:49 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -34,5 +34,5 @@
 #
 # Add distro maintainer URL in addition to OpenSolaris community
 #
-<transform set name=info.maintainer_url -> \
+<transform set name=info.maintainer-url -> \
     add value "http://www.oracle.com/solaris/">
--- a/pkg/transforms/common_actions	Tue Jul 12 16:44:52 2011 -0700
+++ b/pkg/transforms/common_actions	Tue Jul 12 17:03:49 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -41,12 +41,10 @@
 #
 
 set name=org.opensolaris.consolidation value=X
-set name=info.maintainer_url \
+set name=info.maintainer-url \
 	value="http://hub.opensolaris.org/bin/view/Community+Group+x_win/"
-set name=info.repository_url \
+set name=info.repository-url \
 	value="ssh://[email protected]/hg/x-cons/xnv-clone"
-set name=info.defect_tracker.url \
-	value="http://bugs.opensolaris.org/"
 
 #
 # Indicate that the package was published in a zones aware
--- a/pkg/transforms/versions.tmpl	Tue Jul 12 16:44:52 2011 -0700
+++ b/pkg/transforms/versions.tmpl	Tue Jul 12 17:03:49 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -32,4 +32,4 @@
 #
 # Show hg id of the repo version this package was built from
 #
-set name=info.repository_changeset value="_HG_ID_"
+set name=info.repository-changeset value="_HG_ID_"