The following commit has been merged in the debian-experimental-4.2 branch:
commit fec3615174e6bc9474da04bdd98507979721e3c7
Author: Rene Engelhard <r...@debian.org>
Date: Tue Jul 16 23:43:57 2013 +0200
update make-package-modules-not-suck.diff to move firebird-sdbc into
-base...
diff --git a/patches/make-package-modules-not-suck.diff
b/patches/make-package-modules-not-suck.diff
index 26a7e06..4b5ff4a 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -68,7 +68,7 @@ diff --git a/Repository.mk b/Repository.mk
index 51089bb..3cffd92 100644
--- a/Repository.mk
+++ b/Repository.mk
-@@ -146,13 +146,24 @@ endif
+@@ -146,13 +146,25 @@ endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
abp \
@@ -79,6 +79,7 @@ index 51089bb..3cffd92 100644
dbp \
+ dbpool2 \
dbu \
++ $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
+ flat \
+ $(if $(SOLAR_JAVA),hsqldb) \
+ $(if $(SOLAR_JAVA),jdbc) \
@@ -128,14 +129,17 @@ index 51089bb..3cffd92 100644
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
-@@ -248,7 +267,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -248,10 +248,8 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
exp \
expwrap \
fastsax \
- flat \
file \
filterconfig \
- $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
+- $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
+ fpicker \
+ fps_office \
+ for \
@@ -281,7 +299,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ira \
itg \
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uzd3m-0003oy...@vasks.debian.org
