[vidalia-svn] r2363: Include the right license files in the binary packages. (in vidalia/trunk: . pkg pkg/osx pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-02-29 23:38:53 -0500 (Fri, 29 Feb 2008)
New Revision: 2363

Modified:
   vidalia/trunk/
   vidalia/trunk/pkg/osx/buildmpkg.sh.in
   vidalia/trunk/pkg/package.sh
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
   vidalia/trunk/pkg/win32/vidalia.nsi.in
Log:
 r147@lysithea:  edmanm | 2008-02-29 23:38:45 -0500
 Include the right license files in the binary packages.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r147] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/pkg/osx/buildmpkg.sh.in
===================================================================
--- vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-02-29 04:30:11 UTC (rev 2362)
+++ vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-03-01 04:38:53 UTC (rev 2363)
@@ -251,7 +251,9 @@
 cp $PRIVOXY_RESDIR/ReadMe.txt   $MPKG_DIR/Privoxy\ ReadMe.txt
 cp $TOR_DIR/LICENSE             $MPKG_DIR/Tor\ License.txt
 cp $VID_DIR/LICENSE             $MPKG_DIR/Vidalia\ License.txt
-cp $VID_DIR/COPYING             $MPKG_DIR/GNU\ GPL.txt
+cp $VID_DIR/LICENSE-GPLV2       $MPKG_DIR/GNU\ GPLv2.txt
+cp $VID_DIR/LICENSE-GPLV3       $MPKG_DIR/GNU\ GPLv3.txt
+cp $VID_DIR/LICENSE-OPENSSL     $MPKG_DIR/OpenSSL\ License.txt
 cp $TORBUTTON_LIC_PATH          $MPKG_DIR/Torbutton-LICENSE.txt
 
 

Modified: vidalia/trunk/pkg/package.sh
===================================================================
--- vidalia/trunk/pkg/package.sh	2008-02-29 04:30:11 UTC (rev 2362)
+++ vidalia/trunk/pkg/package.sh	2008-03-01 04:38:53 UTC (rev 2363)
@@ -50,7 +50,8 @@
 "osx")
   cp -R ../src/vidalia/Vidalia.app ../
   srcdir="../"
-  srcfiles="Vidalia.app README AUTHORS LICENSE COPYING CHANGELOG"
+  srcfiles="Vidalia.app README AUTHORS CHANGELOG"
+  srcfiles="$srcfiles LICENSE LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL"
   osx/builddmg.sh "$srcdir" "$srcfiles"
   ;;
 

Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-02-29 04:30:11 UTC (rev 2362)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-03-01 04:38:53 UTC (rev 2363)
@@ -161,7 +161,9 @@
       File "Vidalia\${VIDALIA_APPVERSION}\README"
       File "Vidalia\${VIDALIA_APPVERSION}\CHANGELOG"
       File "Vidalia\${VIDALIA_APPVERSION}\LICENSE"
-      File "Vidalia\${VIDALIA_APPVERSION}\COPYING"
+      File "Vidalia\${VIDALIA_APPVERSION}\LICENSE-GPLV2"
+      File "Vidalia\${VIDALIA_APPVERSION}\LICENSE-GPLV3"
+      File "Vidalia\${VIDALIA_APPVERSION}\LICENSE-OPENSSL"
       File "Vidalia\${VIDALIA_APPVERSION}\AUTHORS"
       
       ; Include a prebuilt GeoIP cache

Modified: vidalia/trunk/pkg/win32/vidalia.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-02-29 04:30:11 UTC (rev 2362)
+++ vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-03-01 04:38:53 UTC (rev 2363)
@@ -143,7 +143,9 @@
   File "@Vidalia_SOURCE_DIR@\AUTHORS"
   File "@Vidalia_SOURCE_DIR@\CHANGELOG"
   File "@Vidalia_SOURCE_DIR@\LICENSE"
-  File "@Vidalia_SOURCE_DIR@\COPYING"
+  File "@Vidalia_SOURCE_DIR@\LICENSE-GPLV2"
+  File "@Vidalia_SOURCE_DIR@\LICENSE-GPLV3"
+  File "@Vidalia_SOURCE_DIR@\LICENSE-OPENSSL"
   File "@Vidalia_SOURCE_DIR@\README"
 
   ; Include a prebuilt GeoIP cache