------------------------------------------------------------
revno: 1323
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-11-30 18:40:30 +0100
message:
GIO fixes
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-11-27 16:52:44 +0000
+++ b/changelog 2008-11-30 17:40:30 +0000
@@ -6,8 +6,10 @@
- changes for mono 2.0 transition (thanks Jo Shields):
- build-depend on mono-devel (>= 2.0.1), bump MONO_MINVER to >= 2.0.1
- add overrides for MCS, GMCS to /usr/bin/csc and MKBUNDLE2 (mkbundle)
+ - if we enable gio, install ucpgio1.uno.so properly into -gnome and fix
+ -gnomes description ((GNOME) VFS -> GIO)
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 27 Nov 2008 17:06:00 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 30 Nov 2008 18:24:12 +0100
openoffice.org (1:3.0.0-5) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-11-27 16:52:44 +0000
+++ b/control 2008-11-30 17:40:30 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>>
4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) ,
libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64] , gij [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>=
0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64
ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1)
[i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] ,
mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-10),
lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev
(>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev ,
libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>>
4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) ,
libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64] , gij [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>=
0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64
ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1)
[i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] ,
mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-10),
lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev
(>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev ,
libgtk2.0-dev (>= 2.10) , libglib2.0-dev (>= 2.15.0)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.8.0
XS-Python-Version: current
@@ -43,7 +43,7 @@
* openoffice.org-hyphenation-*: Hyphenation patterns for OpenOffice.org
* openoffice.org-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
- * openoffice.org-gnome: GNOME VFS, GConf backend
+ * openoffice.org-gnome: GIO, GConf backend
* openoffice.org-kde: KDE UI Plugin and KDE File Picker support
* menu: Will add openoffice.org menu entries for every Debian window manager.
* unixodbc: ODBC database support
@@ -365,11 +365,11 @@
Conflicts: openoffice.org2-gnome (<< ${Source-Version})
Provides: openoffice.org-gtk-gnome, openoffice.org2-gnome
Replaces: openoffice.org-gtk-gnome, openoffice.org2-gnome (<<
${Source-Version}), openoffice.org-kde (= 2.0.1-1), openoffice.org-common (<<
2.0.4~rc1-0)
-Description: GNOME Integration for OpenOffice.org (VFS, GConf)
+Description: GNOME Integration for OpenOffice.org (GIO, GConf)
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the GNOME VFS support and a GConf backend.
+ This package contains the GIO support and a GConf backend.
.
You can extend the functionality of this by installing these packages:
.
=== modified file 'rules'
--- a/rules 2008-11-27 16:52:44 +0000
+++ b/rules 2008-11-30 17:40:30 +0000
@@ -185,7 +185,7 @@
ENABLE_PDFIMPORT=y
BUILD_GTK=y
ENABLE_EVO2=y
-ENABLE_GIO=n
+ENABLE_GIO=y
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NPSOPLUGIN=y
@@ -1361,6 +1361,12 @@
perl -pi -e 's/spreadsheet component for OpenOffice.org.$$/spreadsheet
component for OpenOffice.org.\n It also contains the scsolver calc solver,
replacing Suns solver./' debian/control
endif
+ifeq "$(ENABLE_GIO)" "y"
+ perl -pi -e 's/VFS/GIO/' debian/control
+ # fix up "GNOME GIO"
+ perl -pi -e 's/GNOME GIO/GIO/' debian/control
+endif
+
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
@@ -2015,8 +2021,13 @@
ifeq "$(BUILD_GTK)" "y"
mv $(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
$(PKGDIR)-gtk/$(OOBRANDDIR)/share && \
rmdir $(PKGDIR)-gnome/$(OOBRANDDIR)/share
+ifeq "$(ENABLE_GIO)" "y"
+ mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgio1.uno.so \
+ $(PKGDIR)-gnome/$(OODIR)/program/
+else
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* \
