Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv7530
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
changelog rules
Log Message:
change gnomevfs build hack in debian/rules to something which actually does work
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.20
retrieving revision 1.362.2.21
diff -u -d -r1.362.2.20 -r1.362.2.21
--- changelog 16 Oct 2004 16:16:19 -0000 1.362.2.20
+++ changelog 17 Oct 2004 11:01:18 -0000 1.362.2.21
@@ -3,6 +3,7 @@
* New upstream release.
- fixes KDE clipboard exchange (closes: #237232)
- encoding of ooo645calc.desktop is fixed (closes: #275968)
+ - fixes import of .docs with FormControls (closes: #276669)
* New major patches:
- vfs-*: GNOME VFS Support [MM]
[ This means we now have integrated all of the major Ximian
@@ -90,7 +91,7 @@
* debian/gnomevfs-lib.sh: add [RE]
* debian/openoffice.org-bin.templates.master: rename to .templates [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 16 Oct 2004 18:03:59 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 17 Oct 2004 12:32:32 +0200
openoffice.org (1.1.2-5) unstable; urgency=high
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.11
retrieving revision 1.231.2.12
diff -u -d -r1.231.2.11 -r1.231.2.12
--- rules 15 Oct 2004 12:01:49 -0000 1.231.2.11
+++ rules 17 Oct 2004 11:01:19 -0000 1.231.2.12
@@ -692,23 +692,28 @@
. $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/instsetoo && \
$(BUILDCMD) $(STARTFROM) $(BUILDFLAGS) -- instsetext= $(DMAKEFLAGS)
- # hack: we need to build tools without that patch for GnomeVFS again
- mv \
- solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so \
-
solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so.gvfs
- mv \
-
$(SOURCE_TREE)/tools/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so\
-
$(SOURCE_TREE)/tools/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so.gvfs
-
- patch -R -p0 < $(OOO_BUILD)/patches/OOO_1_1/vfs-uno-uri.diff && \
- rm applied_patches/*vfs-uno-uri.diff && \
- . $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/tools; \
- $(BUILDCMD) $(BUILDFLAGS) -- $(DMAKEFLAGS) && \
- $(CURDIR)/$(SOURCE_TREE)/solenv/bin/deliver.pl
-
- cp -v \
-
$(SOURCE_TREE)/tools/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so.gvfs \
- solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib
+ ## hack: we need to build tools without that patch for GnomeVFS again
+ # first, copy the gnomevfs version to .gvfs to "backup" it...
+ if [ ! -f
solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtk$(BUILDNUM)$(LIBSUFFIX).so.gvfs ]
&& ldd solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so |
grep -q gnomevfs; then \
+ cp -v \
+
solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so \
+
solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so.gvfs; \
+ fi
+
+ # ... then build the non-gnomevfs version in an second tools dir
+ # if the "normal" .so has vfs stuff in it.
+ if objdump -p
solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so | grep
NEEDED | grep -q vfs; then \
+ if [ -d $(SOURCE_TREE)/tools.nongvfs ]; then \
+ rm -rf $(SOURCE_TREE)/tools.nongvfs; \
+ fi; \
+ cp -rv $(SOURCE_TREE)/tools $(SOURCE_TREE)/tools.nongvfs; \
+ cd $(SOURCE_TREE)/tools.nongvfs && \
+ patch -R -p1 <
$(CURDIR)/$(SOURCE_TREE)/$(OOO_BUILD)/patches/OOO_1_1/vfs-uno-uri.diff; \
+ . $(CURDIR)/$(SOURCE_TREE)/$(ENVFILE); rm -rf $(ARCHBUILDDIR) && \
+ $(BUILDCMD) $(BUILDFLAGS) -- $(DMAKEFLAGS) && \
+ cp $(ARCHBUILDDIR)/lib/libtl* \
+ $(CURDIR)/$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib;\
+ fi
touch $@
