From 9a746ad48591a52fb68899de82260f1f049f2eb3 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 24 May 2011 17:33:06 +0000 Subject: [PATCH] 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 --- release/libjpeg-turbo.nsi.in | 4 ---- release/libjpeg-turbo.spec.in | 2 +- release/makecygwinpkg.in | 2 -- release/makedpkg.in | 2 -- release/makemacpkg.in | 2 -- release/makesunpkg.in | 4 +--- 6 files changed, 2 insertions(+), 14 deletions(-) diff --git a/release/libjpeg-turbo.nsi.in b/release/libjpeg-turbo.nsi.in index 576e668..3e191d7 100755 --- 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 eea3bdc..03d63a0 100644 --- 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 51d5852..2dbd650 100755 --- 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 2a0539a..0c83b2a 100644 --- 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 f9e8f84..b80ed6c 100644 --- 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 2745d15..77177cf 100644 --- 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 <