[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_rc2-2-1-g4637327
The following commit has been merged in the debian-experimental-4.1 branch:
commit 46373272dfaece89eeae3f3a05113acd347cdf80
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 15 18:48:18 2013 +0200
prepare for 4.1.0 rc3
diff --git a/changelog b/changelog
index b56a2f2..e2bdff1 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.1.0~rc3-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+
+ -- Rene Engelhard <rene@debian.org> Mon, 15 Jul 2013 01:19:56 +0200
+
libreoffice (1:4.1.0~rc2-2) experimental; urgency=low
* build with proper DEB_BUILD_OPTIONS so we actually get l10n
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index ca45691..b81a020 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_Dbpool
++ ,gid_File_Lib_Dbpool
+ ,gid_File_Lib_Sdbc_2
+#ifdef SOLAR_JAVA
+ ,gid_File_Lib_Jdbc
@@ -56,7 +56,7 @@ index b5bec12..920fc4e 100644
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,
-+ auto_Draw_Lib_ALL
++ auto_Draw_Lib_ALL,
gid_File_Share_Registry_Draw_Xcd,
gid_File_Tmp_Userinstall_Draw_Inf);
End
@@ -77,7 +77,7 @@ index 29164ac..030d004 100644
Default = YES;
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,
-+ auto_Impress_Lib_ALL
++ auto_Impress_Lib_ALL,
gid_File_Lib_PresenterScreen,
gid_File_Share_Registry_Impress_Xcd,
gid_File_Lib_Animcore,
@@ -85,17 +85,19 @@ diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index f066710..08a1c1c 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
-@@ -36,5 +36,11 @@ Module gid_Module_Optional_Kde
+@@ -26,5 +26,12 @@ Module gid_Module_Optional_Kde
+ PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
Styles = ();
- Files = (auto_Kde_Lib_ALL
+- Files = (auto_Kde_Lib_ALL);
++ Files = (auto_Kde_Lib_ALL,
+#ifdef ENABLE_KDE
-+ gid_File_Lib_Vclplug_Kde
++ gid_File_Lib_Vclplug_Kde,
+#endif
+#ifdef ENABLE_KDE4
-+ gid_File_Lib_Vclplug_Kde4
++ gid_File_Lib_Vclplug_Kde4,
+#endif
- );
++ );
End
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index ed7729e..5a03e3d 100644
--
LibreOffice packaging repository
Reply to: