[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_dfsg-2-11-g0908ff4



The following commit has been merged in the master branch:
commit 1617a530d81948054b7d32393f1d1ccd54caf07d
Author: Rene Engelhard <rene@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 d07ab3d..ebbb164 100644
--- a/changelog
+++ b/changelog
@@ -7,7 +7,7 @@ libreoffice (1:3.5.4+dfsg-3) unstable; urgency=high
     - exclude .desktop from dh_link call to get absolute symlinks
       (closes: #690336)
 
- -- Rene Engelhard <rene@debian.org>  Sun, 14 Oct 2012 12:54:30 +0200
+ -- Rene Engelhard <rene@debian.org>  Sun, 14 Oct 2012 17:18:13 +0200
 
 libreoffice (1:3.5.4+dfsg-2) unstable; 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 b08ef61..da5bb06 100755
--- a/rules
+++ b/rules
@@ -2981,10 +2981,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


Reply to: