This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-testing-4.0
in repository libreoffice.
commit 595a8e91b0f0f748236a587b9e91c48812763f32
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 20 19:16:52 2013 +0200
mention s/python-uno/python3-uno/ in control.debug.in in changelog and
regen control
Conflicts:
changelog
---
changelog | 7 +++++++
control | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 57f9aff..635f146 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,13 @@ libreoffice (1:4.0.5~rc2-1) UNRELEASED; urgency=low
* debian/libreoffice-dev-doc.links: add api -> docs symlink as Javadocs
should be in api/
+ * merge from Ubuntu:
+ - debian/control.debug.in: s/python-uno/python3-uno/
+
+ -- Rene Engelhard <r...@debian.org> Mon, 12 Aug 2013 10:49:11 +0200
+
+libreoffice (1:4.1.0-4) unstable; urgency=low
+
* debian/rules:
- temporarily use internal orcus and mdds as the new 4.1-usable versions
already are in unstable & testing
diff --git a/control b/control
index a7968cf..1386652 100644
--- a/control
+++ b/control
@@ -4279,7 +4279,7 @@ Package: libreoffice-dbg
Section: debug
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386
mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
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}) | python-uno (= ${binary:Version}) |
browser-plugin-libreoffice (= [...]
+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}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vbpcq-0000nz...@vasks.debian.org
