[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-169-g6214058
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit a4a27dae4a6b3e9e8ed42034384ae13a766888b2
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Feb 21 12:07:56 2013 +0100
add transitional package for presenter-console
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=315583
- LibreOffice impress 4.0 is a drop in replacement for presenter-console
diff --git a/changelog b/changelog
index ad573ff..bc9b1d3 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
libreoffice (1:4.0.0-2ubuntu2) raring; urgency=low
- * bump ubuntu version
+ * bump ubuntu version
+ * add transitionals for -presenter-console and -binfilter
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 13 Feb 2013 14:42:23 +0100
diff --git a/control.in b/control.in
index ae35895..59d924a 100644
--- a/control.in
+++ b/control.in
@@ -283,9 +283,6 @@ Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-draw (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Conflicts: libreofficeVER-presenter-console
-Provides: libreofficeVER-presenter-console
-Replaces: libreofficeVER-presenter-console
Description: office productivity suite -- presentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.transitionals.in b/control.transitionals.in
new file mode 100644
index 0000000..aade740
--- /dev/null
+++ b/control.transitionals.in
@@ -0,0 +1,8 @@
+Package: libreofficeVER-presenter-console
+Section: oldlibs
+Architecture: all
+Depends: libreoffice-impress (>= 4.0.0)
+Description: transitional package for LibreOffice presenter's console
+ This package used to contain the LibreOffice presenter console. It has been
+ integrated with LibreOffice Impress 4.0. You can safely remove this package.
+
diff --git a/rules b/rules
index 6ed32ef..a06f678 100755
--- a/rules
+++ b/rules
@@ -1414,6 +1414,8 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
-e "s|@LDAP_LIB@|$(LDAP_LIB)|g" \
>> debian/control < debian/control.lang.in; \
done
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.transitionals.in
ifneq "$(ENABLE_HELP)" "n"
for LNUM in $(HELPISOS) ; do \
--
LibreOffice packaging repository
Reply to: