------------------------------------------------------------
revno: 1602
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2009-07-30 16:23:21 +0200
message:
merge from Ubuntu
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-07-17 19:55:23 +0000
+++ b/changelog 2009-07-30 14:23:21 +0000
@@ -13,8 +13,13 @@
debian-devel)
* debian/rules, debian/control.kde.in, debian/openoffice.org-kab*:
also add/revoke libkab1.so to fix similar bug as with -evolution in -2
+ * merge from Ubuntu:
+ - don't depend on openoffice.org at -l10n-{in,za}, as it would install also
+ not-wanted stuff
+ - add conditional to disable gnome-vfs; add a confitional for gconf as
+ we need a diect libgconf2-dev builddep anyway when we enable GConf
- -- Rene Engelhard <r...@debian.org> Fri, 17 Jul 2009 21:54:58 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 30 Jul 2009 15:41:18 +0200
openoffice.org (1:3.1.0-5) unstable; urgency=low
=== modified file 'control.in'
--- a/control.in 2009-06-13 22:01:02 +0000
+++ b/control.in 2009-07-30 14:23:21 +0000
@@ -156,7 +156,7 @@
Section: localization
Priority: optional
Architecture: all
-Depends: openoffice.orgVER, openoffice.orgVER-l10n-af,
openoffice.orgVER-l10n-en-za, openoffice.orgVER-l10n-nr,
openoffice.orgVER-l10n-ns, openoffice.orgVER-l10n-ss,
openoffice.orgVER-l10n-st, openoffice.orgVER-l10n-tn,
openoffice.orgVER-l10n-ts, openoffice.orgVER-l10n-ve,
openoffice.orgVER-l10n-xh, openoffice.orgVER-l10n-zu,
+Depends: openoffice.orgVER-l10n-af, openoffice.orgVER-l10n-en-za,
openoffice.orgVER-l10n-nr, openoffice.orgVER-l10n-ns,
openoffice.orgVER-l10n-ss, openoffice.orgVER-l10n-st,
openoffice.orgVER-l10n-tn, openoffice.orgVER-l10n-ts,
openoffice.orgVER-l10n-ve, openoffice.orgVER-l10n-xh, openoffice.orgVER-l10n-zu,
${misc:Depends}
Description: full-featured office productivity suite -- South African language
packages
OpenOffice.org is a full-featured office productivity suite that provides
@@ -169,7 +169,7 @@
Section: localization
Priority: optional
Architecture: all
-Depends: openoffice.orgVER, openoffice.orgVER-l10n-as-in,
openoffice.orgVER-l10n-bn, openoffice.orgVER-l10n-gu-in,
openoffice.orgVER-l10n-hi-in, openoffice.orgVER-l10n-ml-in,
openoffice.orgVER-l10n-mr-in, openoffice.orgVER-l10n-or-in,
openoffice.orgVER-l10n-pa-in, openoffice.orgVER-l10n-ta-in,
openoffice.orgVER-l10n-te-in,
+Depends: openoffice.orgVER-l10n-as-in, openoffice.orgVER-l10n-bn,
openoffice.orgVER-l10n-gu-in, openoffice.orgVER-l10n-hi-in,
openoffice.orgVER-l10n-ml-in, openoffice.orgVER-l10n-mr-in,
openoffice.orgVER-l10n-or-in, openoffice.orgVER-l10n-pa-in,
openoffice.orgVER-l10n-ta-in, openoffice.orgVER-l10n-te-in,
${misc:Depends}
Recommends: ttf-indic-fonts
Description: full-featured office productivity suite -- Indic language packages
@@ -307,7 +307,7 @@
Package: openoffice.orgVER-java-common
Architecture: all
-Depends: openoffice.orgVER-common,
+Depends: openoffice.orgVER-common,
${java-common-java-depends},
${misc:Depends}
Suggests: ${common-bsh-depends}
@@ -356,7 +356,7 @@
${shlibs:Depends},
${lpsolve-dep},
${misc:Depends}
-Replaces: openoffice.org2-core (<< 1.9.113-0pre1),
+Replaces: openoffice.org2-core (<< 1.9.113-0pre1),
openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org-core (<= 2.2.0-4),
@@ -700,7 +700,7 @@
Depends: openoffice.orgVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Replaces: openoffice.org2-core (<= 1.9.108-1),
+Replaces: openoffice.org2-core (<= 1.9.108-1),
openoffice.orgVER-math (<< 1.9.113-0pre1),
openoffice.orgVER-calc (<< 1.9.113-0pre1),
openoffice.org2-filter-so52,
=== modified file 'rules'
--- a/rules 2009-07-13 13:31:21 +0000
+++ b/rules 2009-07-30 14:23:21 +0000
@@ -204,6 +204,8 @@
ENABLE_PDFIMPORT=y
BUILD_GTK=y
ENABLE_EVO2=y
+ENABLE_GVFS=y
+ENABLE_GCONF=y
# broken!
ENABLE_GIO=n
ENABLE_RANDR=y
@@ -615,7 +617,7 @@
endif
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
- ifeq "$(LENNY_BACKPORT)" "y"
+ ifeq "$(LENNY_BACKPORT)" "y"
BUILD_DEPS += , gij [$(OOO_GCJ_ARCHS)], java-gcj-compat-dev (>=
1.0.76-7) [$(OOO_GCJ_ARCHS)], libgcj-bc [$(OOO_GCJ_ARCHS)]
else
BUILD_DEPS += , gcj-jdk [$(OOO_GCJ_ARCHS)], libgcj-common (>= 1:4.4.0)
[$(OOO_GCJ_ARCHS)]
@@ -982,6 +984,18 @@
BUILD_DEPS += , libgnomevfs2-dev
endif
+ifeq "$(ENABLE_GVFS)" "y"
+ BUILD_DEPS += , libgnomevfs2-dev
+else
+ CONFIGURE_FLAGS += --disable-gnome-vfs
+endif
+
+ifeq "$(ENABLE_GCONF)" "y"
+ BUILD_DEPS += , libgconf2-dev
+else
+ CONFIGURE_FLAGS += --disable-gconf
+endif
+
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster
rebuild times
# A complete build uses about 200Mb of compiler cache.
ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
@@ -2051,21 +2065,24 @@
ifeq "$(BUILD_GTK)" "y"
mv $(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
$(PKGDIR)-gtk/$(OOBRANDDIR)/share && \
rmdir $(PKGDIR)-gnome/$(OOBRANDDIR)/share
-ifeq "$(ENABLE_GIO)" "y"
+ # Hmm. Weird. The location of confbe changes on whether GIO is enabled
+ # or not...
+ ifeq "$(ENABLE_GIO)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgio1.uno.so \
$(PKGDIR)-gnome/$(OODIR)/program/
-else
+ ifeq "$(ENABLE_GCONF)" "y"
+ mv $(PKGDIR)-core/$(OODIR)/program/gconfbe* \
+ $(PKGDIR)-gnome/$(OODIR)/program
+ endif
+ endif
+ ifeq "$(ENABLE_GVFS)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgvfs1.uno.so \
$(PKGDIR)-gnome/$(OODIR)/program/
-endif
-# FIXME: hmm. weird. seems to change packages depending on --enable-gio
-ifeq "$(ENABLE_GIO)" "y"
- mv $(PKGDIR)-core/$(OODIR)/program/gconfbe* \
- $(PKGDIR)-gnome/$(OODIR)/program
-else
+ ifeq "$(ENABLE_GCONF)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/gconfbe* \
$(PKGDIR)-gnome/$(OODIR)/program
-endif
+ endif
+ endif
endif
ifeq "$(ENABLE_EVO2)" "y"
