------------------------------------------------------------
revno: 1391
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2009-01-21 03:57:36 +0100
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.52
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2009-01-21 03:37:17 +0100
message:
create .so symlinks for the UNO libs
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.53
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2009-01-21 03:51:22 +0100
message:
don't add double text/rtf
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-20 16:01:16 +0000
+++ b/changelog 2009-01-21 02:57:36 +0000
@@ -41,6 +41,10 @@
- use UREPACKAGEVERSION for determining ures version, more correct and
also includes the micro. Remove +OOo3.0.0~ suffix as ure now is at 1.4.1
and we bump .shlibs anyway
+ - create .so symlinks in UREs dir in -dev so that we have some even if
+ the SDK mechanism which creates a dir in $HOME fails.
+ - stop adding a extra text/rtf as writer.desktop now already contains
+ it upstream (closes: #512417)
* debian/control.in:
- make -common conflict against dictionaries-common (<< 0.98.14)
- move from Breaks: to Conflicts: as otherwise the experimental buildds
@@ -48,7 +52,7 @@
* merge from Ubuntu:
- make ure only Suggest a JRE
- -- Rene Engelhard <[email protected]> Tue, 20 Jan 2009 14:05:04 +0100
+ -- Rene Engelhard <[email protected]> Wed, 21 Jan 2009 03:49:36 +0100
openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-20 15:51:52 +0000
+++ b/rules 2009-01-21 02:57:36 +0000
@@ -2120,8 +2120,6 @@
echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f;
\
fi; \
done
- sed -i -e 's,;application/rtf,;application/rtf;text/rtf,' \
- $(PKGDIR)-writer/usr/share/applications/ooo$(VER)-writer.desktop
sed -i -e 's/Office;/Office;Graphics;/'
$(PKGDIR)-draw/usr/share/applications/ooo$(VER)-draw.desktop
# invalid, according to lintian. make it shut up.
for i in writer calc impress draw math base; do \
@@ -2239,6 +2237,15 @@
cd $(PKGDIR)-dev/$(OOSDKDIR) && \
rm docs
+ # create .so symlinks upstream doesn't create (see i#97041).
+ # we do it here so that we don't need to patch the SDKs
+ # "deployment dir". The -L for the URE dir is added anyway.
+ mkdir -p $(PKGDIR)-dev/$(OOUREDIR)/lib
+ cd $(PKGDIR)-dev/$(OOUREDIR)/lib && \
+ for i in cppu cppuhelpergcc3 sal salhelpergcc3; do \
+ ln -s /$(OOUREDIR)/libuno_$${i}.so.3 libuno_$${i}.so; \
+ done
+
# install gsicheck into -dev
install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh; echo
$$UPD/$$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
