Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
a2ps license needs to match
authorNorm Jacobs <Norm.Jacobs@Sun.COM>
Wed, 10 Nov 2010 11:52:54 -0600
changeset 48 1bb7f3eccdd6
parent 47 28ef4b1fcfb1
child 49 13d31a6d756e
a2ps license needs to match
components/a2ps/a2ps.license file | annotate | diff | comparison | revisions
components/a2ps/a2ps.p5m file | annotate | diff | comparison | revisions
make-rules/ips.mk file | annotate | diff | comparison | revisions
transforms/publish-cleanup file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/a2ps/a2ps.license	Wed Nov 10 11:52:54 2010 -0600
@@ -0,0 +1,38 @@
+Oracle elects to use only the GNU Lesser General Public License version
+2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
+where a choice of LGPL/GPL license versions are made available with the
+language indicating that LGPLv2.1/GPLv2 or any later version may be
+used, or where a choice of which version of the LGPL/GPL is applied is
+unspecified.  Unless specifically stated otherwise, where a choice
+exists between another license and either the GPL or the LGPL, Oracle
+chooses the other license.
+-----------------------------------------------------------------------
+
+Copyright (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
+Copyright (c) 1995, 96, 97, 98, 99 Akim Demaille, Miguel Santana
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+YOU MUST OBSERVE ANY AUTHORS' CONDITIONS WITH RESPECT TO
+INDIVIDUAL COMPONENTS PROVIDED WITHIN THIS CODE.  SUPPORT
+FOR THE TECHNOLOGIES AND DOCUMENTATION IS NOT PROVIDED 
+BY SUN MICROSYSTEMS, INC.
+
+THE TECHNOLOGIES AND DOCUMENTATION ARE PROVIDED "AS IS" WITHOUT TECHNICAL 
+SUPPORT OR WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
+PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
+
--- a/components/a2ps/a2ps.p5m	Wed Nov 10 09:07:56 2010 -0800
+++ b/components/a2ps/a2ps.p5m	Wed Nov 10 11:52:54 2010 -0600
@@ -378,7 +378,7 @@
 link path=usr/lib/liba2ps.so target=liba2ps.so.1.0.0
 link path=usr/lib/liba2ps.so.1 target=liba2ps.so.1.0.0
 
-license COPYING license="GPLv2"
+license a2ps.license license="GPLv2"
 
 legacy arch=$(ARCH) category=system \
 	name="a2ps - GNU Any to PostScript filter (root)" \
--- a/make-rules/ips.mk	Wed Nov 10 09:07:56 2010 -0800
+++ b/make-rules/ips.mk	Wed Nov 10 11:52:54 2010 -0600
@@ -147,7 +147,7 @@
 # published
 $(MANIFEST_BASE)-%.published:	$(MANIFEST_BASE)-%.linted
 	$(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \
-		-d $(PROTO_DIR) -d . $<
+		-d $(PROTO_DIR) -d $(@D) -d . $<
 	$(PKGFMT) <$< >$@
 
 $(COMPONENT_SRC)/.published:	$(PUBLISHED)
--- a/transforms/publish-cleanup	Wed Nov 10 09:07:56 2010 -0800
+++ b/transforms/publish-cleanup	Wed Nov 10 11:52:54 2010 -0600
@@ -31,5 +31,5 @@
 <transform set name=info.classification value=".+:\s*$" -> drop>
 
 # drop the license actions from the manifests, we aren't going to compare them
-<transform license -> drop>
+#<transform license -> drop>
upstream/oracle/userland-gate