A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all

EXCEPTIONS-CLIENT from all the places.
This commit is contained in:
Alexander Nozdrin 2010-11-24 12:53:39 +03:00
parent e9cb14694e
commit 85f855e0ed
14 changed files with 19 additions and 25 deletions

View File

@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
README COPYING EXCEPTIONS-CLIENT CMakeLists.txt README COPYING CMakeLists.txt
SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
@readline_topdir@ sql-common scripts \ @readline_topdir@ sql-common scripts \

View File

@ -5,8 +5,7 @@
# published by the Free Software Foundation. # published by the Free Software Foundation.
# #
# There are special exceptions to the terms and conditions of the GPL as it # There are special exceptions to the terms and conditions of the GPL as it
# is applied to this software. View the full text of the exception in file # is applied to this software.
# EXCEPTIONS-CLIENT in the directory of this software distribution.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@ -5,8 +5,7 @@
# published by the Free Software Foundation. # published by the Free Software Foundation.
# #
# There are special exceptions to the terms and conditions of the GPL as it # There are special exceptions to the terms and conditions of the GPL as it
# is applied to this software. View the full text of the exception in file # is applied to this software.
# EXCEPTIONS-CLIENT in the directory of this software distribution.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@ -5,8 +5,7 @@
# published by the Free Software Foundation. # published by the Free Software Foundation.
# #
# There are special exceptions to the terms and conditions of the GPL as it # There are special exceptions to the terms and conditions of the GPL as it
# is applied to this software. View the full text of the exception in file # is applied to this software.
# EXCEPTIONS-CLIENT in the directory of this software distribution.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@ -211,7 +211,7 @@ copyfileto()
copyfileto $BASE/docs ChangeLog Docs/mysql.info copyfileto $BASE/docs ChangeLog Docs/mysql.info
copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \ copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \
EXCEPTIONS-CLIENT LICENSE.mysql LICENSE.mysql
# Non platform-specific bin dir files: # Non platform-specific bin dir files:
BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \

View File

@ -200,8 +200,8 @@ cp ChangeLog $DESTDIR/Docs/ || /bin/true
cp support-files/my-*.ini $DESTDIR/ cp support-files/my-*.ini $DESTDIR/
if [ -f COPYING ] ; then if [ -f COPYING ] ; then
cp COPYING EXCEPTIONS-CLIENT $DESTDIR/ cp COPYING $DESTDIR/
cp COPYING $DESTDIR/Docs/ cp COPYING $DESTDIR/Docs/
fi fi
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------

View File

@ -312,7 +312,7 @@ touch $BASE/innobase/ib_config.h
# #
cd $SOURCE cd $SOURCE
for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\ for i in COPYING ChangeLog README \
INSTALL-SOURCE INSTALL-WIN \ INSTALL-SOURCE INSTALL-WIN \
INSTALL-WIN-SOURCE \ INSTALL-WIN-SOURCE \
Docs/INSTALL-BINARY Docs/manual.chm Docs/INSTALL-BINARY Docs/manual.chm
@ -376,7 +376,7 @@ fi
# Search the tree for plain text files and adapt the line end marker # Search the tree for plain text files and adapt the line end marker
# #
find $BASE \( -name "*.cnf" -o -name "*.ini" \ find $BASE \( -name "*.cnf" -o -name "*.ini" \
-o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \ -o -name COPYING -o -name ChangeLog \
-o -name "INSTALL*" -o -name LICENSE -o -name "README*" \ -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \
-o -name "*.dsp" -o -name "*.dsw" \ -o -name "*.dsp" -o -name "*.dsw" \
-o -name "*.vcproj" -o -name "*.sln" \) -type f -print \ -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \

View File

@ -837,7 +837,6 @@ fi
%files devel %files devel
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%doc EXCEPTIONS-CLIENT
%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1* %doc %attr(644, root, man) %{_mandir}/man1/comp_err.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
%attr(755, root, root) %{_bindir}/comp_err %attr(755, root, root) %{_bindir}/comp_err
@ -892,6 +891,10 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Wed Nov 24 2010 Alexander Nozdrin <alexander.nozdrin@oracle.com>
- EXCEPTIONS-CLIENT has been deleted, remove it from here too.
* Mon Feb 01 2010 Joerg Bruehe <joerg.bruehe@sun.com> * Mon Feb 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>
- Formatting changes: - Formatting changes: