[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. f261a47639ff691bbed298d9fd247604684e3e41
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 3b893399b0481c5b504eccdb933a0296d46d4c8e
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jun 3 22:30:34 2011 +0000
Andromeda style is gone
diff --git a/control b/control
index fc827de..dec8213 100644
--- a/control
+++ b/control
@@ -119,7 +119,6 @@ Breaks: libreoffice-style-crystal (<< 1:${basis-version}~),
libreoffice-style-tango (>= 1:${next-basis-version}~),
libreoffice-style-hicontrast (>= 1:${next-basis-version}~),
libreoffice-style-galaxy (>= 1:${next-basis-version}~),
- libreoffice-style-andromeda (>= 1:${next-basis-version}~)
Replaces: openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
@@ -290,20 +289,6 @@ Description: office productivity suite -- Galaxy (Default) symbol style
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the LibreOffice option menu.
-Package: libreoffice-style-andromeda
-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.
- .
- This package contains the "Andromeda" symbol style from Sun; the "Classic"
- symbol style used by LibreOffice before 3.0 on MS Windows (tm) and when
- not using GNOME or KDE, needs to be manually enabled in the LibreOffice
- option menu.
-
Package: libreoffice-gtk
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
diff --git a/control.in b/control.in
index 0f06a1b..e6471c5 100644
--- a/control.in
+++ b/control.in
@@ -231,7 +231,6 @@ Breaks: libreofficeVER-style-crystal (<< 1:${basis-version}~),
libreofficeVER-style-tango (>= 1:${next-basis-version}~),
libreofficeVER-style-hicontrast (>= 1:${next-basis-version}~),
libreofficeVER-style-galaxy (>= 1:${next-basis-version}~),
- libreofficeVER-style-andromeda (>= 1:${next-basis-version}~)
Replaces: openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
@@ -432,20 +431,6 @@ Description: office productivity suite -- Galaxy (Default) symbol style
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the LibreOffice option menu.
-Package: libreofficeVER-style-andromeda
-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.
- .
- This package contains the "Andromeda" symbol style from Sun; the "Classic"
- symbol style used by LibreOffice before 3.0 on MS Windows (tm) and when
- not using GNOME or KDE, needs to be manually enabled in the LibreOffice
- option menu.
-
Package: libreofficeVER-gtk
Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
diff --git a/rules b/rules
index 528a350..60daf27 100755
--- a/rules
+++ b/rules
@@ -270,7 +270,7 @@ SYSTEM_STUFF += cppunit
# otherwise
INTERNAL_STDLIBS=n
DEFAULT_IMAGE=galaxy
-IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen classic
+IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
ENABLE_MYSQLNATIVE=y
# cannot be disabled, unless you have a internal MySQL somewhere :-)
SYSTEM_STUFF += mysql mysql-cppconn
@@ -2921,7 +2921,6 @@ endif
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/; \
--
LibreOffice packaging repository
Reply to: