[libreoffice] 02/03: python-six is correct; also add it for uno-libs3-dbg
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit d8e3ca32fdf92afe4d32f1a06ca6b3970be07454
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jun 23 18:13:43 2014 +0200
python-six is correct; also add it for uno-libs3-dbg
---
changelog | 2 +-
control | 6 ++----
control.debug.in | 3 ++-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index c5f5dfe..54e08aa 100644
--- a/changelog
+++ b/changelog
@@ -9,7 +9,7 @@ libreoffice (1:4.2.5-2) UNRELEASED; urgency=low
- remove liborbit2-dev build-dep, not needed since some time
- don't uselessly rebuild sdext - it's not a extension anymore and thus in
"proper" langpacks
- * debian/control.debug.in: suggest python(3)-six (used by the gdb helpers)
+ * debian/control.debug.in: suggest python-six (used by the gdb helpers)
-- Rene Engelhard <rene@debian.org> Sun, 22 Jun 2014 11:31:48 +0200
diff --git a/control b/control
index 0e412de..d72993f 100644
--- a/control
+++ b/control
@@ -4288,10 +4288,7 @@ Priority: extra
Depends: libreoffice-core (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) | libreoffice-base-core (= ${binary:Version}) | libreoffice-base (= ${binary:Version}) | libreoffice-impress (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python3-uno (= ${binary:Version}) | browser-plugin-libreoffice ( [...]
${misc:Depends}
Recommends: ure-dbg
-# FiXME: have no idea why gdb uses libpython2.7 on all archs EXCEPT hurd-i386 kfreebsd-*...
-Suggests: python-six [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- python3-six [hurd-i386 kfreebsd-i386 kfreebsd-amd64],
- ${dbg-dbg-suggests}
+Suggests: python-six, ${dbg-dbg-suggests}
Pre-Depends: dpkg (>= 1.15.6)
Description: office productivity suite -- debug symbols
LibreOffice is a full-featured office productivity suite that provides
@@ -4306,6 +4303,7 @@ Priority: extra
Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
Replaces: ure-dbg (<< 4.0.3-2)
+Suggests: python-six
Description: LibreOffice UNO runtime environment -- public shared library debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
diff --git a/control.debug.in b/control.debug.in
index 6a4a0b4..249f28c 100644
--- a/control.debug.in
+++ b/control.debug.in
@@ -5,7 +5,7 @@ Priority: extra
Depends: libreoffice-core (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) | libreoffice-base-core (= ${binary:Version}) | libreoffice-base (= ${binary:Version}) | libreoffice-impress (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python3-uno (= ${binary:Version}) | browser-plugin-libreoffice ( [...]
${misc:Depends}
Recommends: ure-dbg
-Suggests: ${dbg-dbg-suggests}
+Suggests: ${dbg-dbg-suggests}, python-six
Pre-Depends: dpkg (>= 1.15.6)
Description: office productivity suite -- debug symbols
LibreOffice is a full-featured office productivity suite that provides
@@ -20,6 +20,7 @@ Priority: extra
Architecture: %OOO_ARCHS%
Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
Replaces: ure-dbg (<< 4.0.3-2)
+Suggests: python-six
Description: LibreOffice UNO runtime environment -- public shared library debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: