[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-82-g6ceb94f



The following commit has been merged in the debian-experimental-4.1 branch:
commit 6ceb94fd143f9435d9b437b578e8230b9953e804
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Apr 16 00:52:22 2013 +0200

    update make-package-modules-not-suck.diff after one more upstream install fix

diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index e48bd5b..9cf1ff6 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -16,7 +16,7 @@ index 57f8b81..7274823 100644
          ,gid_File_Lib_Dbp
          ,gid_File_Lib_Dbu
 +        ,auto_Base_Lib_ALL
-+        ,gid_File_Lib_Odbcbase
++        gid_File_Lib_Odbcbase
 +        ,gid_File_Lib_Dbpool
 +        ,gid_File_Lib_Odbc
 +        ,gid_File_Lib_Sdbc_2
@@ -117,7 +117,7 @@ index ed7729e..5a03e3d 100644
  	gid_File_Bin_Senddoc,
 @@ -158,7 +157,6 @@ Module gid_Module_Root_Files_4
  	Files = (gid_File_Dat_Root4,
- 	auto_File_Lib_ALL,
+ 	auto_File_Lib_ALL
  	gid_File_Filter_Eme,
 -	gid_File_Filter_Sdfilt,
  	gid_File_Filter_Icg,
@@ -159,7 +159,7 @@ index 1efaec2..b367a9c 100644
      Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
      gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
 +    gid_File_Lib_Sw,
-     auto_Writer_Lib_ALL,
+     auto_Writer_Lib_ALL
      gid_File_Lib_Vbaswobj,
      gid_File_Jar_Email, 
 diff --git a/Repository.mk b/Repository.mk
@@ -173,7 +173,7 @@ index 4b2c1f0..9423f87 100644
 -    dba \
 -    dbase \
      dbmm \
-     dbtools \
+     $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
 -    dbaxml \
  	deploymentmisc \
  	$(if $(filter unx,$(GUIBASE)),desktop_detector) \

-- 
LibreOffice packaging repository


Reply to: