Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv17314
Modified Files:
Tag: OPENOFFICE_ORG680
changelog rules
Log Message:
update to 1.9.89; some minor debian/rules cleanup
Index: changelog
===
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.31
retrieving revision 1.338.2.25.2.32
diff -u -d -r1.338.2.25.2.31 -r1.338.2.25.2.32
--- changelog 30 Mar 2005 17:33:40 - 1.338.2.25.2.31
+++ changelog 31 Mar 2005 22:15:54 - 1.338.2.25.2.32
@@ -1,6 +1,6 @@
-openoffice.org2 (1.9.88-0pre) experimental; urgency=low
+openoffice.org2 (1.9.89-0pre) experimental; urgency=low
- * upstream milestone 88:
+ * upstream milestone 89:
- now uses libneon24 (closes: #251738)
* ooo-build/bin/package-ooo:
- install ucpgvfs1.so, gconfbe1.so and gnome-set-default-application
@@ -9,7 +9,7 @@
(closes: #266889, #222984)
- pyuno installation enhancements [RE]
- install oobase wrapper and some ooo-build utilities [RE]
- * ooo-build/distro-configs/Debian.conf.in: [RE]
+ * ooo-build/distro-configs/*.conf.in: [RE]
- update; use system libs where possible (C vs. C++)
- --with-java=gij-4.0 --with-ant-home=/usr/share/ant1.6
- --enable-pasf --with-system-sndfile
@@ -74,7 +74,7 @@
- some cleanup [RE]
* debian/java-gcj-compat_1.0.14.orig.tar.gz.uu: add [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 30 Mar 2005 19:25:37 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 31 Mar 2005 13:58:54 +0200
openoffice.org2 (1.9.76-0pre) experimental; urgency=low
Index: rules
===
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.30
retrieving revision 1.214.2.14.2.31
diff -u -d -r1.214.2.14.2.30 -r1.214.2.14.2.31
--- rules 30 Mar 2005 17:33:40 - 1.214.2.14.2.30
+++ rules 31 Mar 2005 22:15:55 - 1.214.2.14.2.31
@@ -270,11 +270,11 @@
done && \
find . -type f -name "javac" | xargs rm
- # create links for gcc and g++ (and gij and gcj), ooo-build does not
- # honour overriding CC and CC and we need to use gcc/g++ 4.0 /
- # ant.mk wants gcj at the moment...
ifneq ($(GCC_VERSION),)
ifneq ($(GCC_VERSION),snapshot)
+ # create links for gcc and g++ (and gij and gcj), ooo-build does not
+ # honour overriding CC and CC and we need to use gcc/g++ 4.0 or /
+ # ant.mk wants gcj at the moment...
mkdir -p $(CURDIR)/debian/usr/bin
ln -sf /usr/bin/gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcc
ln -sf /usr/bin/g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/g++
@@ -304,6 +304,8 @@
rm -rf $(CURDIR)/debian/tmp
cd ooo-build ; DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install
+ # install help; we can't do that later since this is in arch-dep
+ # and arch-indep stuff..
cd debian/tmp/pkg; \
mkdir -p openoffice.org-help-en-us/$(OODIR)/help/en; \
for i in common calc math draw writer impress; do \
@@ -386,20 +388,21 @@
#dh_install $(DEBHELPER_OPTIONS) --sourcedir=debian/tmp -a
mkdir -p -m755 $(PKGDIR)-kde/$(OODIR)/program
- mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/program
- mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
- mkdir -p -m755 debian/mozilla-openoffice.org/$(OODIR)/program
- mkdir -p -m755 $(PKGDIR)-officebean/$(OODIR)/program/classes
- mkdir -p -m755 $(PKGDIR)-filter-so52/$(OODIR)/program
for f in kdefilepicker libfps_kde.so libvclplug_kde[0-9]*.so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-kde/$(OODIR)/program
|| exit 1 ;\
done
- # only gconfbe1, ucpgvfs1.so and gnome-set-default-application are in
gid_Module_Optional_Gnome,
- # so we have to move them manually here for now.
+
+ # move the GNOME stuff which are *not* in gid_Module_Optional_Gnome
+ # (which is moved into -gnome in package-ooo) into -gnome
+ mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/program
for f in gnome-open-url.bin libfps_gnome.so libvclplug_gtk[0-9]*.so; do
\
mv $(PKGDIR)-core/$(OODIR)/program/$$f
$(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
+
+ mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/libevoab1.so
$(PKGDIR)-evolution/$(OODIR)/program
+
+ mkdir -p -m755 debian/mozilla-openoffice.org/$(OODIR)/program
for f in libnpsoplugin.so nsplugin; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f
debian/mozilla-openoffice.org/$(OODIR)/program; \
done
@@ -409,12 +412,18 @@
ln -sf /$(OODIR)/program/libnpsoplugin.so \
usr/lib/$$b/plugins/libnpsoplugin.so; \
done
+
