[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                    |    4 ---
 patches/dev300/sdk-gid-module-name.diff |   34 --------------------------------
 2 files changed, 38 deletions(-)

New commits:
commit 278203f924e323c526ef3deb0011fed20a1a32f8
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 18:15:04 2011 +0200

    pushed sdk-gid-module-name.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7a81f8d..45c45b7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -526,10 +526,6 @@ build-identification.diff, tml
 # Workaround for compile failure with glibc 2.4's langinfo.h
 i18nutil-glibc-braindamage-workaround.diff, brosenk
 
-# changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
-# of files does not conflict with the main package, i#64802
-sdk-gid-module-name.diff, pmladek, i#64802
-
 [ DebianOnly ]
 open-url-support-iceanimals.diff
 
diff --git a/patches/dev300/sdk-gid-module-name.diff b/patches/dev300/sdk-gid-module-name.diff
deleted file mode 100644
index ea2c5b0..0000000
--- a/patches/dev300/sdk-gid-module-name.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- scp2/source/sdkoo/sdkoo.scp                     |    2 +-
- setup_native/source/packinfo/packinfo_sdkoo.txt |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git scp2/source/sdkoo/sdkoo.scp scp2/source/sdkoo/sdkoo.scp
-index 47181c9..11d320f 100644
---- scp2/source/sdkoo/sdkoo.scp
-+++ scp2/source/sdkoo/sdkoo.scp
-@@ -122,7 +122,7 @@ Directory gid_Dir_Share_Readme_Sdk
- End
- 
- 
--Module gid_Module_Root
-+Module gid_Module_Root_SDK
-     Name = "sdkoo";
-     Description = "sdkoo";
-     PackageInfo = "packinfo_sdkoo.txt";
-diff --git setup_native/source/packinfo/packinfo_sdkoo.txt setup_native/source/packinfo/packinfo_sdkoo.txt
-index 8fb9c53..1d52e70 100755
---- setup_native/source/packinfo/packinfo_sdkoo.txt
-+++ setup_native/source/packinfo/packinfo_sdkoo.txt
-@@ -26,7 +26,7 @@
- #*************************************************************************
- 
- Start
--module = "gid_Module_Root"
-+module = "gid_Module_Root_SDK"
- solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-sdk"
- solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
- packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-sdk"
--- 
-1.7.0.1
-