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

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-4-14-g7d2a1d4



The following commit has been merged in the master branch:
commit 7d2a1d4790536997c2732a6955b946628f0f198c
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Apr 25 03:35:47 2012 +0200

    fix Breaks: after cherry-pick

diff --git a/changelog b/changelog
index 2e4b683..2f66574 100644
--- a/changelog
+++ b/changelog
@@ -16,7 +16,7 @@ libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
   * debian/libreoffice-common.postrm.in: fix typo to actually try to rm -rf
     /var/lib/libreoffice/share/prereg
 
- -- Rene Engelhard <rene@debian.org>  Wed, 25 Apr 2012 02:37:45 +0200
+ -- Rene Engelhard <rene@debian.org>  Wed, 25 Apr 2012 03:35:18 +0200
 
 libreoffice (1:3.5.2-4) unstable; urgency=medium
 
diff --git a/control b/control
index 2b2413b..f4a5abc 100644
--- a/control
+++ b/control
@@ -193,7 +193,7 @@ Description: office productivity suite -- equation editor
 Package: libreoffice-base-core
 Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
 Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: libreoffice-base (<< 1:3.5.3~rc2-2)
+Replaces: libreoffice-base (<< 1:3.5.2-5)
 Suggests: libreoffice-base
 Description: office productivity suite -- shared library
  LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.in b/control.in
index 5b00448..98ba36c 100644
--- a/control.in
+++ b/control.in
@@ -315,7 +315,7 @@ Architecture: %OOO_BASE_ARCHS%
 Depends: libreofficeVER-core (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
-Replaces: libreofficeVER-base (<< 1:3.5.3~rc2-2)
+Replaces: libreofficeVER-base (<< 1:3.5.2-5)
 Suggests: libreofficeVER-base
 Description: office productivity suite -- shared library
  LibreOffice is a full-featured office productivity suite that provides

-- 
LibreOffice packaging repository


Reply to: