1 files changed, 0 insertions, 38 deletions
diff --git a/patches/dev300/novell-win32-registry-branding.diff b/patches/dev300/novell-win32-registry-branding.diff
deleted file mode 100644
index 38d577133..000000000
--- a/patches/dev300/novell-win32-registry-branding.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- scp2/source/ooo/registryitem_ooo.scp
-+++ scp2/source/ooo/registryitem_ooo.scp
-@@ -393,6 +393,22 @@
- 	Value = "<progpath>\program\soffice.exe";
- End
- 
-+RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Vendor_PackageVersion
-+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+    Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION\Novell";
-+    ModuleID = gid_Module_Root;
-+    Name = "PackageVersion";
-+    Value = "<ooo_packageversion>";
-+End
-+
-+RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Vendor_BuildVersion
-+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+    Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION\Novell";
-+    ModuleID = gid_Module_Root;
-+    Name = "BuildVersion";
-+    Value = "<buildversion>";
-+End
-+
- RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Install
- 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-dummy line to avoid confusing diff-mode
---- solenv/bin/modules/installer/windows/registry.pm
-+++ solenv/bin/modules/installer/windows/registry.pm
-@@ -205,6 +205,9 @@
-     $value =~ s/\\\"/\"/g;	# no more masquerading of '"'
-     $value =~ s/\\\\\s*$/\\/g;	# making "\\" at end of value to "\"
-     $value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
-+    $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
-+    $value =~ s/\<ooo_packageversion\>/$ENV{'OOO_PACKAGEVERSION'}/;
-+    $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
-     $value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/;	# removing "\" after "[INSTALLLOCATION]"
- 
-     if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }