The following commit has been merged in the master branch:
commit 5f43bb1929649a684fa3fa4007d884a0b4345d1b
Author: Rene Engelhard <[email protected]>
Date: Wed Mar 30 19:54:58 2011 +0000
remove fingerprint link, create on the fly in rules; we don't want this if
we use the internal data
diff --git a/changelog b/changelog
index 92c0906..efdd942 100644
--- a/changelog
+++ b/changelog
@@ -10,8 +10,11 @@ libreoffice (1:3.3.2-2) UNRELEASED; urgency=low
* debian/rules, debian/*.mime:
- remove obsolete KDE 3 stuff
* debian/shlibs.override.kde: remove, obsolete
+ * debian/rules, debian/libreoffice-common.links.in:
+ - remove fingerprint link, create on the fly in rules; we don't want
+ this if we use the internal data
- -- Rene Engelhard <[email protected]> Thu, 24 Mar 2011 09:34:40 +0100
+ -- Rene Engelhard <[email protected]> Wed, 30 Mar 2011 19:45:01 +0000
libreoffice (1:3.3.2-1) unstable; urgency=low
diff --git a/libreoffice-common.links.in b/libreoffice-common.links.in
index 04ff5f7..be8c18d 100644
--- a/libreoffice-common.links.in
+++ b/libreoffice-common.links.in
@@ -34,4 +34,3 @@
usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-spreadsheet-template.p
usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-text.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text.png
usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-text-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text-template.png
usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-web-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/libtextcat/LM @OOBASISDIR@/share/fingerprint
diff --git a/rules b/rules
index 927af1c..2a16147 100755
--- a/rules
+++ b/rules
@@ -3045,6 +3045,10 @@ endif
fi; \
done
+ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
+ echo "usr/share/libtextcat/LM $(OOBASISDIR)/share/fingerprint" >>
debian/libreoffice-common.links
+endif
+
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/misc/libreoffice >/dev/null; pwd`" ;\
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
