[vidalia-svn] r1881: License the installers the same way we do the rest of Vidali (in trunk: . pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-08-26 01:19:03 -0400 (Sun, 26 Aug 2007)
New Revision: 1881

Removed:
   trunk/pkg/win32/BUNDLE_LICENSE
Modified:
   trunk/
   trunk/pkg/win32/vidalia-bundle.nsi
   trunk/pkg/win32/vidalia.nsi
Log:
 r2079@adrastea:  edmanm | 2007-08-26 01:18:56 -0400
 License the installers the same way we do the rest of Vidalia, drop the big
 BUNDLE_LICENSE file since we include each component's license individually
 anyway, include a Torbutton license in the Torbutton directory, and set the
 svn:keywords property on the .nsi files.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r2079] on 54b3572a-7227-0410-958f-53ecd705b71a

Deleted: trunk/pkg/win32/BUNDLE_LICENSE

Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi	2007-08-26 04:14:26 UTC (rev 1880)
+++ trunk/pkg/win32/vidalia-bundle.nsi	2007-08-26 05:19:03 UTC (rev 1881)
@@ -1,9 +1,25 @@
-;---------------------------------
-; $Id: $
-; 
-; Vidalia/Tor/Privoxy Bundle Installer
-; See BUNDLE_LICENSE for licensing information
-;---------------------------------
+;--------------------------------------------------------------------
+;  $Id: $
+;
+;  Vidalia is distributed under the following license:
+;
+;  Copyright (C) 2006-2007,  Matt Edman, Justin Hipple
+;
+;  This program is free software; you can redistribute it and/or
+;  modify it under the terms of the GNU General Public License
+;  as published by the Free Software Foundation; either version 2
+;  of the License, or (at your option) any later version.
+;
+;  This program is distributed in the hope that it will be useful,
+;  but WITHOUT ANY WARRANTY; without even the implied warranty of
+;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;  GNU General Public License for more details.
+;
+;  You should have received a copy of the GNU General Public License
+;  along with this program; if not, write to the Free Software
+;  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+;  02110-1301, USA.
+;--------------------------------------------------------------------
 !include "MUI.nsh"
 
 SetCompressor /SOLID lzma
@@ -394,6 +410,7 @@
   Section "${TORBUTTON_NAME}" Torbutton
     SectionIn 1 2
     SetOutPath "$INSTDIR\Torbutton"
+    File torbutton\${TORBUTTON_APPVERSION}\LICENSE
     File torbutton\${TORBUTTON_APPVERSION}\torbutton-${TORBUTTON_APPVERSION}.xpi
   SectionEnd
 
@@ -411,8 +428,6 @@
 
 Section "" end
   SetOutPath "$INSTDIR"
-  File "BUNDLE_LICENSE"
-  
   WriteUninstaller "$INSTDIR\${UNINSTALLER}"
 SectionEnd
 


Property changes on: trunk/pkg/win32/vidalia-bundle.nsi
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/pkg/win32/vidalia.nsi
===================================================================
--- trunk/pkg/win32/vidalia.nsi	2007-08-26 04:14:26 UTC (rev 1880)
+++ trunk/pkg/win32/vidalia.nsi	2007-08-26 05:19:03 UTC (rev 1881)
@@ -1,9 +1,25 @@
-;-------------------------------------------
-; $Id: $
+;--------------------------------------------------------------------
+;  $Id: $
 ;
-; Copyright (c) 2006, Matt Edman, Justin Hipple           
-; See LICENSE for licensing information
-;-------------------------------------------
+;  Vidalia is distributed under the following license:
+;
+;  Copyright (C) 2006-2007,  Matt Edman, Justin Hipple
+;
+;  This program is free software; you can redistribute it and/or
+;  modify it under the terms of the GNU General Public License
+;  as published by the Free Software Foundation; either version 2
+;  of the License, or (at your option) any later version.
+;
+;  This program is distributed in the hope that it will be useful,
+;  but WITHOUT ANY WARRANTY; without even the implied warranty of
+;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;  GNU General Public License for more details.
+;
+;  You should have received a copy of the GNU General Public License
+;  along with this program; if not, write to the Free Software
+;  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+;  02110-1301, USA.
+;--------------------------------------------------------------------
 !include "MUI.nsh"
 
 SetCompressor /SOLID lzma


Property changes on: trunk/pkg/win32/vidalia.nsi
___________________________________________________________________
Name: svn:keywords
   + Id