Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv16455
Modified Files:
Tag: OPENOFFICE_ORG_1_1_4
changelog rules
Log Message:
- merge 1.1.3-5 and -6
- update vars for libwpd 0.8.0
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.417.2.9
retrieving revision 1.417.2.10
diff -u -d -r1.417.2.9 -r1.417.2.10
--- changelog 16 Feb 2005 22:39:47 -0000 1.417.2.9
+++ changelog 20 Feb 2005 22:45:51 -0000 1.417.2.10
@@ -1,16 +1,42 @@
-openoffice.org (1.1.4-0.1pre) experimental; urgency=low
+openoffice.org (1.1.4-0.1pre2) experimental; urgency=low
* New upstream release.
- fixes crash on opening some documents, closes: #273011
* New patches:
- - libgl-soname.diff: dlopen() libGL.so.1, not libGL.so [RE]
- - dmake43.diff: fix dmake check in configure.in to allow dmake 4.3 [RE]
- qpro-*.diff: Quattro Pro import support...
- - rsc-default-to-english.diff: Make the default translation language be
- English rather than German, so when a translation isn't 100% complete
- the missing elements are in English. (closes: #278758) [DW]
* Modified patches:
- sysui-mimetypes.diff: add Quattro Pro mimetypes [RE]
+ - wpd/*, config-switches.diff : adapt for libwpd 0.8.0 and
+ system-libwpd [FS, RE] - build with internal libwpd until
+ libwpd8 gets out of NEW...
+ * debian/control.in:
+ - update dependencies and virtual packages [RE]
+ * debian/scripts/vars: update [RE]
+ * debian/MANIFEST.*: update [RE]
+ * debian/openoffice.org.install: update [RE]
+ * ooo-build: back in branch ooo-build-1-3 [RE]
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 20 Feb 2005 19:51:09 +0100
+
+openoffice.org (1.1.3-6) unstable; urgency=high
+
+ * Brown paper bag release.
+ * Modified patches:
+ - vfs-uno-uri.diff: actually add USE_GNOMEVFS conditional
+ (closes: #293551) [RE]
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 19 Feb 2005 10:44:28 +0100
+
+openoffice.org (1.1.3-5) unstable; urgency=high
+
+ * New patches:
+ - psprint-nocupsupdates: Don't try to re-enumerate CUPS queues - the 1.1
+ codebase was not ready for this and it causes strange behaviour in some
+ cases (closes: #289715, #284579) [CH]
+ - libgl-soname.diff: dlopen() libGL.so.1, not libGL.so [RE]
+ - dmake43.diff: fix dmake check in configure.in to allow dmake 4.3 [RE]
+ - font-substitution-fixups: Fix substitution problems, like preferring
+ fonts without language coverage [DW]
* Modified patches:
- sc-filter-hide-filteredrows.diff: fix row unhiding in calc
(closes: #289013) [JB]
@@ -20,7 +46,6 @@
- Suggest xlibmesa-gl | libgl1 [RE]
- Conflict against kwin-style-baghira, kwin-baghira (<< 0.6) [RE]
- Suggest openclipart [RE]
- - update dependencies and virtual packages [RE]
* debian/rules:
- readd special-casing of built languages for Debian [RE]
- link to README.Debian.gz in /usr/share/doc/openoffice.org (provided
@@ -32,11 +57,11 @@
System [RE]
* debian/ttf-opensymbol.postrm.in:
- use rm -f for trying to remove fonts.cache* (closes: #288515) [RE]
- * debian/scripts/vars: update [RE]
- * debian/MANIFEST.*: update [RE]
- * debian/openoffice.org.install: update [RE]
+ * Ubuntu changes merge: [CH]
+ - build gnomevfs library sanely (closes: #293551)
+ * ooo-build: Branched at debian-1-1-3 for Sarge release [CH]
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 16 Feb 2005 23:33:54 +0100
+ -- Chris Halls <[EMAIL PROTECTED]> Wed, 16 Feb 2005 22:48:57 +0000
openoffice.org (1.1.3-4) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.253.2.2
retrieving revision 1.253.2.3
diff -u -d -r1.253.2.2 -r1.253.2.3
--- rules 16 Feb 2005 18:23:39 -0000 1.253.2.2
+++ rules 20 Feb 2005 22:45:52 -0000 1.253.2.3
@@ -105,6 +105,7 @@
USE_JAVA=y
JDK_HOME:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^.*jdkhome=\([^,]*\),.*/\1/p')
SUNJDK_VER:=$(shell $(JDK_HOME)/bin/java -version 2>&1 | sed -n '1s/java
version "\([0-9._]*\)"/\1/p')
+
# Non-1.4 Jdks need extra jar files
ifneq (1.4,$(findstring 1.4,$(SUNJDK_VER)))
BUILDCMD+=
XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xt.jar:/usr/share/java/xp.jar
@@ -172,14 +173,20 @@
IGNORE_MANIFEST_CHANGES=1
export IGNORE_MANIFEST_CHANGES
MOZILLA=n
- CONFIGURE_FLAGS+= --disable-symbols --disable-mozilla
+ CONFIGURE_FLAGS+= --disable-symbols
else
# gcc 3.0 didn't understand -g1, but newer compilers do
CONFIGURE_FLAGS+= --enable-symbols=SMALL
+endif
- ifeq "$(MOZILLA)" "n"
- CONFIGURE_FLAGS+= --disable-mozilla
- endif
+ifeq "$(DIST)" "Ubuntu"
+ # Disable mozilla - system moz has a different ABI and interferes
+ # with build
+ MOZILLA=n
+endif
+
+ifeq "$(MOZILLA)" "n"
+ CONFIGURE_FLAGS+= --disable-mozilla
endif
# Auto freetype configuration. If we detect the Woody freetype, we
@@ -467,7 +474,7 @@
# Files created in debian directory
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
- rm -rf tools.nongvfs
+ rm -rf tools/$(ARCHBUILDDIR:.pro=.gnomevfs.pro)
$(MAKE) -f debian/rules control
@@ -495,6 +502,8 @@
build: build-arch build-indep
build-arch: $(STAMP_DIR)/instsetoo
+build-arch: $(STAMP_DIR)/tools.gnomevfs
+
build-indep: $(STAMP_DIR)/setupins
# All 'important' targets have 2 lines. The one that is run by
@@ -624,9 +633,9 @@
build.prepare.artwork: $(STAMP_DIR)/build.prepare.artwork
$(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/files.backup
$(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz.uu
$(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/icons.scale
+ifneq "$(DIST)" "Ubuntu"
$(STAMP_DIR)/build.prepare.artwork: debian/openintro_debian.xcf.uu
-ifneq "$(DIST)" "Ubuntu"
# add the splashscreen with the Debian logo
uudecode debian/openintro_debian.xcf.uu > \
debian/openintro_debian.xcf && \
@@ -756,30 +765,7 @@
. $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/instsetoo && \
$(BUILDCMD) $(STARTFROM) $(BUILDFLAGS) -- instsetext= $(DMAKEFLAGS)
-
- ## 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 $@
sdk: $(STAMP_DIR)/sdk
@@ -791,6 +777,15 @@
touch $@
+tools.gnomevfs: $(STAMP_DIR)/tools.gnomevfs
+$(STAMP_DIR)/tools.gnomevfs: $(STAMP_DIR)/solver
+ # Then build tools again, this time with GnomeVFS enabled.
+ . $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/tools && \
+ OUTPATH="$$OUTPATH.gnomevfs" USE_GNOMEVFS=TRUE \
+ $(BUILDCMD) $(BUILDFLAGS) -- $(DMAKEFLAGS)
+
+ touch $@
+
# Build full installation set for BUILDLANG language
instsetoo: $(STAMP_DIR)/instsetoo
$(STAMP_DIR)/instsetoo: $(STAMP_DIR)/solver
@@ -975,6 +970,7 @@
$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-evolution.install
$(STAMP_DIR)/install-arch: $(STAMP_DIR)/manifest
$(STAMP_DIR)/install-arch: $(STAMP_DIR)/extract-sdk
+$(STAMP_DIR)/install-arch: $(STAMP_DIR)/tools.gnomevfs
dh_testdir
dh_testroot
umask 022
@@ -1002,10 +998,10 @@
cd $(MAINPKGDIR)-dev/$(OPENOFFICEDIR)/sdk/linux/bin && \
for i in *; do mv $$i $$i.bin; done
- # install gnomevfs version of libtl, we can't do it in dh_install
- # because dh_install can't rename files...
+ # install gnomevfs version of libtl, We do it here, not in .install
+ # because of the output path
install -m644 \
-
solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so.gvfs \
+
tools/$(ARCHBUILDDIR:.pro=.gnomevfs.pro)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so \
$(MAINPKGDIR)-gnomevfs/$(OPENOFFICEDIR)/program/libtl$(BUILDNUM)$(LIBSUFFIX).so
# when we use external stlport we can just symlink to the "normal"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
