[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-3-5-gd19385d
The following commit has been merged in the master branch:
commit d19385d55d482fb2d76a074920f12c1533865668
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Sep 30 19:08:46 2011 +0200
hard hack to make upload happy: Pre-Depends on xz-capable dpkg for -dbg
diff --git a/changelog b/changelog
index d3f4383..4e6a3cb 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,10 @@ libreoffice (1:3.4.3-4) UNRELEASED; urgency=low
- build-depend on libpoppler-cpp-dev
- fix libsslX.Y.Z in -dbgs suggests for multiarch
+ * merge from ubuntu-oneiric-3.4:
+ - hard hack to make upload happy: Pre-Depends on xz-capable dpkg
+ for -dbg
+
-- Rene Engelhard <rene@debian.org> Fri, 30 Sep 2011 03:15:57 +0200
libreoffice (1:3.4.3-3) unstable; urgency=low
diff --git a/control b/control
index 2320674..0a2e470 100644
--- a/control
+++ b/control
@@ -3305,6 +3305,7 @@ Priority: extra
Depends: libreoffice-core (= ${binary:Version}) | libreoffice-gcj (= ${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-filter-binfilter (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-libreoffice (= ${binary:Version}) | libreoffice-ogltrans (= ${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
Suggests: ${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
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.debug.in b/control.debug.in
index 4fd94b5..bdc5d8e 100644
--- a/control.debug.in
+++ b/control.debug.in
@@ -5,6 +5,7 @@ Priority: extra
Depends: libreofficeVER-core (= ${binary:Version}) | libreofficeVER-gcj (= ${binary:Version}) | libreofficeVER-dev (= ${binary:Version}) | libreofficeVER-gnome (= ${binary:Version}) | libreofficeVER-kde (= ${binary:Version}) | libreofficeVER-calc (= ${binary:Version}) | libreofficeVER-base-core (= ${binary:Version}) | libreofficeVER-base (= ${binary:Version}) | libreofficeVER-impress (= ${binary:Version}) | libreofficeVER-filter-binfilter (= ${binary:Version}) | libreofficeVER-draw (= ${binary:Version}) | libreofficeVER-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-libreofficeVER (= ${binary:Version}) | libreofficeVER-ogltrans (= ${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
Suggests: ${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
a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index f88c042..701f044 100755
--- a/rules
+++ b/rules
@@ -3429,7 +3429,7 @@ endif
dh_md5sums -s
ifeq "$(USE_XZ_COMPRESS)" "y"
dh_builddeb -Nlibreoffice$(VER)-dbg -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
- dh_builddeb -plibreoffice$(VER)-dbg $(DEBHELPER_OPTIONS) $(filter-out -Zbzip2,$(BUILDDEB_OPTIONS)) -Zxz
+ dh_builddeb -plibreoffice$(VER)-dbg $(DEBHELPER_OPTIONS) $(filter-out -Zbzip2 -Zlzma,$(BUILDDEB_OPTIONS)) -Zxz
else
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
endif
--
LibreOffice packaging repository
Reply to: