Remove wxWindows license files from packages

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@640 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/release/libjpeg-turbo.nsi.in b/release/libjpeg-turbo.nsi.in
index 576e66850d084a1d3a05b8b04bdf35e8b25fce8e..3e191d7cc8838e3bad83ba6917649b5a0f7d3b4d 100755 (executable)
--- a/release/libjpeg-turbo.nsi.in
+++ b/release/libjpeg-turbo.nsi.in
@@ -77,8 +77,6 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)"
        File "@CMAKE_SOURCE_DIR@\README"
        File "@CMAKE_SOURCE_DIR@\README-turbo.txt"
        File "@CMAKE_SOURCE_DIR@\libjpeg.txt"
-       File "@CMAKE_SOURCE_DIR@\LGPL.txt"
-       File "@CMAKE_SOURCE_DIR@\LICENSE.txt"
        File "@CMAKE_SOURCE_DIR@\usage.txt"
 
        WriteRegStr HKLM "SOFTWARE\@INST_DIR@ @VERSION@" "Install_Dir" "$INSTDIR"
@@ -135,8 +133,6 @@ Section "Uninstall"
        Delete $INSTDIR\doc\README
        Delete $INSTDIR\doc\README-turbo.txt
        Delete $INSTDIR\doc\libjpeg.txt
-       Delete $INSTDIR\doc\LGPL.txt
-       Delete $INSTDIR\doc\LICENSE.txt
        Delete $INSTDIR\doc\usage.txt
 
        RMDir "$INSTDIR\include"

diff --git a/release/libjpeg-turbo.spec.in b/release/libjpeg-turbo.spec.in
index eea3bdc37db0d410e7addaa7fd8d1c0f9f550b07..03d63a0e50f068fe3601eedec97fb4c234583f2b 100644 (file)
--- a/release/libjpeg-turbo.spec.in
+++ b/release/libjpeg-turbo.spec.in
@@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc %{_srcdir}/README-turbo.txt %{_srcdir}/README %{_srcdir}/libjpeg.txt %{_srcdir}/usage.txt %{_srcdir}/LICENSE.txt %{_srcdir}/LGPL.txt
+%doc %{_srcdir}/README-turbo.txt %{_srcdir}/README %{_srcdir}/libjpeg.txt %{_srcdir}/usage.txt
 %dir /opt/%{name}
 %dir /opt/%{name}/bin
 /opt/%{name}/bin/cjpeg

diff --git a/release/makecygwinpkg.in b/release/makecygwinpkg.in
index 51d585247440fa4f6c161903ab8859a3c5094288..2dbd650c7ba0a1857b877ed0bc2a6c5134acc3f5 100755 (executable)
--- a/release/makecygwinpkg.in
+++ b/release/makecygwinpkg.in
@@ -31,8 +31,6 @@ install -m 644 $SRCDIR/README-turbo.txt $DOCDIR
 install -m 644 $SRCDIR/README $DOCDIR
 install -m 644 $SRCDIR/libjpeg.txt $DOCDIR
 install -m 644 $SRCDIR/usage.txt $DOCDIR
-install -m 644 $SRCDIR/LICENSE.txt $DOCDIR
-install -m 644 $SRCDIR/LGPL.txt $DOCDIR
 ln -fs lib $TMPDIR/pkg/opt/$PACKAGE_NAME/lib32
 cd $TMPDIR/pkg
 tar cfj ../$PACKAGE_NAME-$VERSION-cygwin.tar.bz2 *

diff --git a/release/makedpkg.in b/release/makedpkg.in
index 2a0539ac6b0691bf1c0a40e9aa57ac73be6edf2e..0c83b2a49e87ca40d6d5e135bdad27487fc1fc15 100644 (file)
--- a/release/makedpkg.in
+++ b/release/makedpkg.in
@@ -61,8 +61,6 @@ makedeb()
                mv $TMPDIR/opt/$DIRNAME/include/turbojpeg.h $TMPDIR/usr/include
                ln -fs /usr/include/turbojpeg.h $TMPDIR/opt/$DIRNAME/include/
                mkdir -p $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
-               install -m 644 $SRCDIR/LICENSE.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
-               install -m 644 $SRCDIR/LGPL.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
                install -m 644 $SRCDIR/README-turbo.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
                install -m 644 $SRCDIR/README $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
                install -m 644 $SRCDIR/libjpeg.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION

diff --git a/release/makemacpkg.in b/release/makemacpkg.in
index f9e8f848d8d8866dfbfa0a6d2496471de20c67c3..b80ed6ce90518bbb1c2d3c5a1bf62de0df1a2fef 100644 (file)
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -142,8 +142,6 @@ cp pkgscripts/Description.plist $TMPDIR/pkg/
 cp pkgscripts/Info.plist $TMPDIR/pkg/
 install -m 755 pkgscripts/uninstall $PKGROOT/opt/$PACKAGE_NAME/bin/
 
-install -m 644 $SRCDIR/LICENSE.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/LICENSE.txt 
-install -m 644 $SRCDIR/LGPL.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/LGPL.txt 
 install -m 644 $SRCDIR/README-turbo.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/README-turbo.txt 
 install -m 644 $SRCDIR/README $PKGROOT/Library/Documentation/$PACKAGE_NAME/README 
 install -m 644 $SRCDIR/libjpeg.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/libjpeg.txt 

diff --git a/release/makesunpkg.in b/release/makesunpkg.in
index 2745d15028f07f704ba14aa86c8358861b684f62..77177cf61ae56ba999a4127fba472fb6cb054088 100644 (file)
--- a/release/makesunpkg.in
+++ b/release/makesunpkg.in
@@ -68,7 +68,7 @@ fi
 make install DESTDIR=$TMPDIR libdir=/opt/$PACKAGE_NAME/$__LIB mandir=/opt/$PACKAGE_NAME/man AM_MAKEFLAGS="libdir=/opt/$PACKAGE_NAME/$__LIB mandir=/opt/$PACKAGE_NAME/man"
 rm -f $TMPDIR/opt/$PACKAGE_NAME/$__LIB/*.la
 mkdir -p $TMPDIR/opt/$PACKAGE_NAME/doc
-cp $SRCDIR/LICENSE.txt $SRCDIR/LGPL.txt $SRCDIR/README-turbo.txt $SRCDIR/README $SRCDIR/libjpeg.txt $SRCDIR/usage.txt $TMPDIR/opt/$PACKAGE_NAME/doc
+cp $SRCDIR/README-turbo.txt $SRCDIR/README $SRCDIR/libjpeg.txt $SRCDIR/usage.txt $TMPDIR/opt/$PACKAGE_NAME/doc
 chmod 644 $TMPDIR/opt/$PACKAGE_NAME/doc/*
 
 cat >$TMPDIR/proto <<EOF
@@ -122,9 +122,7 @@ f none $PACKAGE_NAME/include/jmorecfg.h 0644 root bin
 f none $PACKAGE_NAME/include/jpeglib.h 0644 root bin
 f none $PACKAGE_NAME/include/turbojpeg.h 0644 root bin
 d none $PACKAGE_NAME/doc 0755 root bin
-f none $PACKAGE_NAME/doc/LGPL.txt 0644 root bin
 f none $PACKAGE_NAME/doc/libjpeg.txt 0644 root bin
-f none $PACKAGE_NAME/doc/LICENSE.txt 0644 root bin
 f none $PACKAGE_NAME/doc/README 0644 root bin
 f none $PACKAGE_NAME/doc/README-turbo.txt 0644 root bin
 f none $PACKAGE_NAME/doc/usage.txt 0644 root bin