You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ben Reser <be...@reser.org> on 2004/03/01 05:41:51 UTC
Re: [PATCH] License required acknowledgement
On Sun, Feb 29, 2004 at 02:24:45AM -0800, Ben Reser wrote:
> Oops forgot to update the tests too. I'm going to bed. But if someone
> else doesn't get to this before me I'll do it when I get up.
Here's a new version with the tests fixed.
[[[
Comply with our own license per clause 3.
* subversion/libsvn_subr/opt.c
(print_version_info): Add software developed by CollabNet line.
* subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout
Update tests for new --version output.
]]]
--
Ben Reser <be...@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
Re: [PATCH] License required acknowledgement
Posted by "Daniel L. Rall" <dl...@finemaltcoding.com>.
Doesn't look like a hard requirement, but I certainly wouldn't mind it.
http://subversion.tigris.org/license-1.html
3. The end-user documentation included with the redistribution, if
any, must include the following acknowledgment: "This product includes
software developed by CollabNet (http://www.Collab.Net/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
Ben Reser wrote:
> On Sun, Feb 29, 2004 at 02:24:45AM -0800, Ben Reser wrote:
>
>>Oops forgot to update the tests too. I'm going to bed. But if someone
>>else doesn't get to this before me I'll do it when I get up.
>
>
> Here's a new version with the tests fixed.
>
> [[[
> Comply with our own license per clause 3.
>
> * subversion/libsvn_subr/opt.c
> (print_version_info): Add software developed by CollabNet line.
>
> * subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout
> Update tests for new --version output.
>
> ]]]
>
>
>
> ------------------------------------------------------------------------
>
> Index: subversion/libsvn_subr/opt.c
> ===================================================================
> --- subversion/libsvn_subr/opt.c (revision 8870)
> +++ subversion/libsvn_subr/opt.c (working copy)
> @@ -670,7 +670,9 @@
> {
> static const char info[] =
> "Copyright (C) 2000-2004 CollabNet.\n"
> - "Subversion is open source software, see http://subversion.tigris.org/\n";
> + "Subversion is open source software, see http://subversion.tigris.org/\n"
> + "This product includes software developed by CollabNet "
> + "(http://www.Collab.Net/).\n";
>
> if (quiet)
> {
> Index: subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout
> ===================================================================
> --- subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout (revision 8870)
> +++ subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout (working copy)
> @@ -3,6 +3,7 @@
>
> Copyright (C) 2000-2003 CollabNet.
> Subversion is open source software, see http://subversion.tigris.org/
> +This product includes software developed by CollabNet (http://www.Collab.Net/).
>
> The following repository access (RA) modules are available:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] License required acknowledgement
Posted by kf...@collab.net.
Julian Foad <ju...@btopenworld.com> writes:
> > Any comments on this change? The issue has now been brought up on
> > debian-legal. It'd be nice if we could put this in 1.0.1 to simply make
> > the problem go away...
>
> It looks good to me: certainly much better to have it than not to
> have it. Go ahead and commit it to the trunk and mention it in the
> branch STATUS file as a candidate for 1.0.1.
+1, and thanks, Ben.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] License required acknowledgement
Posted by Julian Foad <ju...@btopenworld.com>.
Ben Reser wrote:
> On Sun, Feb 29, 2004 at 09:41:51PM -0800, Ben Reser wrote:
>
>>On Sun, Feb 29, 2004 at 02:24:45AM -0800, Ben Reser wrote:
>>
>>[[[
>>Comply with our own license per clause 3.
>>
>>* subversion/libsvn_subr/opt.c
>> (print_version_info): Add software developed by CollabNet line.
<picky> Add "software developed by CollabNet" line.
</picky>
>>* subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout
>> Update tests for new --version output.
>>
>>]]]
>
> Any comments on this change? The issue has now been brought up on
> debian-legal. It'd be nice if we could put this in 1.0.1 to simply make
> the problem go away...
It looks good to me: certainly much better to have it than not to have it. Go ahead and commit it to the trunk and mention it in the branch STATUS file as a candidate for 1.0.1.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] License required acknowledgement
Posted by Ben Reser <be...@reser.org>.
On Sun, Feb 29, 2004 at 09:41:51PM -0800, Ben Reser wrote:
> On Sun, Feb 29, 2004 at 02:24:45AM -0800, Ben Reser wrote:
> > Oops forgot to update the tests too. I'm going to bed. But if someone
> > else doesn't get to this before me I'll do it when I get up.
>
> Here's a new version with the tests fixed.
>
> [[[
> Comply with our own license per clause 3.
>
> * subversion/libsvn_subr/opt.c
> (print_version_info): Add software developed by CollabNet line.
>
> * subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout
> Update tests for new --version output.
>
> ]]]
Any comments on this change? The issue has now been brought up on
debian-legal. It'd be nice if we could put this in 1.0.1 to simply make
the problem go away...
--
Ben Reser <be...@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org