[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.3-3-206-g3be4e30
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 3be4e301f0eb78bebf0ef43d1928a66b6e5f6f5e
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 90a9aea..f62688a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.4.3-3ubuntu2) oneiric; urgency=low
+
+ * hard hack to make upload happy: Pre-Depends on xz-capable dpkg
+ for -dbg
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 30 Sep 2011 19:06:04 +0200
+
libreoffice (1:3.4.3-3ubuntu1) oneiric; urgency=low
* merge from debian 3.4.3-3
diff --git a/control b/control
index 16fd4f0..0b91d2b 100644
--- a/control
+++ b/control
@@ -707,6 +707,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 c9e9e26..b5672c8 100755
--- a/rules
+++ b/rules
@@ -3623,7 +3623,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: