[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-11-g2480671
The following commit has been merged in the debian-experimental-4.1 branch:
commit 26de522d5eb67e212a29f68a7245241154ac01ba
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 5 21:13:03 2013 +0100
git update; fix install of non-core files...
diff --git a/changelog b/changelog
index 83a8c12..f8c0a2b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130304-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130305-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/patches/build-dont-run-checks.diff b/patches/build-dont-run-checks.diff
index 2643640..fd960c2 100644
--- a/patches/build-dont-run-checks.diff
+++ b/patches/build-dont-run-checks.diff
@@ -32,17 +32,17 @@ index 53ec395..fdc2fb7 100644
# Build
#
build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
-- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build all slowcheck
-+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build all
+- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild all slowcheck
++ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild all
build-nocheck : export SKIP_TESTS := YES
build-nocheck : build
-@@ -401,7 +401,7 @@ findunusedcode:
+@@ -402,7 +402,7 @@ findunusedcode:
| grep -v ^WSObject \
> unusedcode.easy
-check: dev-install subsequentcheck
+check: unitcheck slowcheck dev-install subsequentcheck
- subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
- $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build $@
+ dump-deps:
+ @$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 2dbb63f..33f4b8c 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_Rpt
,gid_File_Lib_Rptui
,gid_File_Lib_Rptxml
-+ ,gid_File_Lib_Dba
-+ ,gid_File_Lib_Dbase2
-+ ,gid_File_Lib_Dbaxml
++ ,gid_File_Lib_dba_auto_installed
++ ,gid_File_Lib_dbase_auto_installed
++ ,gid_File_Lib_dbaxml_auto_installed
+ ,gid_File_Lib_Odbcbase
+ ,gid_File_Lib_Dbpool
+ ,gid_File_Lib_Odbc
@@ -117,15 +117,15 @@ index 14b0766..82e904e 100644
gid_File_Filter_Egi,
gid_File_Filter_Epb,
@@ -188,9 +186,6 @@ Module gid_Module_Root_Files_4
- gid_File_Lib_Cui,
- gid_File_Lib_Sdbt,
- gid_File_Lib_Dbmm,
-- gid_File_Lib_Dba,
-- gid_File_Lib_Dbase2,
-- gid_File_Lib_Dbaxml,
- gid_File_Lib_Dbt,
- gid_File_Lib_Dbfile,
- gid_File_Lib_Drawinglayer,
+ 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,
@@ -216,9 +211,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Sax,
gid_File_Lib_Sb,
--
LibreOffice packaging repository
Reply to: