[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-126-ga8004f3



The following commit has been merged in the debian-experimental-4.0 branch:
commit a8004f38ecdb0d1a9b39f8c6558ea2828beb6883
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Nov 24 12:50:47 2012 +0100

    make make-package-modules-not-suck.diff apply again

diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 06d7512..79d4527 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -56,17 +56,14 @@ diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module
 index e3313c8..52d5ea0 100644
 --- a/scp2/source/impress/module_impress.scp
 +++ b/scp2/source/impress/module_impress.scp
-@@ -45,7 +45,9 @@ Module gid_Module_Prg_Impress_Bin
+@@ -44,6 +44,7 @@ Module gid_Module_Prg_Impress_Bin
+     Styles = (HIDDEN_ROOT);
      Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
+     gid_File_Lib_PresenterScreen,
 +    gid_File_Lib_Slideshow,
      gid_File_Share_Registry_Impress_Xcd,
      gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
--    gid_File_Tmp_Userinstall_Impress_Inf);
-+    gid_File_Tmp_Userinstall_Impress_Inf,
-+    gid_File_Lib_PresenterScreen);
- End
- 
- Module gid_Module_Brand_Prg_Impress
+     gid_File_Tmp_Userinstall_Impress_Inf);
 diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
 index 55180c5..742cb6e 100644
 --- a/scp2/source/kde/module_kde.scp
@@ -103,7 +100,7 @@ diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidd
 index 024ec68..a46e972 100644
 --- a/scp2/source/ooo/module_hidden_ooo.scp
 +++ b/scp2/source/ooo/module_hidden_ooo.scp
-@@ -84,7 +84,6 @@
+@@ -91,7 +91,6 @@ Module gid_Module_Root_Files_2
  	Styles = (HIDDEN_ROOT);
  	Files = (gid_File_Bin_Cde_Open_Url,
  	gid_File_Bin_Tde_Open_Url,

-- 
LibreOffice packaging repository


Reply to: