The following commit has been merged in the debian-experimental-3.6 branch:
commit 81eb0a4940de516163b8d2cdad6af0bb7654becb
Author: Rene Engelhard <r...@debian.org>
Date: Sun Oct 14 17:10:02 2012 +0200
do the libreoffice-startcenter.desktop directly in rules, no need to do it
in .links before (and fix typo)
diff --git a/changelog b/changelog
index 7f548bd..abad524 100644
--- a/changelog
+++ b/changelog
@@ -16,7 +16,7 @@ libreoffice (1:3.6.3~rc1-1) experimental; urgency=low
[ Bjoern Michaelsen ]
* make metapackage explicit in short description
- -- Rene Engelhard <r...@debian.org> Sun, 14 Oct 2012 16:51:28 +0200
+ -- Rene Engelhard <r...@debian.org> Sun, 14 Oct 2012 17:07:23 +0200
libreoffice (1:3.6.2~rc1-1) experimental; urgency=low
diff --git a/libreoffice-common.links.in b/libreoffice-common.links.in
index 54bb829..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
-@OODIR@/share/xdg/startcenter.desktop
usr/share/applications/libreoffice-startcenter.desktop
diff --git a/rules b/rules
index 4ab82ca..69abeeb 100755
--- a/rules
+++ b/rules
@@ -3009,10 +3009,11 @@ endif
dh_lintian -i
dh_bugfiles -i -A
dh_link -i -X.desktop
- # fix startcenter.desktop given dh_link apparently doesn't exclude
.desktop
- # from absolute->relative change if it's in .links
+ # dh_link -X does not work for .links stuff. And adding it there and
+ # fixing it up later because it's relative doesn't make that much sense.
+ # So do it here.
cd $(PKGDIR)-common/usr/share/applications && \
- ln -sf /$(OOODIR)/share/xdg/startcenter.desktop
libreoffice-startcenter.desktop
+ ln -sf /$(OODIR)/share/xdg/startcenter.desktop
libreoffice-startcenter.desktop
dh_fixperms -i
dh_icons -i
dh_installxmlcatalogs -i
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tnprw-0001jk...@vasks.debian.org
