Skip to content

Commit

Permalink
Remove more old und untouched documents
Browse files Browse the repository at this point in the history
 - upnp/LICENSE and LICENSE are the same files, put the content into
   COPYING (with whitespace stripped) which is automatically included in
   the distribution.
 - THANKS is also automatically distributed and doesn't need explicit
   mentioning.
 - README doesn't exist since commit aa343fa.
 - TODO doesn't exist since 0629cfb.
 - NEWS is old and so removed

This allows to drop doc_DATA completely. A side effect is that the
license and thanks files are not installed any more. But given that
installing the documentation was broken for quite some time already,
this is probably fine and nobody will notice it.
  • Loading branch information
ukleinek committed Mar 17, 2018
1 parent 8abbd63 commit d3a0400
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 146 deletions.
26 changes: 26 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Copyright (c) 2000-2003 Intel Corporation
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither name of Intel Corporation nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 changes: 0 additions & 27 deletions LICENSE

This file was deleted.

5 changes: 0 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ SUBDIRS = \
EXTRA_DIST = \
Doxyfile \
libupnp.pc.in \
LICENSE \
THANKS \
libupnp.spec \
build/msvc/inttypes.h \
build/msvc/stdint.h
Expand All @@ -27,9 +25,6 @@ EXTRA_DIST = \
pkgconfigexecdir = $(libdir)/pkgconfig
pkgconfigexec_DATA = libupnp.pc


$(pkgconfigexec_DATA): config.status

doc_DATA = LICENSE README NEWS TODO THANKS

CLEANFILES = IUpnpErrFile.txt IUpnpInfoFile.txt
84 changes: 0 additions & 84 deletions NEWS

This file was deleted.

27 changes: 0 additions & 27 deletions upnp/LICENSE

This file was deleted.

3 changes: 0 additions & 3 deletions upnp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,9 @@ test_url_SOURCES = test/test_url.c


EXTRA_DIST = \
LICENSE \
m4/libupnp.m4 \
src/win_dll.c


CLEANFILES = \
IUpnpErrFile.txt \
IUpnpInfoFile.txt

0 comments on commit d3a0400

Please sign in to comment.