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

[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-187-g32b9280



The following commit has been merged in the ubuntu-raring-4.0 branch:
commit fb7909188380c429e25c3cd1eaeffacf65924d63
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Wed Mar 6 18:14:30 2013 +0100

    drop so52, its even more dead than binfilter

diff --git a/changelog b/changelog
index 84460c8..8408e75 100644
--- a/changelog
+++ b/changelog
@@ -65,6 +65,7 @@ libreoffice (1:4.0.1-0ubuntu1) raring; urgency=low
   * misc:depends for presenter-console
   * libreoffice-core already conflicts with -evolution, so no need to break in
       addition
+  * remove all traces of -so52
 
   [ Rico Tzschichholz ]
   * disable two more flaky tests for now:
diff --git a/control.in b/control.in
index 86a49a9..310bfaf 100644
--- a/control.in
+++ b/control.in
@@ -211,7 +211,6 @@ Conflicts: cacao-oj6-jre,
            libreofficeVER-dev (<< ${binary:Version}),
            libreofficeVER-draw (<< ${binary:Version}),
            libreofficeVER-evolution (<< ${binary:Version}),
-           libreofficeVER-filter-so52 (<< ${binary:Version}),
            libreofficeVER-gnome (<< ${binary:Version}),
            libreofficeVER-gtk (<< ${binary:Version}),
            libreofficeVER-impress (<< ${binary:Version}),

-- 
LibreOffice packaging repository


Reply to: