------------------------------------------------------------
revno: 2337
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Fri 2011-01-21 00:49:41 +0100
message:
remove obsolete (commented-out) FIXME section as /usr/share for icons works
again since longer
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2011-01-20 18:54:24 +0000
+++ b/changelog 2011-01-20 23:49:41 +0000
@@ -1,3 +1,12 @@
+libreoffice (1:3.3.0~rc4-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - remove obsolete (commented-out) FIXME section as /usr/share for icons
+ works again since longer. Fixes actual splitout of the images to the
+ various -style-* packages, thanks Matthias Klose for the pointer
+
+ -- Rene Engelhard <r...@debian.org> Thu, 20 Jan 2011 23:35:48 +0100
+
libreoffice (1:3.3.0~rc4-1) experimental; urgency=low
* LibreOffice 3.3.0 rc4
=== modified file 'control'
--- a/control 2011-01-20 18:54:16 +0000
+++ b/control 2011-01-20 23:49:41 +0000
@@ -231,6 +231,7 @@
Depends: ${misc:Depends}, libreoffice-core
Suggests: kde-icons-crystal, crystalcursors
Provides: libreoffice-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Crystal symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -242,6 +243,7 @@
Depends: ${misc:Depends}, libreoffice-core
Suggests: kde-icons-oxygen, oxygencursors
Provides: libreoffice-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Oxygen symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -253,6 +255,7 @@
Depends: ${misc:Depends}, libreoffice-core
Suggests: tango-icon-theme
Provides: libreoffice-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Tango symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -265,6 +268,7 @@
Depends: ${misc:Depends}, libreoffice-core
Suggests: gtk2-engines
Provides: libreoffice-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Hicontrast symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -276,6 +280,7 @@
Architecture: all
Depends: ${misc:Depends}, libreoffice-core
Provides: libreoffice-style-default, libreoffice-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Galaxy (Default) symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -288,6 +293,7 @@
Architecture: all
Depends: ${misc:Depends}, libreoffice-core
Provides: libreoffice-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Andromeda (Classic) symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2011-01-17 22:21:11 +0000
+++ b/control.in 2011-01-20 23:49:41 +0000
@@ -366,6 +366,7 @@
Depends: ${misc:Depends}, libreofficeVER-core
Suggests: kde-icons-crystal, crystalcursors
Provides: libreofficeVER-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Crystal symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -377,6 +378,7 @@
Depends: ${misc:Depends}, libreofficeVER-core
Suggests: kde-icons-oxygen, oxygencursors
Provides: libreofficeVER-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Oxygen symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -388,6 +390,7 @@
Depends: ${misc:Depends}, libreofficeVER-core
Suggests: tango-icon-theme
Provides: libreofficeVER-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Tango symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -400,6 +403,7 @@
Depends: ${misc:Depends}, libreofficeVER-core
Suggests: gtk2-engines
Provides: libreofficeVER-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Hicontrast symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -411,6 +415,7 @@
Architecture: all
Depends: ${misc:Depends}, libreofficeVER-core
Provides: libreofficeVER-style-default, libreofficeVER-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Galaxy (Default) symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -423,6 +428,7 @@
Architecture: all
Depends: ${misc:Depends}, libreofficeVER-core
Provides: libreofficeVER-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Andromeda (Classic) symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'rules'
--- a/rules 2011-01-20 18:54:16 +0000
+++ b/rules 2011-01-20 23:49:41 +0000
@@ -3001,16 +3001,15 @@
rm -rf $$z; \
done
endif
-# FIXME: disabled until the patches allowing this are ported in ooo-build
-# set -e; \
-# for i in $(IMAGES); do \
-# z=images_$$i.zip; p=$$i; \
-# case "$$i" in $(DEFAULT_IMAGE)) z=images.zip; esac; \
-# case "$$i" in classic) p=andromeda; esac; \
-# mkdir -p $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e
s/lib/share/)/share/config; \
-# mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
-# $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e
s/lib/share/)/share/config/; \
-# done
+ set -e; \
+ for i in $(IMAGES); do \
+ z=images_$$i.zip; p=$$i; \
+ case "$$i" in $(DEFAULT_IMAGE)) z=images.zip; esac; \
+ case "$$i" in classic) p=andromeda; esac; \
+ mkdir -p $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e
s/lib/share/)/share/config; \
+ mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
+ $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e
s/lib/share/)/share/config/; \
+ done
rm -rf debian/openoffice.org-dtd-officedocument1.0
mkdir -p debian/openoffice.org-dtd-officedocument1.0/$(shell echo
$(OODIR) | sed -e s/libreoffice/openoffice/)/share/dtd
