Skip to content

Commit 70acad5

Browse files
Renaming file COPYING to LICENSE and appending the disclaimer from src/common/convert_UTF.h to LICENSE.
[email protected] Review URL: https://breakpad.appspot.com/1174003 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1285 4c0a9323-5329-0410-9bdc-e9ce6186880e
1 parent 3e76b4a commit 70acad5

File tree

3 files changed

+40
-12
lines changed

3 files changed

+40
-12
lines changed

COPYING renamed to LICENSE

+22
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,25 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
2626
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2727
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2828
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
30+
--------------------------------------------------------------------
31+
32+
Copyright 2001-2004 Unicode, Inc.
33+
34+
Disclaimer
35+
36+
This source code is provided as is by Unicode, Inc. No claims are
37+
made as to fitness for any particular purpose. No warranties of any
38+
kind are expressed or implied. The recipient agrees to determine
39+
applicability of information provided. If this file has been
40+
purchased on magnetic or optical media from Unicode, Inc., the
41+
sole remedy for any claim will be exchange of defective media
42+
within 90 days of receipt.
43+
44+
Limitations on Rights to Redistribute This Code
45+
46+
Unicode, Inc. hereby grants the right to freely use the information
47+
supplied in this file in the creation of products supporting the
48+
Unicode Standard, and to make copies of this file in any form
49+
for internal or external distribution as long as this notice
50+
remains attached.

Makefile.am

+4-1
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,17 @@ endif
6464
# Specify include paths for ac macros
6565
ACLOCAL_AMFLAGS = -I m4
6666

67+
# License file is called LICENSE not COPYING
68+
AUTOMAKE_OPTIONS = foreign
69+
6770
## Documentation
6871
docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
6972

7073
dist_doc_DATA = \
7174
AUTHORS \
72-
COPYING \
7375
ChangeLog \
7476
INSTALL \
77+
LICENSE \
7578
NEWS \
7679
README
7780

Makefile.in

+14-11
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,14 @@ check_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
204204

205205
noinst_PROGRAMS =
206206
subdir = .
207-
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
208-
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
207+
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
209208
$(top_srcdir)/configure $(am__configure_deps) \
210209
$(top_srcdir)/src/config.h.in $(top_srcdir)/autotools/depcomp \
211-
$(dist_doc_DATA) $(top_srcdir)/autotools/test-driver COPYING \
212-
autotools/compile autotools/config.guess autotools/config.sub \
213-
autotools/depcomp autotools/install-sh autotools/missing \
214-
autotools/ltmain.sh $(top_srcdir)/autotools/compile \
210+
$(dist_doc_DATA) $(top_srcdir)/autotools/test-driver AUTHORS \
211+
ChangeLog INSTALL NEWS README autotools/compile \
212+
autotools/config.guess autotools/config.sub autotools/depcomp \
213+
autotools/install-sh autotools/missing autotools/ltmain.sh \
214+
$(top_srcdir)/autotools/compile \
215215
$(top_srcdir)/autotools/config.guess \
216216
$(top_srcdir)/autotools/config.sub \
217217
$(top_srcdir)/autotools/install-sh \
@@ -1748,11 +1748,14 @@ AM_CXXFLAGS = $(am__append_1) $(am__append_2) $(am__append_4)
17481748

17491749
# Specify include paths for ac macros
17501750
ACLOCAL_AMFLAGS = -I m4
1751+
1752+
# License file is called LICENSE not COPYING
1753+
AUTOMAKE_OPTIONS = foreign
17511754
dist_doc_DATA = \
17521755
AUTHORS \
1753-
COPYING \
17541756
ChangeLog \
17551757
INSTALL \
1758+
LICENSE \
17561759
NEWS \
17571760
README
17581761

@@ -2809,15 +2812,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
28092812
@for dep in $?; do \
28102813
case '$(am__configure_deps)' in \
28112814
*$$dep*) \
2812-
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
2813-
$(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
2815+
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
2816+
$(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
28142817
&& exit 0; \
28152818
exit 1;; \
28162819
esac; \
28172820
done; \
2818-
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
2821+
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
28192822
$(am__cd) $(top_srcdir) && \
2820-
$(AUTOMAKE) --gnu Makefile
2823+
$(AUTOMAKE) --foreign Makefile
28212824
.PRECIOUS: Makefile
28222825
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
28232826
@case '$?' in \

0 commit comments

Comments
 (0)