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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.2_rc2-2-65-g11269ff



The following commit has been merged in the debian-experimental-4.1 branch:
commit 11269ffaad99e61af5aa65aac73fbab6525266bb
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Apr 11 23:02:48 2013 +0200

    git update; update patches

diff --git a/changelog b/changelog
index 003bd2a..c6c70df 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130329-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130411-1) UNRELEASED; urgency=low
 
   * new upstream snapshot
 
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index 8ab17e5..504d206 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.in
 index d9d28ff..4fcbe7c 100644
 --- libreoffice-3.5.0/configure.ac
 +++ libreoffice-3.5.0/configure.ac
-@@ -7982,8 +7982,9 @@
+@@ -8691,8 +8691,9 @@ if test "$with_system_lpsolve" = "yes"; then
      # some systems need this. Like Ubuntu....
      AC_CHECK_LIB(m, floor)
      AC_CHECK_LIB(dl, dlopen)
@@ -11,7 +11,7 @@ index d9d28ff..4fcbe7c 100644
 -        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
 +        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lpsolve])
      LIBS=$save_LIBS
-     libo_MINGW_CHECK_DLL([LPSOLVE], [lpsolve55])
+     libo_MINGW_CHECK_DLL([lpsolve55])
  else
 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
 index 7688e42..c8f3fa2 100644
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 3458404..794e541 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -6,9 +6,9 @@ index 1a245a6..dc9dbf0 100644
          ,gid_File_Lib_Abp
          ,gid_File_Lib_Dbp
          ,gid_File_Lib_Dbu
-+        ,gid_File_Lib_dba_auto_installed
-+        ,gid_File_Lib_dbase_auto_installed
-+        ,gid_File_Lib_dbaxml_auto_installed
++        ,auto_File_Lib_dba
++        ,auto_File_Lib_dbase
++        ,auto_File_Lib_dbaxml
 +        ,gid_File_Lib_Odbcbase
 +        ,gid_File_Lib_Dbpool
 +        ,gid_File_Lib_Odbc
@@ -31,8 +31,8 @@ index 0e5e790..e5ba644 100644
      Minimal = YES;
      Default = YES;
      Styles = (HIDDEN_ROOT);
--    Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
-+    Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+-    Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,
++    Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,
      gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
      gid_File_Lib_Vbaobj,
      gid_File_Tmp_Userinstall_Calc_Inf);
@@ -43,7 +43,7 @@ index b5bec12..920fc4e 100644
 @@ -43,6 +43,11 @@ Module gid_Module_Prg_Draw_Bin
      Default = YES;
      Styles = (HIDDEN_ROOT);
-     Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml,
+     Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
 +    gid_File_Filter_Sdfilt,
 +    gid_File_Lib_Sd,
 +    gid_File_Lib_Sdd,
@@ -116,16 +116,16 @@ index 14b0766..82e904e 100644
  	gid_File_Filter_Icg,
  	gid_File_Filter_Egi,
  	gid_File_Filter_Epb,
-@@ -188,9 +186,6 @@ Module gid_Module_Root_Files_4
- 	gid_File_Lib_cui_auto_installed,
- 	gid_File_Lib_sdbt_auto_installed,
- 	gid_File_Lib_dbmm_auto_installed,
--	gid_File_Lib_dba_auto_installed,
--	gid_File_Lib_dbase_auto_installed,
--	gid_File_Lib_dbaxml_auto_installed,
- 	gid_File_Lib_dbt_auto_installed,
- 	gid_File_Lib_file_auto_installed,
- 	gid_File_Lib_drawinglayer_auto_installed,
+@@ -188,9 +188,6 @@ Module gid_Module_Root_Files_4
+ 	auto_File_Lib_cui,
+ 	auto_File_Lib_sdbt,
+ 	auto_File_Lib_dbmm,
+-	auto_File_Lib_dba,
+-	auto_File_Lib_dbase,
+-	auto_File_Lib_dbaxml,
+ 	auto_File_Lib_dbt,
+ 	auto_File_Lib_file,
+ 	auto_File_Lib_drawinglayer,
 @@ -216,9 +211,6 @@ Module gid_Module_Root_Files_4
  	gid_File_Lib_Sax,
  	gid_File_Lib_Sb,
@@ -143,8 +143,8 @@ index 14b0766..82e904e 100644
 -	gid_File_Lib_Vclplug_Kde,
 -	gid_File_Lib_Vclplug_Kde4,
  	gid_File_Lib_Vclplug_Svp,
- 	gid_File_Lib_CanvasTools,
- 	gid_File_Lib_CppCanvas,
+ 	auto_File_Lib_canvastools,
+ 	auto_File_Lib_cppcanvas,
 @@ -329,7 +319,6 @@ Module gid_Module_Root_Files_5
  	gid_File_Lib_DeploymentGui,
  	gid_File_Lib_Expwrap_Uno,

-- 
LibreOffice packaging repository


Reply to: