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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.3_rc1-1-1-g480b994



The following commit has been merged in the debian-experimental-3.6 branch:
commit 480b99424cc191317707519c3b46ee47c5b9567a
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Oct 14 16:54:29 2012 +0200

    manually fix libreoffice-startcenter.desktop as dh_link doesn't do that for us...

diff --git a/changelog b/changelog
index 97a0864..7f548bd 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 <rene@debian.org>  Sat, 13 Oct 2012 14:36:45 +0200
+ -- Rene Engelhard <rene@debian.org>  Sun, 14 Oct 2012 16:51:28 +0200
 
 libreoffice (1:3.6.2~rc1-1) experimental; urgency=low
 
diff --git a/rules b/rules
index d06d48a..4ab82ca 100755
--- a/rules
+++ b/rules
@@ -3009,6 +3009,10 @@ 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
+	cd $(PKGDIR)-common/usr/share/applications && \
+		ln -sf /$(OOODIR)/share/xdg/startcenter.desktop libreoffice-startcenter.desktop
 	dh_fixperms -i
 	dh_icons -i
 	dh_installxmlcatalogs -i

-- 
LibreOffice packaging repository


Reply to: